[arch-commits] CVS update of unstable/x11/nvidia-mm (3 files)

[Tom Killian]

    Date: Monday, July 30, 2007 @ 19:05:08
  Author: tom
    Path: /home/cvs-unstable/unstable/x11/nvidia-mm

   Added: kernel-2.6.23-rc1.patch (1.1)
Modified: PKGBUILD (1.3 -> 1.4) nvidia.install (1.1 -> 1.2)

upgpkg: nvidia-mm 100.14.11-1
with Gentoo patch for 2.6.23-rc1: http://bugs.gentoo.org/attachment.cgi?id=125959


-------------------------+
 PKGBUILD                |   25 ++++++++++++++-----------
 kernel-2.6.23-rc1.patch |   35 +++++++++++++++++++++++++++++++++++
 nvidia.install          |    4 ++--
 3 files changed, 51 insertions(+), 13 deletions(-)


Index: unstable/x11/nvidia-mm/PKGBUILD
diff -u unstable/x11/nvidia-mm/PKGBUILD:1.3 unstable/x11/nvidia-mm/PKGBUILD:1.4
--- unstable/x11/nvidia-mm/PKGBUILD:1.3	Mon Mar 19 07:00:42 2007
+++ unstable/x11/nvidia-mm/PKGBUILD	Mon Jul 30 19:05:07 2007
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD,v 1.3 2007/03/19 11:00:42 ganja_guru Exp $
+# $Id: PKGBUILD,v 1.4 2007/07/30 23:05:07 tom Exp $
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=nvidia-mm
-pkgver=1.0.9755
-_nver=1.0-9755
-_kernver='2.6.21-mm'
+pkgver=100.14.11
+_kernver='2.6.23-mm'
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26mm."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
 depends=('kernel26mm' 'nvidia-utils')
 install=nvidia.install
-source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${_nver}/NVIDIA-Linux-$ARCH-${_nver}-pkg0.run)
-md5sums=('991e03ceaff94fa8113ac04a541ec576')
-[ "$CARCH" = "x86_64" ] && md5sums=('8673ce0656527460488fe5a5974f9a84')
+source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run
+	kernel-2.6.23-rc1.patch)
+md5sums=('af434d27f9b089ac1cb216f55f9b0f33'
+         '33ec1f6734ed50277eaa314505706241')
+[ "$CARCH" = "x86_64" ] && md5sums=('e87b354355cce583646004dbfea1f09a'
+			            '33ec1f6734ed50277eaa314505706241')
 
 build()
 {
   # Extract
   cd $startdir/src/
-  sh NVIDIA-Linux-$ARCH-${_nver}-pkg0.run --extract-only
-  cd NVIDIA-Linux-$ARCH-${_nver}-pkg0
+  sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
+  cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
   
   # Any extra patches are applied in here...
+  patch -Np1 -i ../kernel-2.6.23-rc1.patch || return 1
 
   cd usr/src/nv/
   ln -s Makefile.kbuild Makefile
-  make SYSSRC=/lib/modules/$_kernver/build module 
+  make SYSSRC=/lib/modules/${_kernver}/build module || return 1
   
   # install kernel module
   mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
Index: unstable/x11/nvidia-mm/kernel-2.6.23-rc1.patch
diff -u /dev/null unstable/x11/nvidia-mm/kernel-2.6.23-rc1.patch:1.1
--- /dev/null	Mon Jul 30 19:05:08 2007
+++ unstable/x11/nvidia-mm/kernel-2.6.23-rc1.patch	Mon Jul 30 19:05:08 2007
@@ -0,0 +1,35 @@
+diff -Naur NVIDIA.orig/usr/src/nv/nv.c NVIDIA-Linux-x86_64-100.14.11-pkg2/usr/src/nv/nv.c
+--- NVIDIA.orig/usr/src/nv/nv.c	2007-06-14 02:18:38.000000000 +0200
++++ NVIDIA-Linux-x86_64-100.14.11-pkg2/usr/src/nv/nv.c	2007-07-24 20:46:40.000000000 +0200
+@@ -1566,8 +1566,7 @@
+         if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
+ #endif
+ 
+-    if (unregister_chrdev(nv_major, "nvidia") < 0)
+-        nv_printf(NV_DBG_ERRORS, "NVRM: unregister nv chrdev failed\n");
++    unregister_chrdev(nv_major, "nvidia");
+ 
+     for (i = 0; i < num_nv_devices; i++)
+     {
+@@ -1598,8 +1597,7 @@
+ 
+     nv_printf(NV_DBG_INFO, "NVRM: nvidia_exit_module\n");
+ 
+-    if (unregister_chrdev(nv_major, "nvidia") < 0)
+-        nv_printf(NV_DBG_ERRORS, "NVRM: unregister nv chrdev failed\n");
++    unregister_chrdev(nv_major, "nvidia"); 
+ 
+     for (i = 0; i < num_nv_devices; i++)
+     {
+diff -Naur NVIDIA.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-100.14.11-pkg2/usr/src/nv/nv-linux.h
+--- NVIDIA.orig/usr/src/nv/nv-linux.h	2007-06-14 02:18:38.000000000 +0200
++++ NVIDIA-Linux-x86_64-100.14.11-pkg2/usr/src/nv/nv-linux.h	2007-07-24 20:46:40.000000000 +0200
+@@ -533,7 +533,7 @@
+ #define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
+     {                                                           \
+         kmem_cache = kmem_cache_create(name, sizeof(type),      \
+-                        0, 0, NULL, NULL);                      \
++                        0, 0, NULL);                            \
+     } 
+ 
+ #define NV_KMEM_CACHE_DESTROY(kmem_cache)                       \
Index: unstable/x11/nvidia-mm/nvidia.install
diff -u unstable/x11/nvidia-mm/nvidia.install:1.1 unstable/x11/nvidia-mm/nvidia.install:1.2
--- unstable/x11/nvidia-mm/nvidia.install:1.1	Sun Mar  4 19:19:45 2007
+++ unstable/x11/nvidia-mm/nvidia.install	Mon Jul 30 19:05:08 2007
@@ -1,6 +1,6 @@
 # arg 1:  the new package version
 post_install() {
-  KERNEL_VERSION='2.6.21-mm'
+  KERNEL_VERSION='2.6.23-mm'
   depmod -v $KERNEL_VERSION  > /dev/null 2>&1		 
 }
 
@@ -13,7 +13,7 @@
 
 # arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION='2.6.21-mm'
+  KERNEL_VERSION='2.6.23-mm'
   depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
 }