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

[Alexander Baldeck]

    Date: Wednesday, February 20, 2008 @ 14:50:56
  Author: alexander
    Path: /home/cvs-extra/extra/x11/xorg-server

Modified: PKGBUILD (1.50 -> 1.51) xorg-server.install (1.2 -> 1.3)

* enabled dbus/hal support
* added warning about necessary config changes to xorg-server.install


---------------------+
 PKGBUILD            |   16 +++++++++++-----
 xorg-server.install |   17 ++++++++++++++++-
 2 files changed, 27 insertions(+), 6 deletions(-)


Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.50 extra/x11/xorg-server/PKGBUILD:1.51
--- extra/x11/xorg-server/PKGBUILD:1.50	Sat Jan 26 04:58:05 2008
+++ extra/x11/xorg-server/PKGBUILD	Wed Feb 20 14:50:56 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.50 2008/01/26 09:58:05 jgc Exp $
+# $Id: PKGBUILD,v 1.51 2008/02/20 19:50:56 alexander 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=6
+pkgrel=7
 _mesaver=7.0.3-rc1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 depends=('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.6' 'xbitmaps' 'libgl')
+	 'libxfixes' 'xorg-fonts-misc' 'pixman>=0.9.6' 'xbitmaps' 'libgl' 'hal')
 makedepends=('pkgconfig' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto'
              'xf86bigfontproto' 'resourceproto' 'evieext' 'damageproto>=1.1.0'
 	     'compositeproto>=0.4' 'scrnsaverproto' 'libxres' 'xorg-util-macros'
@@ -116,7 +116,7 @@
               --with-mesa-source=${startdir}/src/Mesa-${_mesaver} \
               --enable-ipv6 \
               --enable-dri \
-              --enable-dmx \
+              --disable-dmx \
               --enable-xvfb \
               --enable-xnest \
               --enable-composite \
@@ -137,7 +137,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 \
+              --enable-config-hal \
               --disable-static
 
   make || return 1
@@ -157,6 +157,12 @@
 
   mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
   install -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/
+
+  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/config/xorg-server.conf \
+                   ${startdir}/pkg/etc/dbus-1/system.d/xorg-server.conf
+
+  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/config/x11-input.fdi \
+                   ${startdir}/pkg/etc/hal/fdi/policy/11-xkeyboard.fdi
 }
 md5sums=('bb16e969850dbb5d3805cb88d35656d0'
          '9bd9a3f3cebac89ff5a3571e1f51ca4f'
Index: extra/x11/xorg-server/xorg-server.install
diff -u extra/x11/xorg-server/xorg-server.install:1.2 extra/x11/xorg-server/xorg-server.install:1.3
--- extra/x11/xorg-server/xorg-server.install:1.2	Wed Oct 10 15:21:04 2007
+++ extra/x11/xorg-server/xorg-server.install	Wed Feb 20 14:50:56 2008
@@ -7,9 +7,24 @@
     ln -sf /usr/lib/xorg/modules/libwfb.so.1.4 \
           /usr/lib/xorg/modules/libwfb.so
   else
-    echo ":: Another libwfb has been detected."
+    echo ":: Another libwfb has been detected thus we are linking"
+    echo ":: it to libwfb.so."
+    echo " "
   fi
 
+  echo ":: ATTENTION!"
+  echo ":: Since xorg-server version 1.4.0.90-7 hal support has"
+  echo ":: been enabled. By default keyboard layouts and variants"
+  echo ":: will now be overridden by hal. Please modfiy"
+  echo "::"
+  echo "::     /etc/hal/fdi/policy/11-xkeyboard.fdi"
+  echo "::"
+  echo ":: to suit your needs and restart X."
+  echo ":: Furthermore, if you want to take full advantage of the"
+  echo ":: new hotplug features, please consider installing"
+  echo "::"
+  echo "::     xf86-input-evdev"
+
   /bin/true
 }