[arch-commits] Commit in nvidia/trunk (PKGBUILD kernel-2.6.33.patch nvidia.install)

[Pierre Schmitz]

    Date: Wednesday, March 31, 2010 @ 13:01:03
  Author: pierre
Revision: 74564

upgpkg: nvidia 195.36.15-1
upstream update

Modified:
  nvidia/trunk/PKGBUILD
  nvidia/trunk/nvidia.install
Deleted:
  nvidia/trunk/kernel-2.6.33.patch

---------------------+
 PKGBUILD            |   21 ++++-------
 kernel-2.6.33.patch |   91 --------------------------------------------------
 nvidia.install      |    4 +-
 3 files changed, 11 insertions(+), 105 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-31 16:41:43 UTC (rev 74563)
+++ PKGBUILD	2010-03-31 17:01:03 UTC (rev 74564)
@@ -2,30 +2,27 @@
 # Maintainer : Thomas Baechler <thomas at archlinux.org>
 
 pkgname=nvidia
-pkgver=190.53
-_kernver='2.6.33-ARCH'
-pkgrel=2
+pkgver=195.36.15
+_kernver='2.6.32-ARCH'
+pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
-depends=('kernel26>=2.6.33' 'kernel26<2.6.34' "nvidia-utils=${pkgver}")
-makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34')
+depends=('kernel26>=2.6.32' 'kernel26<2.6.33' "nvidia-utils=${pkgver}")
+makedepends=('kernel26-headers>=2.6.32' 'kernel26-headers<2.6.33')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
-source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run"
-        kernel-2.6.33.patch)
-options=(force)
-md5sums=('2e80419f6f9ac16beecd839874d0c5ab' '43be448d1e3ffefcf96c96d25a7e166e')
-[ "$CARCH" = "x86_64" ] && md5sums=('3d3e956366f9df0e4c64d2e0299d1029' '43be448d1e3ffefcf96c96d25a7e166e')
+source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
+md5sums=('b09b45113585524b08b3b2acfdf4a290')
+[ "$CARCH" = "x86_64" ] && md5sums=('82ff23e6d02b9f208c618ec17c60ca29')
+
 build() {
 	cd $srcdir
 	sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
 	cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
-        # fix for .33 compiling
-        patch -Np0 -i ../kernel-2.6.33.patch || return 1
 	cd usr/src/nv/
 	make SYSSRC=/lib/modules/${_kernver}/build module || return 1
 

Deleted: kernel-2.6.33.patch
===================================================================
--- kernel-2.6.33.patch	2010-03-31 16:41:43 UTC (rev 74563)
+++ kernel-2.6.33.patch	2010-03-31 17:01:03 UTC (rev 74564)
@@ -1,91 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh	
-+++ usr/src/nv/conftest.sh	2010-01-06 12:10:56.000000000 +0530
-@@ -32,14 +32,14 @@
-     # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
-     # the kernel as a stand-alone kernel.
-     #
--    FILE="linux/autoconf.h"
-+    FILE="generated/autoconf.h"
- 
-     if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-         #
-         # We are looking at a configured source tree; verify
-         # that it's not a Xen kernel.
-         #
--        echo "#include <linux/autoconf.h>
-+        echo "#include <generated/autoconf.h>
-         #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
-         #error CONFIG_XEN defined!
-         #endif
-@@ -111,7 +111,12 @@
-     fi
- }
- 
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <linux/version.h>
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+    #include <generated/autoconf.h>
-+    #else
-+    #include <linux/autoconf.h>
-+    #endif
-     #if defined(CONFIG_XEN) && \
-         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
-     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1294,7 +1299,7 @@
-                 echo "";
-             fi
-         fi
--        exit $RET
-+#        exit $RET
-     ;;
- 
-     get_uname)
-@@ -1316,11 +1321,11 @@
-             # tree or at headers shipped for a specific kernel.
-             # Determine the kernel version using a compile check.
-             #
--            FILE="linux/utsrelease.h"
-+            FILE="generated/utsrelease.h"
- 
-             if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-                 echo "$CONFTEST_PREAMBLE
--                #include <linux/utsrelease.h>
-+                #include <generated/utsrelease.h>
-                 int main() {
-                     printf(\"%s\", UTS_RELEASE);
-                     return 0;
-@@ -1375,7 +1380,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-@@ -1429,7 +1434,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-Index: usr/src/nv/nvacpi.c
-===================================================================
---- usr/src/nv/nvacpi.c	
-+++ usr/src/nv/nvacpi.c	2010-01-06 12:10:56.000000000 +0530
-@@ -49,6 +49,10 @@
- };
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,NULL,e,f)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle  = NULL;

Modified: nvidia.install
===================================================================
--- nvidia.install	2010-03-31 16:41:43 UTC (rev 74563)
+++ nvidia.install	2010-03-31 17:01:03 UTC (rev 74564)
@@ -1,5 +1,5 @@
 post_install() {
-	KERNEL_VERSION='2.6.33-ARCH'
+	KERNEL_VERSION='2.6.32-ARCH'
 	depmod $KERNEL_VERSION
 }
 
@@ -9,6 +9,6 @@
 }
 
 post_remove() {
-	KERNEL_VERSION='2.6.33-ARCH'
+	KERNEL_VERSION='2.6.32-ARCH'
 	depmod $KERNEL_VERSION
 }