Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=25e9eb7ebfbe0929a3fed3934c222f74c94a02ad
commit 25e9eb7ebfbe0929a3fed3934c222f74c94a02ad
Author: Devil505 <devil505li...@gmail.com>
Date: Sat Jun 6 07:40:19 2009 +0200
xorg-server-1.6.1-6-i686
* fixing subpackages
* fixing again replaces() and provides()
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 2d31bc8..27395bc 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=xorg-server
pkgver=1.6.1
-pkgrel=5
+pkgrel=6
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
@@ -20,15 +20,15 @@ makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3'
'fixesproto' 'damageproto>
'glproto' 'xf86driproto>=2.0.4' 'libdrm>=2.4.11' 'printproto>=1.0.4'
'mkfontdir>=1.0.4' 'mkfontscale>=1.0.6-3' \
'fontcacheproto' 'xorg-sgml-doctools>=1.2' 'util-macros>=1.2.1'
'calibrateproto' 'libdmx>1.0.2-3' 'libxres>=1.0.3-3' 'sdl' 'libxinerama>=1.0.3')
rodepends=('xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vga'
'xf86-video-vesa' 'libglx')
-provides=('xorg-compat' '$pkgname-dmx' '$pkgname-ati' '$pkgname-chips'
'$pkgname-xephyr' \
- '$pkgname-epson' '$pkgname-fbdev' '$pkgname-i810' '$pkgname-mach64' \
- '$pkgname-mga' '$pkgname-nvidia' '$pkgname-pm2' '$pkgname-r128' \
- '$pkgname-sdl' '$pkgname-smi' '$pkgname-vesa' '$pkgname-via')
+provides=('xorg-compat' 'xorg-server-ati' 'xorg-server-chips' \
+ 'xorg-server-epson' 'xorg-server-i810' 'xorg-server-mach64' \
+ 'xorg-server-mga' 'xorg-server-nvidia' 'xorg-server-pm2'
'xorg-server-r128' \
+ 'xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via')
-replaces=('xorg-compat' '$pkgname-dmx' '$pkgname-ati' '$pkgname-chips'
'$pkgname-xephyr' \
- '$pkgname-epson' '$pkgname-fbdev' '$pkgname-i810' '$pkgname-mach64' \
- '$pkgname-mga' '$pkgname-nvidia' '$pkgname-pm2' '$pkgname-r128' \
- '$pkgname-sdl' '$pkgname-smi' '$pkgname-vesa' '$pkgname-via')
+replaces=('xorg-compat' 'xorg-server-ati' 'xorg-server-chips' \
+ 'xorg-server-epson' 'xorg-server-i810' 'xorg-server-mach64' \
+ 'xorg-server-mga' 'xorg-server-nvidia' 'xorg-server-pm2'
'xorg-server-r128' \
+ 'xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via')
backup=('etc/sysconfig/desktop')
Finclude sourceforge xorg
@@ -60,55 +60,23 @@ sha1sums=('aef6d1cd1cbb97fa3214fde6fbefb03a45578132' \
'f21a54aed8eae1e718f2f0c262c37c36ccccd152' \
'39e73e83ff7ac99a87773a3f45f2f0e11bad1f3e')
-subpkgs=('libglx')
- #"$pkgname-dmx" "$pkgname-ati" "$pkgname-chips" "$pkgname-xephyr" \
- #"$pkgname-epson" "$pkgname-fbdev" "$pkgname-i810" "$pkgname-mach64" \
- #"$pkgname-mga" "$pkgname-nvidia" "$pkgname-pm2" "$pkgname-r128" \
- #"$pkgname-sdl" "$pkgname-smi" "$pkgname-vesa" "$pkgname-via")
-subdescs=('Glx library for XOrg.')
- #'Distributed Multi-Head X server.' \
- #'KDrive ati X server' \
- #'KDrive chips X server' \
- #'KDrive xephyr X server' \
- #'KDrive epson X server' \
- #'KDrive fbdev X server' \
- #'KDrive i810 X server' \
- #'KDrive mach64 X server' \
- #'KDrive mga X server' \
- #'KDrive nvidia X server' \
- #'KDrive pm2 X server' \
- #'KDrive r128 X server' \
- #'KDrive sdl X server' \
- #'KDrive smi X server' \
- #'KDrive vesa X server' \
- #'KDrive via X server')
-subdepends=('glibc')
- #'libdmx libxcb libsm libxaw libxrender libxfixes libxfont>=1.3.1-2
libxi pixman libxres' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxext libxfont>=1.3.1-2 pixman' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp sdl' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
- #'libxfont>=1.3.1-2 libxau pixman libxdmcp')
-subgroups=('x11 xorg-core')
- #'x11-extra' 'x11-extra' 'x11-extra' 'x11-extra' \
- #'x11-extra' 'x11-extra' 'x11-extra' 'x11-extra' \
- #'x11-extra' 'x11-extra' 'x11-extra' 'x11-extra' \
- #'x11-extra' 'x11-extra' 'x11-extra' 'x11-extra')
-subarchs=('i686 x86_64 ppc')
- #'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686 x86_64
ppc' \
- #'i686 !x86_64 !ppc' 'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686
!x86_64 !ppc' \
- #'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686
!x86_64 !ppc' \
- #'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686
!x86_64 !ppc')
+subpkgs=('libglx' \
+ "$pkgname-dmx" "$pkgname-xephyr" \
+ "$pkgname-fbdev" "$pkgname-sdl")
+subdescs=('Glx library for XOrg.' \
+ 'Distributed Multi-Head X server.' \
+ 'KDrive xephyr X server' \
+ 'KDrive fbdev X server' \
+ 'KDrive sdl X server')
+subdepends=('glibc' \
+ 'libdmx libxcb libsm libxaw libxrender libxfixes libxfont>=1.3.1-2
libxi pixman libxres' \
+ 'libxext libxfont>=1.3.1-2 pixman' \
+ 'libxfont>=1.3.1-2 libxau pixman libxdmcp' \
+ 'libxfont>=1.3.1-2 libxau pixman libxdmcp sdl')
+subgroups=('x11 xorg-core' \
+ 'x11-extra' 'x11-extra' 'x11-extra' 'x11-extra')
+subarchs=('i686 x86_64 ppc' \
+ 'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686 x86_64
ppc')
build() {
#cd $Fsrcdir/Mesa-$mesaver || Fdie
@@ -189,21 +157,22 @@ build() {
## the servers =)
## -dmx
- #Fsplit $pkgname-dmx \
- #
usr/bin/{Xdmx,dmxaddinput,dmxaddscreen,dmxreconfig,dmxresize,dmxrminput,dmxrmscreen,dmxtodmx,dmxwininfo,vdltodmx,xdmx,xdmxconfig}
- #Fsplit $pkgname-dmx usr/share/man/man1/*dmx*
+ Fsplit $pkgname-dmx \
+
usr/bin/{Xdmx,dmxaddinput,dmxaddscreen,dmxreconfig,dmxresize,dmxrminput,dmxrmscreen,dmxtodmx,dmxwininfo,vdltodmx,xdmx,xdmxconfig}
+ Fsplit $pkgname-dmx usr/share/man/man1/*dmx*
## -xephyr
- #Fsplit $pkgname-xephyr usr/bin/Xephyr
+ Fsplit $pkgname-xephyr usr/bin/Xephyr
## -sdl
- #Fsplit $pkgname-sdl usr/bin/Xsdl
+ Fsplit $pkgname-sdl usr/bin/Xsdl
## -fbdev
- #Fsplit $pkgname-fbdev usr/bin/Xfbdev
+ Fsplit $pkgname-fbdev usr/bin/Xfbdev
## all the other - i686 only
+ ## following files not present in xorg-server 1.6.1
## if [ "$CARCH" == "i686" ]; then
## for i in ati chips epson i810 mach64 mga nvidia pm2 r128 smi vesa via
## do
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
