[arch-commits] Commit in nvidia-utils/trunk (20-nvidia.conf PKGBUILD)

[Pierre Schmitz]

    Date: Tuesday, August 24, 2010 @ 12:33:08
  Author: pierre
Revision: 88736

upgpkg: nvidia-utils 256.44-2
temporary ignore abi mismatch until nvidia support xorg-server 1.9

Modified:
  nvidia-utils/trunk/20-nvidia.conf
  nvidia-utils/trunk/PKGBUILD

----------------+
 20-nvidia.conf |    7 ++++++-
 PKGBUILD       |    9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

Modified: 20-nvidia.conf
===================================================================
--- 20-nvidia.conf	2010-08-24 15:57:12 UTC (rev 88735)
+++ 20-nvidia.conf	2010-08-24 16:33:08 UTC (rev 88736)
@@ -1,5 +1,10 @@
 Section "Device"
         Identifier "Default nvidia Device"
         Driver "nvidia"
-        Option "NoLogo" "True" 
+        Option "NoLogo" "True"
 EndSection
+
+Section "ServerFlags"
+	# temporary ignore abi mismatch until nvidia support xorg-server 1.9
+	Option "IgnoreABI" "True"
+EndSection

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-24 15:57:12 UTC (rev 88735)
+++ PKGBUILD	2010-08-24 16:33:08 UTC (rev 88736)
@@ -4,7 +4,7 @@
 
 pkgname=nvidia-utils
 pkgver=256.44
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -30,7 +30,7 @@
 fi
 
 source[1]='20-nvidia.conf'
-md5sums[1]='37e417b2c69e46de1346a653e07027fa'
+md5sums[1]='89bf9ae79a38e6070d2ae97efdadeed7'
 
 build() {
 	cd $srcdir
@@ -59,9 +59,8 @@
 	install -D -m644 cuda.h $pkgdir/usr/include/cuda/cuda.h
 	install -D -m644 cudaGL.h $pkgdir/usr/include/cuda/cudaGL.h
 	install -D -m644 cudaVDPAU.h $pkgdir/usr/include/cuda/cudaVDPAU.h
-	# nvidia-tls libraries
-	install -D -m755 libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver
-	install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/tls/libnvidia-tls.so.$pkgver
+	# nvidia-tls library
+	install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver
 	# OpenCL
 	install -D -m755 libnvidia-compiler.so.$pkgver $pkgdir/usr/lib/libnvidia-compiler.so.$pkgver
 	install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0