Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2631.git;a=commitdiff;h=1de314a97c00ed2c4e7dc2b2eeb2a46f4ef3735c

commit 1de314a97c00ed2c4e7dc2b2eeb2a46f4ef3735c
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Sep 14 23:33:17 2009 +0200

nvidia-96xx-96.43.13-1-i686

- version bump

diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild 
b/source/x11-extra/nvidia-96xx/FrugalBuild
index c51555f..1612a04 100644
--- a/source/x11-extra/nvidia-96xx/FrugalBuild
+++ b/source/x11-extra/nvidia-96xx/FrugalBuild
@@ -2,14 +2,12 @@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia-96xx
-pkgver=96.43.11
-pkgrel=9
+pkgver=96.43.13
+pkgrel=1
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="96.43.xx"
Finclude nvidia
case "$_F_nvidia_arch" in
-x86)    sha1sums=('619d5b5850cfb6c35dd74b048d23de0c4e267166');;
-x86_64) sha1sums=('3a3103319b184af04341da877049584f4db52130');;
+x86)    sha1sums=('6613908ea1dfc875e63b3b96f246079b80c21a2b');;
+x86_64) sha1sums=('9c0d72c9f9badd7e6a60606041f89f8d29ce80da');;
esac
-source=(${sour...@]} nvidia-2.6.30.diff)
-sha1sums=(${sha1su...@]} '3dc0b85e14462abc6faf9230e9fb81bebea6d2ca')
diff --git a/source/x11-extra/nvidia-96xx/nvidia-2.6.30.diff 
b/source/x11-extra/nvidia-96xx/nvidia-2.6.30.diff
deleted file mode 100644
index e19e743..0000000
--- a/source/x11-extra/nvidia-96xx/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 "nv_compiler.h"
- #include "os-agp.h"
- #include "nv-vm.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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to