Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=65090b58aa2a6e3753f8586c1d9b39e618ee54b7

commit 65090b58aa2a6e3753f8586c1d9b39e618ee54b7
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Aug 31 20:59:24 2009 +0200

xorg-server-1.6.3.20090831-1-i686
*version bump
*use a snaphot, current version is broken with new header,mesa.....
*disable some broken subpkg for now
*enable dbus and hal for test

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 5238670..3d9102d 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -2,17 +2,17 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>

pkgname=xorg-server
-pkgver=1.6.1
-pkgrel=8
+pkgver=1.6.3.20090831
+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.1' 'xtrans>=1.2.3' 'libxau>=1.0.4' \
+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' \
'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' \
-       'xorg-cf-files' 'libxtst>=1.0.3-3' 'font-alias' 'libxcb>=1.3' 
'pixman>=0.15.8' 'libpciaccess>=0.10.5' 'libxv>=1.0.4')
+       'xorg-cf-files' 'libxtst>=1.0.3-3' 'font-alias' 'libxcb>=1.4' 
'pixman>=0.15.8' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'dbus' 'hal')
makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3' 'fixesproto' 
'damageproto>=1.1.0' 'xextproto>=7.0.5' 'xproto>=7.0.15' \
'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 
'xf86bigfontproto' \
'compositeproto>=0.4' 'recordproto' 'resourceproto' 'videoproto>=2.2.2' 
'scrnsaverproto' 'evieext' \
@@ -32,61 +32,36 @@ replaces=('xorg-compat' 'xorg-server-ati' 
'xorg-server-chips' \

backup=('etc/sysconfig/desktop')
Finclude sourceforge xorg
-source=(${sour...@]} \
-       01-kernel-headers-fix.patch \
-       02-access_c_skip_null_addresses.patch \
-       03-black-background.patch \
-       desktop \
-       rc.xprint \
-       F-xorg-x11-server-0.99.3-init-origins-fix.patch0 \
-       xprint-rc-files-fix.patch \
-        xfree86-Makefile.patch)
+#source=(${sour...@]} \
+source=(http://ftp.frugalware.org/pub/other/people/bouleetbil/sources/$pkgname-$pkgver.tar.bz2
 \
+       desktop)

-sha1sums=('aef6d1cd1cbb97fa3214fde6fbefb03a45578132' \
-          'f31702e0029b2d68018598e73ed55c4d6c58367b' \
-          '859b98a4049400be152032fc09ceff2afe9e6dcf' \
-          '863ad92892785c3785b122bf54d0def4d4d2732c' \
-          '1456207203932404752e2519c5b7fe830a913cf4' \
-          '4713d46b31eafbde58a1fafe8269642df6a12d77' \
-          '2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
-          '0eb64d46172b6f2f4462c02dad7964c6d7656076' \
-          '39e73e83ff7ac99a87773a3f45f2f0e11bad1f3e')
+sha1sums=('5cb9fc6a9de323f2279aa1192a191f906c401390' \
+          '1456207203932404752e2519c5b7fe830a913cf4')

-subpkgs=('libdri' 'libglx' \
-       "$pkgname-dmx" "$pkgname-xephyr" \
-       "$pkgname-fbdev" "$pkgname-sdl")
+subpkgs=('libdri' 'libglx' )
+#\
+#      "$pkgname-dmx" "$pkgname-xephyr" \
+#      "$pkgname-fbdev" "$pkgname-sdl")
subdescs=('Dri library for XOrg.' \
-       'Glx library for XOrg.' \
-       'Distributed Multi-Head X server.' \
-       'KDrive xephyr X server' \
-       'KDrive fbdev X server' \
-       'KDrive sdl X server')
+       'Glx library for XOrg.' )
+#      'Distributed Multi-Head X server.' \
+#      'KDrive xephyr X server' \
+#      'KDrive fbdev X server' \
+#      'KDrive sdl X server')
subdepends=('glibc' \
-       '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 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' 'i686 x86_64 
ppc')
+       '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 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' 'i686 x86_64 
ppc')

build() {
cd $Fsrcdir/$_F_xorg_name-$pkgver || Fdie
-       Fpatch 01-kernel-headers-fix.patch
-       Fpatch 02-access_c_skip_null_addresses.patch
-       Fpatch 03-black-background.patch
-       # From fedora, misc fixes.
-       Fpatch F-xorg-x11-server-0.99.3-init-origins-fix.patch0
-       # Hack for init scripts and wrong install stuff for xprint
-       #Fpatch xprint-rc-files-fix.patch
-
-        # Fix dbus config path
-        #Fsed "$(sysconfdir)" "/etc/" config/Makefile.*
-
-       Fpatch xfree86-Makefile.patch
-
Fautoreconf

Fmake \
@@ -94,21 +69,20 @@ build() {
--enable-ipv6 \
--enable-dri \
--with-dri-driver-path=/usr/lib/dri \
-               --disable-xprint \
--enable-xcsecurity \
--enable-xorg \
-               --disable-dbus \
-               --enable-dmx \
+               --disable-dmx \
--enable-xtrap \
-               --enable-xephyr \
-               --enable-kdrive \
-               --enable-xsdl \
+               --disable-xephyr \
+               --disable-kdrive \
+               --disable-xsdl \
--enable-xevie \
-               --enable-xvfb \
+               --disable-xvfb \
+               --disable-xfake \
--enable-vfb \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
-               --enable-multibuffer \
+               --disable-multibuffer \
--with-vendor-web="http://www.frugalware.org"; \
--with-os-name="Frugalware Linux" \
--with-os-vendor="Frugalware.org Development Team" \
@@ -122,21 +96,13 @@ build() {
--enable-composite \
--enable-glx-tls \
--enable-install-setuid \
-               --disable-config-dbus \
+               --enable-config-dbus \
--enable-record \
-               --disable-config-hal # DISABLED THIS for now , not really 
complete
+               --enable-config-hal
Fmakeinstall
# TODO - Move away from here
Ffile /etc/sysconfig/desktop

-       ######################
-       ## Disabled for reasons :P
-       #Frcd xprint
-       ## I dont think that simple user need this Xsession file on by-default 
:S
-       #Fmkdir /etc/X11/Xsession.d.xprint
-       #Fmv /etc/X11/Xsession.d/92* /etc/X11/Xsession.d.xprint/
-       ######################
-
## Split libdri for fglrx
#Fsplit libdri usr/include/xorg/dri*
Fsplit libdri usr/lib/xorg/modules/extensions/libdri.*
@@ -145,18 +111,18 @@ 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
}

# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to