Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=871300182626cb2513ce7314ab29a64f6edc7857
commit 871300182626cb2513ce7314ab29a64f6edc7857
Author: bouleetbil <bouleet...@frogdev.info>
Date: Fri Sep 4 23:44:36 2009 +0200
xorg-server-1.6.99.900-1-i686
*version bump
*don't use snapshot
*dmx broken with libext
*kdrive broken with xkb
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 8eb0829..7fa9f12 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -1,19 +1,19 @@
# Compiling Time: 6.34 SBU
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>
-USE_DEVEL=${USE_DEVEL:-"y"}
-USE_ALLXSERVER=${USE_ALLXSERVER:-"n"}
+USE_DEVEL=${USE_DEVEL:-"n"}
+USE_KDRIVE=${USE_KDRIVE:-"n"}
USE_HAL=${USE_HAL:-"y"}
-
+USE_SERVERDMX=${USE_SERVERDMX:-"n"}
pkgname=xorg-server
-pkgver=1.6.3.901
+pkgver=1.6.99.900
pkgrel=1
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
depends=('libxfont>=1.4.0' 'libx11>=1.2.99.901' 'xtrans>=1.2.3' 'libxau>=1.0.5'
\
- 'libxext>=1.0.5-3' 'libxkbfile>=1.0.5' 'libxdmcp>=1.0.2-2'
'libxmu>=1.0.4-2' 'libxrender>=0.9.4-3' \
+ 'libxext>=1.0.99.4-1' 'libxkbfile>=1.0.5' 'libxdmcp>=1.0.2-2'
'libxmu>=1.0.4-2' 'libxrender>=0.9.4-3' \
'libxi>=1.2.1' 'freetype2' 'mesa>=7.4.2-4' 'font-cursor-misc>=1.0.0-3'
'font-misc-misc>=1.0.0-3' \
'xbitmaps' 'xkeyboard-config>=1.6' 'iceauth>=1.0.2-3' 'rgb>=1.0.3'
'xauth>=1.0.3' 'xinit>=1.1.1' 'libxaw>=1.0.5' \
'libxpm>=3.5.7-2' 'libxxf86misc>=1.0.1-3' 'libxxf86vm>=1.0.1-3'
'libxkbui>=1.0.2-2' 'liblbxutil>=1.0.1-4' \
@@ -40,7 +40,7 @@ Finclude sourceforge xorg
source=(${sour...@]} \
desktop)
-sha1sums=('09e3d46178701ce76911553ee53309686822bb31' \
+sha1sums=('cf74a4759882e4baf33780e7cfd9466722f71918' \
'1456207203932404752e2519c5b7fe830a913cf4')
if Fuse $USE_DEVEL; then
@@ -53,13 +53,6 @@ if Fuse $USE_DEVEL; then
fi
-subpkgs=('libdri' 'libglx')
-subdescs=('Dri library for XOrg.' \
- 'Glx library for XOrg.')
-subdepends=('glibc' \
- 'glibc')
-subgroups=('x11 xorg-core' 'x11 xorg-core')
-subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc')
Fconfopts="${fconfop...@]}
--disable-static \
@@ -97,38 +90,71 @@ else
--disable-config-hal"
fi
+subpkgs=('libdri' 'libglx')
+subdescs=('Dri library for XOrg.' \
+ 'Glx library for XOrg.')
+subdepends=('glibc' \
+ 'glibc')
+subgroups=('x11 xorg-core' 'x11 xorg-core')
+subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc')
-if Fuse $USE_ALLXSERVER; then
- subpkgs=(${subpk...@]} "$pkgname-dmx" "$pkgname-xephyr" \
+if Fuse $USE_KDRIVE; then
+ subpkgs=("${subpk...@]}" "$pkgname-xephyr" \
"$pkgname-fbdev" "$pkgname-sdl")
- subdescs=(${subdes...@]} \
- 'Distributed Multi-Head X server.' \
+ subdescs=("${subdes...@]}" \
'KDrive xephyr X server' \
'KDrive fbdev X server' \
'KDrive sdl X server')
- subdepends=(${subdepen...@]} 'libdmx libxcb libsm libxaw libxrender
libxfixes libxfont>=1.3.1-2 libxi pixman libxres' \
+ subdepends=("${subdepen...@]}" \
'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=(${subgrou...@]} 'x11-extra' 'x11-extra' 'x11-extra'
'x11-extra')
- subarchs=(${subarc...@]} 'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686
!x86_64 !ppc' 'i686 x86_64 ppc')
+ subgroups=("${subgrou...@]}" 'x11-extra' 'x11-extra' 'x11-extra')
+ subarchs=("${subarc...@]}" 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc'
'i686 x86_64 ppc')
Fconfopts="${fconfop...@]}
- --enable-dmx \
--enable-xephyr \
--enable-xsdl \
--enable-xvfb \
- --enaable-multibuffer \
--enable-kdrive"
else
Fconfopts="${fconfop...@]}
- --disable-dmx \
--disable-xephyr \
--disable-xsdl \
--disable-xvfb \
- --disable-kdrive \
- --disable-multibuffer"
+ --disable-kdrive"
+fi
+
+if Fuse $USE_SERVERDMX; then
+ subpkgs=("${subpk...@]}" "$pkgname-dmx")
+ subdescs=("${subdes...@]}" 'Distributed Multi-Head X server.')
+ subdepends=("${subdepen...@]}" 'libdmx libxcb libsm libxaw libxrender
libxfixes libxfont>=1.3.1-2 libxi pixman libxres')
+ subgroups=("${subgrou...@]}" 'x11-extra')
+ subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
+ Fconfopts="${fconfop...@]}
+ --enable-dmx \
+ --enable-multibuffer"
+else
+ Fconfopts="${fconfop...@]}
+ --disable-dmx \
+ --disable-multibuffer"
+fi
+
+
+if Fuse $USE_SERVERDMX; then
+ subpkgs=("${subpk...@]}" "$pkgname-dmx")
+ subdescs=("${subdes...@]}" 'Distributed Multi-Head X server.')
+ subdepends=("${subdepen...@]}" 'libdmx libxcb libsm libxaw libxrender
libxfixes libxfont>=1.3.1-2 libxi pixman libxres')
+ subgroups=("${subgrou...@]}" 'x11-extra')
+ subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
+ Fconfopts="${fconfop...@]}
+ --enable-dmx \
+ --enable-multibuffer"
+else
+ Fconfopts="${fconfop...@]}
+ --disable-dmx \
+ --disable-multibuffer"
fi
build() {
@@ -157,12 +183,13 @@ build() {
Fsplit libglx usr/lib/xorg/modules/extensions/libglx.*
## the servers =)
- if Fuse $USE_ALLXSERVER; then
+ if Fuse $USE_SERVERDMX; then
## -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*
-
+ fi
+ if Fuse $USE_KDRIVE; then
## -xephyr
Fsplit $pkgname-xephyr usr/bin/Xephyr
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
