[arch-commits] CVS update of extra/x11/xorg-server (PKGBUILD)

[Alexander Baldeck]

    Date: Monday, December 17, 2007 @ 05:20:23
  Author: alexander
    Path: /home/cvs-extra/extra/x11/xorg-server

Modified: PKGBUILD (1.41 -> 1.42)

upgpkg: xorg-server 1.4.0.90


----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)


Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.41 extra/x11/xorg-server/PKGBUILD:1.42
--- extra/x11/xorg-server/PKGBUILD:1.41	Thu Nov 29 11:51:34 2007
+++ extra/x11/xorg-server/PKGBUILD	Mon Dec 17 05:20:23 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.41 2007/11/29 16:51:34 alexander Exp $
+# $Id: PKGBUILD,v 1.42 2007/12/17 10:20:23 alexander Exp $
 # Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server
-pkgver=1.4
-pkgrel=6
+pkgver=1.4.0.90
+pkgrel=1
 _mesaver=7.0.1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -11,12 +11,12 @@
 depends=('gcc' 'libxkbui' 'ncurses' 'libxi' 'libxxf86misc' 'libxfont'
          'libxrender' 'libdmx' 'libxaw' 'libxxf86vm' 'xcursor-themes'
 	 'xkeyboard-config' 'xorg-server-utils' 'xorg-utils' 'libdrm>=2.3.0'
-	 'libxfixes' 'xorg-fonts-misc' 'pixman>=0.9.5')
+	 'libxfixes' 'xorg-fonts-misc' 'pixman>=0.9.6')
 makedepends=('pkgconfig' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto'
              'xf86bigfontproto' 'resourceproto' 'evieext' 'damageproto>=1.1.0'
 	     'compositeproto>=0.4' 'scrnsaverproto' 'libxres' 'xorg-util-macros'
-	     'randrproto' 'glproto>=1.4.8' 'renderproto>=0.9.3' 'autoconf' 'automake'
-	     'libtool')
+	     'randrproto' 'glproto>=1.4.9' 'renderproto>=0.9.3' 'autoconf' 'automake'
+	     'libtool' 'bison' 'flex')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
@@ -31,8 +31,7 @@
 	xorg-server-1.2.0-defaultdpi.patch
 	xorg-x11-server-1.1.1-no-scanpci.patch
 	xserver-1.3.0-newglx-offscreen-pixmaps.patch
-	xorg-server-1.4-kbd-leds-fix.patch
-	xorg-server-1.4-mapping-changes-for-all.diff)
+	xorg-server-1.4-kbd-leds-fix.patch)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -46,7 +45,6 @@
   patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-no-scanpci.patch || return 1
   patch -Np1 -i ${startdir}/src/xserver-1.3.0-newglx-offscreen-pixmaps.patch || return 1
   patch -Np1 -i ${startdir}/src/xorg-server-1.4-kbd-leds-fix.patch || return 1
-  patch -Np1 -i ${startdir}/src/xorg-server-1.4-mapping-changes-for-all.diff || return 1
 
   # Own patches
   patch -Np1 -i ${startdir}/src/xorg-server-1.2.0-defaultdpi.patch || return 1
@@ -82,6 +80,7 @@
               --with-xkb-path=/usr/share/X11/xkb \
               --with-xkb-output=/usr/share/X11/xkb/compiled \
               --with-dri-driver-path=/usr/lib/xorg/modules/dri \
+              --disable-config-hal \
               --disable-static
 
   make || return 1
@@ -99,7 +98,7 @@
   mv ${startdir}/pkg/usr/lib/xorg/modules/libwfb.so \
      ${startdir}/pkg/usr/lib/xorg/modules/libwfb.so.1.4
 }
-md5sums=('a06d9fe4f9f1d459ae02657f9ce64220'
+md5sums=('bb16e969850dbb5d3805cb88d35656d0'
          'c056abd763e899114bf745c9eedbf9ad'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
          '342a7d2fc0727b12f2840057c1feb2be'
@@ -109,5 +108,4 @@
          'e162134c68230f7b168430fe73b4881a'
          '43257d8ade0f087870426eca1f09005c'
          '0241d51f94de450845531b4df2af2527'
-         '958d907381f0df253668a5d9473d1adf'
-         '4b744e3ccebbeb1420b6f8e04daca532')
+         '958d907381f0df253668a5d9473d1adf')