add 2.6.33 kernel support to 190.53

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 104 insertions, 2 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index ad386d6a3e84..6b095b67d0ed 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.220 2010/02/27 05:33:50 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.221 2010/02/28 17:43:37 lxnay Exp $
+
+  28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org>
+  nvidia-drivers-190.53-r1.ebuild,
+  +files/nvidia-drivers-190.53-2.6.33.patch:
+  add 2.6.33 kernel support to 190.53
 
 *nvidia-drivers-173.14.25 (27 Feb 2010)
 
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
new file mode 100644
index 000000000000..75daad33ec6a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
@@ -0,0 +1,92 @@
+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,e,f,NULL)
++#endif
++
+ static struct acpi_driver *nv_acpi_driver;
+ static acpi_handle nvif_handle = NULL;
+ static acpi_handle dsm_handle  = NULL;
+
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.53-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.53-r1.ebuild
index fd642b2f47b2..74952fcdb95b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.53-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.53-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.53-r1.ebuild,v 1.1 2010/01/04 08:23:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.53-r1.ebuild,v 1.2 2010/02/28 17:43:37 lxnay Exp $
 
 EAPI="2"
 
@@ -247,6 +247,11 @@ src_prepare() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
+	# 2.6.33 kernel support
+	if use kernel_linux && kernel_is eq 2 6 33; then
+		epatch "${FILESDIR}"/nvidia-drivers-190.53-2.6.33.patch
+	fi
+
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
 		sed -i \