add 2.6.33 kernel support to 190.53

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 107 insertions, 4 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/Manifest b/x11-drivers/nvidia-drivers/Manifest
index e5d13b157425..8eec0df09fc9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -9,6 +9,7 @@ AUX eblits/want_tls.eblit 952 RMD160 4f33e6aef50032665d68654af1cfdbd9abc54195 SH
 AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b
 AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5
 AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577
+AUX nvidia-drivers-190.53-2.6.33.patch 2893 RMD160 29f6cf29909828f8d22504dfcb43b23aeeff78dd SHA1 412f8a2b208e8af886891985fcabf8623c9943c3 SHA256 68f5cdf4489fb6bc480319e4bda6e6481beb189cf37920b939b8f7bbf77aed1f
 DIST NVIDIA-FreeBSD-x86-173.14.20.tar.gz 16211218 RMD160 4c5dabe1f6ab708c3dab6722889e44968ca492f0 SHA1 0dbf09c072fe706d4fd71fe817830305e6100955 SHA256 c5a27324d96391ada41b4ccbbf2a321c3d86693e54d1e9d1139d97c3132530f3
 DIST NVIDIA-FreeBSD-x86-173.14.22.tar.gz 16681759 RMD160 bd1e1321dd9f21c1642c1e155db29b78d4af0a3f SHA1 af97c1ff136924520d6738cbf0a376f63c297a18 SHA256 fac71118334ef32874daa5fd98e56c4af2f9fcdf56d63b20e6f92983a5f91c31
 DIST NVIDIA-FreeBSD-x86-173.14.25.tar.gz 16682722 RMD160 37ff4b3024441602b7c15d1906258c7a0191399a SHA1 da101f74036c1f6e23c4304de8a5f85f341befed SHA256 c432ed94ce71e297b2d9304d9f34f906b58e2c7c4bc13d8dbac264ed52fd6261
@@ -60,7 +61,7 @@ EBUILD nvidia-drivers-185.18.36-r1.ebuild 16264 RMD160 8f76a7545d9ec9d70c13ae618
 EBUILD nvidia-drivers-185.18.36.ebuild 16591 RMD160 5ac4206213be615d72d7b67a53169ed18bf6b915 SHA1 e645f9bcfc7d2b6886227b7b2d02e55421f1be3e SHA256 94d99ea4a82a7a2f63031e8c576706c68136b1a6b41ab981d4aab1d75a61d2ab
 EBUILD nvidia-drivers-190.29.ebuild 15353 RMD160 e439a3839d956262b0427c2661f9e1823951325a SHA1 e4f777a6cc4e37da069237217dd1799fe66a327f SHA256 b98654a9dfae05d02ac81d59e77b5fe562d9239276456f3554fa9c178e65ef64
 EBUILD nvidia-drivers-190.42-r3.ebuild 15282 RMD160 ff418b19939fa0713d7936fdb59c79271af88f3e SHA1 b20c07e5666d7142d1547fd9e01092299b0a8bf4 SHA256 ada0cb8105e4db6741c21a5eb8405a398fd1c45249479c44dad561cbf238a55c
-EBUILD nvidia-drivers-190.53-r1.ebuild 15342 RMD160 49acc783ba0950eb79015cfdd0eba872c7e2bca2 SHA1 fc798a73ec12f79a54d0b6446bdbea757f6ea813 SHA256 5583f25a96c3d199dd838951b70056a86b4eaf4fb4b9695d403f5cebb78ffc31
+EBUILD nvidia-drivers-190.53-r1.ebuild 15479 RMD160 7f761296c196d4e4775dc67662d1845c81439e1a SHA1 73bfc73a92a7b053917359507276128bfc8efceb SHA256 2ac46e8e0ed83858b17ca93a2e9bae382b5c219e7c0179359e7077c90287841e
 EBUILD nvidia-drivers-190.53.ebuild 15433 RMD160 9c022ae67a85daa45f44f276c94c75a5119261a4 SHA1 10d2d4f25b5ebd6271541e0d0d7872c7df6c346a SHA256 0e73c7d4ee5863977abb00f5b4354ee56e15dea0e9289d2eacdefc0413243634
 EBUILD nvidia-drivers-195.30.ebuild 15598 RMD160 fedc138e6c200cfe810cec81fd346168d2f09da8 SHA1 252a43050c78afe4d77281eea38f2ad7715151c7 SHA256 2fb38cb81fe6e43eb42e231c8eaf9354fe402ef94e098d9c864b838ac16a6706
 EBUILD nvidia-drivers-195.36.03.ebuild 15601 RMD160 a266feb71c16cabe608ee7c8d0931aa62d45d1a0 SHA1 5cbcfc9b40036e1c6c603ffbe17101e288309496 SHA256 eaf3ab24a899f2715d35d7a6f64f5b4077443033e361ff97cbb9837d0940fd50
@@ -69,5 +70,5 @@ EBUILD nvidia-drivers-71.86.11.ebuild 14141 RMD160 e1ca921a6dc2381be5acf05afa393
 EBUILD nvidia-drivers-96.43.13.ebuild 14468 RMD160 4c0bbeb1f06cb7df7900d2d2d5ac08703345f548 SHA1 375a2babdcd5ace77ac4b436b6591cf9a1a2f66a SHA256 28ad4cf84b0f6e2f9c8b5aa274c90747bfaff6d91a1778e2d6109a3de668e6d3
 EBUILD nvidia-drivers-96.43.14.ebuild 15370 RMD160 b14c286fc0eba4066ac78f3603223f404d3c293f SHA1 9526821a410c553c26e41f610502297b12bcd330 SHA256 05f4a3bab44153cef7c0eb09e8dbdcaca73c3391eb7c18a2a47ccd798cbd8255
 EBUILD nvidia-drivers-96.43.16.ebuild 15370 RMD160 3cca3242c024470a3b4ea80c74a676a477a96fde SHA1 8d1cd290a0ac263e311fd2b8755cff834e16c62a SHA256 8fd4fa32f1067998b1a711f00c3e3c2bf4752e5c91575e1cd04e7fc1f5d7d1f3
-MISC ChangeLog 49023 RMD160 924d9717278eafb829c3867630f70166644c791f SHA1 8922982d960bc2e249a61553902cc8e3c06c4b07 SHA256 0427e16caa6f3b922daa36451631e23c500a0256c14a3268ecda3c14a686e775
+MISC ChangeLog 49189 RMD160 7602d0ce5a525ea6b3bd4ceef742bfcf929dba29 SHA1 d749a1cf7fce63c0d0b4c8bcf0df34980fc90f6f SHA256 93cc22547f7085047eff7c8ac6e5baad880b555900c653d9980ae2bb72e02956
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
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 \