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

[Alexander Baldeck]

    Date: Monday, September 24, 2007 @ 12:06:20
  Author: alexander
    Path: /home/cvs-extra/extra/x11/xorg-server

   Added: xorg-server.install (1.1)
Modified: PKGBUILD (1.35 -> 1.36)

* fixed conflict with nvidia-utils by using symlinks to libwfb.so


---------------------+
 PKGBUILD            |    9 +++++++--
 xorg-server.install |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)


Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.35 extra/x11/xorg-server/PKGBUILD:1.36
--- extra/x11/xorg-server/PKGBUILD:1.35	Sat Sep 22 14:52:38 2007
+++ extra/x11/xorg-server/PKGBUILD	Mon Sep 24 12:06:19 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.35 2007/09/22 18:52:38 alexander Exp $
+# $Id: PKGBUILD,v 1.36 2007/09/24 16:06:19 alexander Exp $
 # Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 _mesaver=7.0.1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -20,6 +20,7 @@
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
+install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2
 	xorg-redhat-die-ugly-pattern-die-die-die.patch
@@ -85,6 +86,10 @@
   cd ${startdir}/pkg/usr/lib/xorg/modules/extensions
   mv libGLcore.so libGLcore.xorg
   mv libglx.so libglx.xorg
+
+  # prevent conflict with nvidia-utils
+  mv ${startdir}/pkg/usr/lib/xorg/modules/libwfb.so \
+     ${startdir}/pkg/usr/lib/xorg/modules/libwfb.so.1.4
 }
 md5sums=('a06d9fe4f9f1d459ae02657f9ce64220'
          'c056abd763e899114bf745c9eedbf9ad'
Index: extra/x11/xorg-server/xorg-server.install
diff -u /dev/null extra/x11/xorg-server/xorg-server.install:1.1
--- /dev/null	Mon Sep 24 12:06:19 2007
+++ extra/x11/xorg-server/xorg-server.install	Mon Sep 24 12:06:19 2007
@@ -0,0 +1,47 @@
+post_install() {
+  pacman -Q nvidia-utils &>/dev/null
+  hasnvidiawfb=$?
+
+  if [ ${hasnvidiawfb} -eq 0 ]; then
+    echo ":: Could not detect nvidia-utils on system"
+    echo ":: Will attempt to use built-in libwfb"
+    ln -sf /usr/lib/xorg/modules/libwfb.so.1.4 \
+          /usr/lib/xorg/modules/libwfb.so
+  else
+    echo ":: Another libwfb has been detected." 
+  fi
+
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  pacman -Q nvidia-utils &>/dev/null
+  hasnvidiawfb=$?
+
+  if [ ${hasnvidiawfb} -eq 0 ]; then
+    echo ":: Could not detect nvidia-utils on system"
+    echo ":: Will attempt to use built-in libwfb"
+    ln -sf /usr/lib/xorg/modules/libwfb.so.1.4 \
+          /usr/lib/xorg/modules/libwfb.so
+  else
+    echo ":: Another libwfb has been detected."
+  fi
+
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  if [ -f /usr/lib/xorg/modules/libwfb.so ]; then
+    echo "::Removing obsolete symlinks"
+    rm /usr/lib/xorg/modules/libwfb.so
+  fi
+}
+
+op=$1
+shift
+[ "$(type -t "$op")" = "function" ] && $op "$@"
+
+# vim:set ts=2 sw=2 et: