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

[Alexander Baldeck]

    Date: Monday, September 24, 2007 @ 12:08:31
  Author: alexander
    Path: /home/cvs-extra/extra/x11/nvidia-utils

Modified: PKGBUILD (1.27 -> 1.28) nvidia.install (1.3 -> 1.4)

* fixed conflict with xorg-server by using symlinks to libwfb.so


----------------+
 PKGBUILD       |    6 ++----
 nvidia.install |   11 ++++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)


Index: extra/x11/nvidia-utils/PKGBUILD
diff -u extra/x11/nvidia-utils/PKGBUILD:1.27 extra/x11/nvidia-utils/PKGBUILD:1.28
--- extra/x11/nvidia-utils/PKGBUILD:1.27	Tue Sep 18 19:02:50 2007
+++ extra/x11/nvidia-utils/PKGBUILD	Mon Sep 24 12:08:31 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.27 2007/09/18 23:02:50 thomas Exp $
+# $Id: PKGBUILD,v 1.28 2007/09/24 16:08:31 alexander Exp $
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 # Contributor: James Rayner <iphitus at gmail.com>
 
 pkgname=nvidia-utils
 pkgver=100.14.19
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86 	 
@@ -52,8 +52,6 @@
   ln -s /usr/lib/libGLcore.so.$pkgver libGLcore.so.1 || return 1
   ln -s /usr/lib/libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
   ln -s /usr/lib/libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
-  cd $startdir/pkg/usr/lib/xorg/modules
-  ln -s /usr/lib/xorg/modules/libnvidia-wfb.so.$pkgver libwfb.so
   cd $startdir/pkg/usr/lib/xorg/modules/extensions
   ln -s /usr/lib/xorg/modules/extensions/libglx.so.$pkgver libglx.so || return 1
 
Index: extra/x11/nvidia-utils/nvidia.install
diff -u extra/x11/nvidia-utils/nvidia.install:1.3 extra/x11/nvidia-utils/nvidia.install:1.4
--- extra/x11/nvidia-utils/nvidia.install:1.3	Tue Feb  6 08:18:03 2007
+++ extra/x11/nvidia-utils/nvidia.install	Mon Sep 24 12:08:31 2007
@@ -13,7 +13,10 @@
   echo nvidia-96xx-ck, nvidia-96xx-beyond, nvidia-96xx-suspend2 packages
   echo For a list of supported cards, see /usr/share/doc/nvidia/supported-cards.txt
   echo -------------------------------
-	 
+
+  echo ":: Updating symlinks to use built-in libwfb"
+  ln -sf /usr/lib/xorg/modules/libnvidia-wfb.so.* \
+         /usr/lib/xorg/modules/libwfb.so 
 }
 
 # arg 1:  the new package version
@@ -22,6 +25,12 @@
   post_install $1
 }
 
+post_remove() {
+  echo ":: Updating symlinks to use xorg-server libwfb"
+  ln -sf /usr/lib/xorg/modules/libwfb.so.* \
+         /usr/lib/xorg/modules/libwfb.so
+}
+
 op=$1
 shift
 $op $*