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

[Thomas Bächler]

    Date: Wednesday, April 28, 2010 @ 13:42:57
  Author: thomas
Revision: 78857

Add xorg.conf.d file to allow nvidia autodetection (xorg-server 1.8 and newer only)

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

----------------+
 20-nvidia.conf |    4 ++++
 PKGBUILD       |   15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

Added: 20-nvidia.conf
===================================================================
--- 20-nvidia.conf	                        (rev 0)
+++ 20-nvidia.conf	2010-04-28 17:42:57 UTC (rev 78857)
@@ -0,0 +1,4 @@
+Section "Device"
+        Identifier      "Default nvidia Device"
+        Driver  "nvidia"
+EndSection

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-28 16:31:39 UTC (rev 78856)
+++ PKGBUILD	2010-04-28 17:42:57 UTC (rev 78857)
@@ -4,7 +4,7 @@
 
 pkgname=nvidia-utils
 pkgver=195.36.24
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
@@ -16,9 +16,11 @@
 provides=('libgl')
 license=('custom')
 install=nvidia.install
-source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run")
-md5sums=('97d3e5f69707092aa643fb901bb94003')
-[ "$CARCH" = "x86_64" ] && md5sums=('9d58114ed8c89cd66fbaccad0c997ee8')
+source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run"
+        20-nvidia.conf)
+md5sums=('97d3e5f69707092aa643fb901bb94003'
+         'adbefbc0e570b3bd2b918ffd74443dde')
+[ "$CARCH" = "x86_64" ] && md5sums[0]='9d58114ed8c89cd66fbaccad0c997ee8'
 
 build() {
 	cd $srcdir
@@ -69,5 +71,8 @@
 	install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia/README || return 1
 
 	find $pkgdir/usr -type d -exec chmod 755 {} \;
-	chmod 644 $pkgdir/usr/lib/libXvMCNVIDIA.a
+	chmod 644 $pkgdir/usr/lib/libXvMCNVIDIA.a || return 1
+	
+	# Install xorg.conf.d file for nvidia autodetection in xorg.conf-less configurations
+	install -D -m644 $srcdir/20-nvidia.conf $pkgdir/etc/xorg.conf.d/20-nvidia.conf || return 1
 }