Add patch from upstream for linux 2.6.28 support.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 202 insertions, 5 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 7c10008ed4a0..1dd61ba926a0 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.124 2008/12/19 01:43:05 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.125 2008/12/25 10:16:46 vapier Exp $
+
+  25 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/nvidia-2.6.28.patch, nvidia-drivers-177.82.ebuild:
+  Add patch from upstream for linux 2.6.28 support.
 
 *nvidia-drivers-173.14.15 (19 Dec 2008)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 241b5552425b..f59f7c346e7a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf
@@ -11,6 +14,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-2.6.28.patch 5665 RMD160 a3575e7c8907955bfee6608bfd3ea7e30d8d5c3b SHA1 727a575105fb59eb67495ab35680e3095f6dec5a SHA256 ddb20b21074dd8bbf0bb32ac830b662bde77ba8dfd54ef515672876bb30f21e0
 DIST NVIDIA-FreeBSD-x86-100.14.19.tar.gz 11146166 RMD160 144d7a91fb4da94ae45bf9767ac66b2a3b2f0801 SHA1 8f34cd0467672a51103fed0fce64264b4ef71957 SHA256 c5a37e34266538b0ecfbbec95c7d5f9767e0d750cbf66a7cb54cc13895d601ad
 DIST NVIDIA-FreeBSD-x86-173.14.09.tar.gz 15858904 RMD160 4935e736e227f1107a70261b1228297365f8e73a SHA1 ccfa5e60e02dc71e340a7c241ab0aed80389127b SHA256 be69a164e60c48e8dc272dbf503a201256f374760d67e4fddca74b23e4aa2cee
 DIST NVIDIA-FreeBSD-x86-173.14.12.tar.gz 15856061 RMD160 c68ef8983bbd84d68142c8277ab6cb8c6cef7d70 SHA1 711a64b4bd68bb665abb649373adee6b7f07ef3e SHA256 0b9849d0f2b09533c384227370c94469a45384adc216a8b716a02bfc9a7340be
@@ -19,7 +23,7 @@ DIST NVIDIA-FreeBSD-x86-177.80.tar.gz 16704786 RMD160 88b85e8872338b8b91ff1c5157
 DIST NVIDIA-FreeBSD-x86-177.82.tar.gz 16708972 RMD160 ef85282a05127a7d5c764243deb2448d9045f0ba SHA1 1df52f23e241a847c256f125b3bc73d2d714e344 SHA256 705c2ed339fbe17545b490d6fced7da351624f767b3d710dbeabfc6447079ac1
 DIST NVIDIA-Linux-x86-100.14.19-pkg0.run 7592917 RMD160 717c168cbc78c804c540b813ef2bb634834446ec SHA1 d645b21dfd43e0c0640783f2336d51f2e3151353 SHA256 46c8629a0f07eaa3009df835cdeb51db8a24d3d17b114b04ec2eae1b3ab69a2f
 DIST NVIDIA-Linux-x86-173.14.09-pkg0.run 11590266 RMD160 b61f4af4fc51b0f62983a13412b31c4bcb620b8b SHA1 941b4029dd677418a820a5bd90230116d6b6cfb9 SHA256 efa0f96b83c7163ab748321301234256ecc455475fce7d7d7c96a10a9236f874
-DIST NVIDIA-Linux-x86-173.14.12-pkg0.run 1617131 RMD160 70d0ac4d9d8e0da14b0d576416cacee9cd421b36 SHA1 7544da2731d7b2c49433809a1d40859e2ea2993a SHA256 5a1cc8e5399a21ee7632e5dfa481757e5bd8e30f08448da2ad710f3f17dd3d48
+DIST NVIDIA-Linux-x86-173.14.12-pkg0.run 11587505 RMD160 97d02d21f94b2c93f27af044a17dd8a990bdc17e SHA1 64e366fe15dabc6db0f452c58285258e6e60440c SHA256 a5d9e087cbe0f34bb9ae11e36fa25ce5b9622b0b50cd4e639aab1181e6379b11
 DIST NVIDIA-Linux-x86-173.14.15-pkg0.run 11876894 RMD160 ecfa439b84db97d7dfdd4337bd0138d1a49c6bd7 SHA1 e480c29f5c1ead123c546be10b81d747bd7a675c SHA256 736b4314854e676570f6c4a179bfa65763c73fbdaaaa5de91f5820f8d170ada4
 DIST NVIDIA-Linux-x86-177.80-pkg0.run 12743262 RMD160 ffeb2f6ed3c4ba4ae8678c502a78440abfdbebfb SHA1 b193ae0d386b88ee0e7dbecbb565bb7ae70c1e05 SHA256 7a0afe3e9bcdd5ec4cf078d38592f408f8cccfb2c50beca71cf47b53be1aa997
 DIST NVIDIA-Linux-x86-177.82-pkg0.run 12747296 RMD160 1edf12487961bcf6c932797ea28db20dc48c3e19 SHA1 efca3d21433250221dcdee4d304e999a7cf20fae SHA256 947384416a991a583aa44dfb594e323858ecaedf4e6ad859849e43301c9f9515
@@ -42,10 +46,17 @@ EBUILD nvidia-drivers-173.14.09.ebuild 15164 RMD160 7e4a7cda38976424d131fb44c80d
 EBUILD nvidia-drivers-173.14.12.ebuild 15103 RMD160 f48624f0a133fdfcad40a3728d8e1cbb28f3ba01 SHA1 d0417d41f3e5a1fc0ec9cef874297f89277483d2 SHA256 06664a012fa8c847ea55d319bf083802b21953522b881e7f712e514e3bf1335f
 EBUILD nvidia-drivers-173.14.15.ebuild 15090 RMD160 ae4c252b46a00c0781ae54df7a21f3172946b7d2 SHA1 29c7a70a63e9d157f9c5dd5f073291aa619b81f3 SHA256 741b2803d2c77a30878bcdb5f1322b7aab053d0b0c2178355f25b94ea8abdce0
 EBUILD nvidia-drivers-177.80.ebuild 15048 RMD160 95aedd3d8d984df6ed8e799ab88f76bea155616e SHA1 d08a21a575a55bd133ca05ba4df82bd0d04aa87b SHA256 a5cb848ae004a8a9a922eeca26312c84494e02da8246df8bc4bd28663384941b
-EBUILD nvidia-drivers-177.82.ebuild 15048 RMD160 9b90d159a53ed3849c60e7553bd804b3a714ea99 SHA1 3efb5781977e8fbc746f480119203a0fda0d57da SHA256 1ee2c1c63489938ceea439b33bf5057371c032393aa92448df3aa23aab358870
+EBUILD nvidia-drivers-177.82.ebuild 15091 RMD160 a09d448e73138350b22defec52793898262255bc SHA1 0998a8e09c4f154983b6cec2a30729ab7b5abb2f SHA256 c95ca12bead66194cfc2152820791ae34c4f15974ab47373ce5bb320eae10e91
 EBUILD nvidia-drivers-71.86.06.ebuild 14138 RMD160 2f713727f51ed4fdcf8e94fa629b8892fe3266b1 SHA1 9ac9d3ccae0978327e782c1ba52f506326d565dc SHA256 ea06b4cf57144afe3a08d0a266e0beced197aa53b88464e76d2f4cde9d62c123
 EBUILD nvidia-drivers-71.86.07.ebuild 14187 RMD160 9a52a2e665e9058b08762fde679f588d8c39da2a SHA1 b07f989ff64ea6fe59e1ec741e344ab1f08ca672 SHA256 f2adda772dad5338caebf0d882ea4eb6a6af1c6fe550e5866847d7e64233fe32
 EBUILD nvidia-drivers-96.43.07.ebuild 14475 RMD160 35dc001755181bdda3e4d0c5be97879d579736a1 SHA1 c5b52dffd298e87c4cd78118bf5ada1f2af770d5 SHA256 07b82b5b503e61212104927ad79e4f75d082e39c0df807800bfaeb9e1874a98d
 EBUILD nvidia-drivers-96.43.09.ebuild 14513 RMD160 5f09a9e69c0c342cbe81f9aab01d8ef979c1779b SHA1 fc51296a005a32d7d0c9cad77cba2ad6f5615251 SHA256 e9183654fd6d613fd6aafd8ebf7a975736eaeedb7bcb9345adfeeb468eec2627
-MISC ChangeLog 28415 RMD160 ac4b5e16e27340dfa85612fc8c69b751b398ec0e SHA1 fe1410525acbf5617f351f1b838e20ffcaa5dce4 SHA256 ecfb39d4afa8803e3461ed434816fdaca3e8eda3279754345930d6bbfcc76a99
+MISC ChangeLog 28579 RMD160 cd04afbfb4f2d45eb8dddafea2d62a5a16267e53 SHA1 8fdfec5074b6e202de1a221098cee53ff2869371 SHA256 ebf55be7f6ed8eb8606615f32a1271aa9d5bc3fce353dde09d8ee229b63b48aa
 MISC metadata.xml 453 RMD160 4e3149a2f84395713739fb8706ac956a03f581e6 SHA1 7631f2686bf4b40f814aa19e99eb94493659cab2 SHA256 ebf76bf6d7f6494241970099567b3292bb1e10f98ebdb9045ecdf92a44599ae6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklTaA4ACgkQn/5bYzqsSmFzvgCgngo3Yu+3aCMOcaoDT6vIOguy
+h7oAn1jywz2IdN5y3pCQjkKcKPvP4w84
+=y9iK
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch b/x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch
new file mode 100644
index 000000000000..594de674d372
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch
@@ -0,0 +1,180 @@
+http://www.nvnews.net/vbulletin/showthread.php?t=121790&page=2#post1823327
+http://www.nvnews.net/vbulletin/showthread.php?t=121790&page=3#post1843626
+
+--- usr/src/nv/Makefile.kbuild
++++ usr/src/nv.2990799/Makefile.kbuild
+@@ -185,14 +185,16 @@
+ 	acquire_console_sem \
+ 	kmem_cache_create \
+ 	on_each_cpu \
+-	smp_call_function
++	smp_call_function \
++ 	acpi_evaluate_integer
+ else
+  COMPILE_TESTS = \
+ 	remap_page_range \
+ 	vmap \
+ 	change_page_attr \
+ 	i2c_adapter \
+-	smp_call_function
++	smp_call_function \
++ 	acpi_evaluate_integer
+ endif
+ 
+ #
+--- usr/src/nv/Makefile.nvidia
++++ usr/src/nv.2990799/Makefile.nvidia
+@@ -59,7 +59,8 @@
+ 	vmap \
+ 	change_page_attr \
+ 	i2c_adapter \
+-	smp_call_function
++	smp_call_function \
++	acpi_evaluate_integer
+ 
+ DEFINES+=$(EXTRA_DEFINES)
+ 
+--- usr/src/nv/conftest.sh
++++ usr/src/nv.2990799/conftest.sh
+@@ -67,6 +67,8 @@
+ }
+ 
+ build_cflags() {
++    ARCH=`uname -m | sed -e 's/i.86/i386/'`
++
+     BASE_CFLAGS="-D__KERNEL__ \
+ -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
+ -nostdinc -isystem $ISYSTEM"
+@@ -80,16 +82,20 @@
+     test_xen
+ 
+     if [ "$OUTPUT" != "$SOURCES" ]; then
+-        ARCH=`uname -m | sed -e 's/i.86/i386/'`
+         MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
+         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
++            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+         fi
+         if [ "$XEN_PRESENT" != "0" ]; then
+             MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
+         fi
+     else
+         MACH_CFLAGS="-I$HEADERS/asm/mach-default"
++        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
++            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
++        fi
+         if [ "$XEN_PRESENT" != "0" ]; then
+             MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
+         fi
+@@ -97,6 +103,9 @@
+ 
+     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
+ 
++    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
++    fi
+     if [ -n "$BUILD_PARAMS" ]; then
+         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
+     fi
+@@ -858,7 +867,7 @@
+ 
+             if [ -f conftest$$.o ]; then
+                 rm -f conftest$$.o
+-                echo "#undef NV_ON_EACH_CPU" >> conftest.h
++                echo "#undef NV_ON_EACH_CPU_PRESENT" >> conftest.h
+                 return
+             fi
+ 
+@@ -897,6 +906,57 @@
+             fi
+         ;;
+ 
++        acpi_evaluate_integer)
++            #
++            # Determine if the acpi_evaluate_integer() function is
++            # present and the type of its 'data' argument.
++            #
++
++            echo "$CONFTEST_PREAMBLE
++            #include <acpi/acpi_bus.h>
++            acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
++                struct acpi_object_list *l, unsigned long long *d) {
++                return AE_OK;
++            }" > conftest$$.c
++
++            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++            rm -f conftest$$.c
++
++            if [ -f conftest$$.o ]; then
++                rm -f conftest$$.o
++                echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
++                echo "typedef unsigned long long nv_acpi_integer_t;" >> conftest.h
++                return
++            fi
++
++            echo "$CONFTEST_PREAMBLE
++            #include <acpi/acpi_bus.h>
++            acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
++                struct acpi_object_list *l, unsigned long *d) {
++                return AE_OK;
++            }" > conftest$$.c
++
++            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++            rm -f conftest$$.c
++
++            if [ -f conftest$$.o ]; then
++                rm -f conftest$$.o
++                echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
++                echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h
++                return
++            else
++                #
++                # We can't report a compile test failure here because
++                # this is a catch-all for both kernels that don't
++                # have acpi_evaluate_integer() and kernels that have
++                # broken header files that make it impossible to
++                # tell if the function is present.
++                #
++                echo "#undef NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h
++                echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h
++            fi
++        ;;
++
+     esac
+ }
+ 
+--- usr/src/nv/nvacpi.c
++++ usr/src/nv.2990799/nvacpi.c
+@@ -136,7 +136,7 @@
+     struct acpi_object_list control_argument_list = { 0, NULL };
+     nv_stack_t *sp = NULL;
+     struct list_head *node, *next;
+-    unsigned long device_id = 0;
++    nv_acpi_integer_t device_id = 0;
+     int device_counter = 0;
+ 
+     NV_KMEM_CACHE_ALLOC_STACK(sp);
+@@ -158,11 +158,9 @@
+ 
+     os_mem_set((void *)pNvAcpiObject, 0, sizeof(nv_acpi_t));
+ 
+-    // assign driver data structure ptr to this device
+-    acpi_driver_data(device) = pNvAcpiObject;
+-
+-    // store a device reference in our object
++    device->driver_data = pNvAcpiObject;
+     pNvAcpiObject->device = device;
++
+     pNvAcpiObject->sp = sp;
+ 
+     // grab handles to all the important nodes representing devices
+@@ -306,7 +304,7 @@
+      */
+     nv_acpi_t *pNvAcpiObject = data;
+     u32 event_val = 0;
+-    unsigned long state;
++    nv_acpi_integer_t state;
+     int status = 0;
+     int device_counter = 0;
+ 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-177.82.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-177.82.ebuild
index f0eb7f02ad56..afac6ab19e25 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-177.82.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-177.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-177.82.ebuild,v 1.4 2008/12/18 18:36:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-177.82.ebuild,v 1.5 2008/12/25 10:16:46 vapier Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -204,6 +204,8 @@ src_unpack() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
+	epatch "${FILESDIR}"/nvidia-2.6.28.patch
+
 	# allow on board sensors to work with lm_sensors
 	if use kernel_linux; then
 		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch