Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2631.git;a=commitdiff;h=65d7a9d35c08fd5c24aec112fd9b383a56853568
commit 65d7a9d35c08fd5c24aec112fd9b383a56853568 Author: Miklos Vajna <[email protected]> Date: Mon Sep 14 23:26:01 2009 +0200 nvidia-173xx-173.14.20-1-i686 - version bump diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild b/source/x11-extra/nvidia-173xx/FrugalBuild index 773c594..db587ac 100644 --- a/source/x11-extra/nvidia-173xx/FrugalBuild +++ b/source/x11-extra/nvidia-173xx/FrugalBuild @@ -2,14 +2,12 @@ # Maintainer: Michel Hermier <[email protected]> pkgname=nvidia-173xx -pkgver=173.14.18 -pkgrel=9 +pkgver=173.14.20 +pkgrel=1 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="173.14.xx" Finclude nvidia case "$_F_nvidia_arch" in -x86) sha1sums=('8a5c537d08517dff59e854991a14486a02f970cc');; -x86_64) sha1sums=('06761c527ab5896b142c9e642315fb58bdbc111c');; +x86) sha1sums=('dfe5e9f96bd9be084cf79c835bfc0f3d39ebc286');; +x86_64) sha1sums=('f511775a8bfecb6d292ce775d407fcf6b2b756af');; esac -source=(${sour...@]} nvidia-2.6.30.diff) -sha1sums=(${sha1su...@]} 'dc16a860c243375359884c2d3419ef65202255ce') diff --git a/source/x11-extra/nvidia-173xx/nvidia-2.6.30.diff b/source/x11-extra/nvidia-173xx/nvidia-2.6.30.diff deleted file mode 100644 index 09a4149..0000000 --- a/source/x11-extra/nvidia-173xx/nvidia-2.6.30.diff +++ /dev/null @@ -1,103 +0,0 @@ ---- nvidia/usr/src/nv/nv.c.orig -+++ nvidia/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 - } - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
