[arch-commits] Commit in nvidia-173xx/trunk (3 files)

[Tobias Powalowski]

    Date: Thursday, June 11, 2009 @ 13:57:41
  Author: tpowa
Revision: 42155

upgpkg: nvidia-173xx 173.14.18-3

Added:
  nvidia-173xx/trunk/nvidia-173.14.18-2.6.30.patch
Modified:
  nvidia-173xx/trunk/PKGBUILD
  nvidia-173xx/trunk/nvidia.install

-------------------------------+
 PKGBUILD                      |   16 +++---
 nvidia-173.14.18-2.6.30.patch |  103 ++++++++++++++++++++++++++++++++++++++++
 nvidia.install                |    4 -
 3 files changed, 114 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-11 17:50:19 UTC (rev 42154)
+++ PKGBUILD	2009-06-11 17:57:41 UTC (rev 42155)
@@ -3,26 +3,28 @@
 
 pkgname=nvidia-173xx
 pkgver=173.14.18
-_kernver='2.6.29-ARCH'
-pkgrel=2
+_kernver='2.6.30-ARCH'
+pkgrel=3
 pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
-depends=('kernel26>=2.6.29' 'kernel26<2.6.30' 'nvidia-173xx-utils')
+depends=('kernel26>=2.6.30' 'kernel26<2.6.31' 'nvidia-173xx-utils')
 conflicts=('nvidia-96xx' 'nvidia')
 license=('custom')
 install=nvidia.install
-source=("http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
-md5sums=('480c10f3d861fd2c3cc2a46bccc961a4')
-[ "$CARCH" = "x86_64" ] && md5sums=('39e26816de3b7d3692d28f9bd396eaf6')
+source=("http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run"
+         nvidia-173.14.18-2.6.30.patch)
+md5sums=('480c10f3d861fd2c3cc2a46bccc961a4' '4e98cb82462ca5ad791cf9ef862388f9')
+[ "$CARCH" = "x86_64" ] && md5sums=('39e26816de3b7d3692d28f9bd396eaf6' '4e98cb82462ca5ad791cf9ef862388f9')
 
 build() {
 	cd $srcdir
 	sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
 	cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
-
+	# fix for 2.6.30
+	patch -Np0 -i ../nvidia-173.14.18-2.6.30.patch || return 1
 	cd usr/src/nv/
 	ln -s Makefile.kbuild Makefile
 	make SYSSRC=/lib/modules/${_kernver}/build module || return 1

Added: nvidia-173.14.18-2.6.30.patch
===================================================================
--- nvidia-173.14.18-2.6.30.patch	                        (rev 0)
+++ nvidia-173.14.18-2.6.30.patch	2009-06-11 17:57:41 UTC (rev 42155)
@@ -0,0 +1,103 @@
+--- usr/src/nv/nv.c.orig 
++++ usr/src/nv/nv.c 
+@@ -15,6 +15,7 @@
+ #include "os-agp.h"
+ #include "nv-vm.h"
+ #include "nv-reg.h"
++#include <linux/version.h>
+ 
+ #ifdef MODULE_ALIAS_CHARDEV_MAJOR
+ MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
+@@ -499,10 +500,12 @@
+      * Set the module owner to ensure that the reference
+      * count reflects accesses to the proc files.
+      */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+     proc_nvidia->owner = THIS_MODULE;
+     proc_nvidia_cards->owner = THIS_MODULE;
+     proc_nvidia_warnings->owner = THIS_MODULE;
+ 
++#endif
+     for (j = 0; j < num_nv_devices; j++)
+     {
+         nvl = &nv_linux_devices[j];
+@@ -521,7 +524,9 @@
+ 
+         entry->data = nv;
+         entry->read_proc = nv_kern_read_cardinfo;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+         entry->owner = THIS_MODULE;
++#endif
+ 
+         if (nvos_find_agp_capability(dev)) {
+             /*
+@@ -534,7 +539,9 @@
+                 goto failed;
+             }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+             entry->owner = THIS_MODULE;
++#endif
+             proc_nvidia_agp = entry;
+ 
+             entry = create_proc_entry("status", flags, proc_nvidia_agp);
+@@ -545,7 +552,9 @@
+ 
+             entry->data = nv;
+             entry->read_proc = nv_kern_read_status;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+             entry->owner = THIS_MODULE;
++#endif
+ 
+             entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
+             if (!entry) {
+@@ -555,8 +564,9 @@
+ 
+             entry->data = NULL;
+             entry->read_proc = nv_kern_read_agpinfo;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+             entry->owner = THIS_MODULE;
+-
++#endif
+             entry = create_proc_entry("card", flags, proc_nvidia_agp);
+             if (!entry) {
+                 NV_PCI_DEV_PUT(dev);
+@@ -565,7 +575,9 @@
+ 
+             entry->data = nv;
+             entry->read_proc = nv_kern_read_agpinfo;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+             entry->owner = THIS_MODULE;
++#endif
+         }
+ 
+         NV_PCI_DEV_PUT(dev);
+@@ -576,14 +588,18 @@
+         goto failed;
+ 
+     entry->read_proc = nv_kern_read_version;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+     entry->owner = THIS_MODULE;
++#endif
+ 
+     entry = create_proc_entry("registry", flags, proc_nvidia);
+     if (!entry)
+         goto failed;
+ 
+     entry->read_proc = nv_kern_read_registry;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+     entry->owner = THIS_MODULE;
++#endif
+ 
+     return;
+ 
+@@ -610,7 +626,9 @@
+ 
+     entry->data = (void *)message;
+     entry->read_proc = nv_kern_read_warning;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+     entry->owner = THIS_MODULE;
++#endif
+ #endif
+ }
+ 

Modified: nvidia.install
===================================================================
--- nvidia.install	2009-06-11 17:50:19 UTC (rev 42154)
+++ nvidia.install	2009-06-11 17:57:41 UTC (rev 42155)
@@ -1,5 +1,5 @@
 post_install() {
-	KERNEL_VERSION='2.6.29-ARCH'
+	KERNEL_VERSION='2.6.30-ARCH'
 	depmod $KERNEL_VERSION
 }
 
@@ -9,6 +9,6 @@
 }
 
 post_remove() {
-	KERNEL_VERSION='2.6.29-ARCH'
+	KERNEL_VERSION='2.6.30-ARCH'
 	depmod $KERNEL_VERSION
 }