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

[Jan de Groot]

    Date: Sunday, March 23, 2008 @ 07:44:58
  Author: jgc
    Path: /home/cvs-extra/extra/x11/xorg-server

Modified: PKGBUILD (1.52 -> 1.53)

upgpkg: xorg-server 1.4.0.90-9
    Fix XKB crashes
Revert weird change in /var/lib/xkb symlink
Enable Xephyr


----------+
 PKGBUILD |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)


Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.52 extra/x11/xorg-server/PKGBUILD:1.53
--- extra/x11/xorg-server/PKGBUILD:1.52	Sun Mar 16 16:54:53 2008
+++ extra/x11/xorg-server/PKGBUILD	Sun Mar 23 07:44:58 2008
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.52 2008/03/16 20:54:53 jgc Exp $
+# $Id: PKGBUILD,v 1.53 2008/03/23 11:44:58 jgc Exp $
 # Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
 pkgver=1.4.0.90
-pkgrel=8
+pkgrel=9
 _mesaver=7.0.3-rc2
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -25,10 +25,13 @@
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
 	http://www.mesa3d.org/beta/MesaLib-7.0.3-rc2.tar.gz
-	ftp://ftp.archlinux.org/other/xorg-server/xorg-server-patches-1.4-8.tar.bz2)
+	ftp://ftp.archlinux.org/other/xorg-server/xorg-server-patches-1.4-8.tar.bz2
+	xkb-fixes.patch)
+
 md5sums=('bb16e969850dbb5d3805cb88d35656d0'
          '141f5c1c89b090d0f0bd92522ebb8de9'
-         '55341205777a42712c445c5e24b57b6a')
+         '55341205777a42712c445c5e24b57b6a'
+	 '11fb627cd9004822050ef13a6d27f9a0')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -69,6 +72,8 @@
   patch -Np1 -i ${startdir}/src/mesa-7.0.3-rc2.patch || return 1
   patch -Np3 -i ${startdir}/src/xorg-redhat-die-ugly-pattern-die-die-die.patch || return 1
 
+  patch -Np1 -i ${startdir}/src/xkb-fixes.patch || return 1
+
   libtoolize --force --copy || return 1
   aclocal || return 1
   autoconf || return 1
@@ -88,7 +93,11 @@
 	      --enable-xephyr \
               --enable-glx-tls \
               --enable-xorgcfg \
-	      --disable-kdrive \
+	      --enable-kdrive \
+	      --disable-xfbdev \
+	      --disable-xfake \
+	      --disable-xsdl \
+	      --disable-kdrive-vesa \
               --enable-install-setuid \
               --disable-xprint \
               --sysconfdir=/etc/X11 \
@@ -106,7 +115,8 @@
 
   install -m755 -d ${startdir}/pkg/etc/X11 || return 1
   install -m755 -d ${startdir}/pkg/var/lib || return 1
-  ln -sf /usr/share/X11/xkb/compiled ${startdir}/pkg/var/lib/compiled || return 1
+  mv ${startdir}/pkg/usr/share/X11/xkb/compiled ${startdir}/pkg/var/lib/xkb
+  ln -sf /var/lib/xkb ${startdir}/pkg/usr/share/X11/xkb/compiled || return 1
 
   cd ${startdir}/pkg/usr/lib/xorg/modules/extensions
   mv libGLcore.so libGLcore.xorg