nvidia-drivers: add the latest beta.

7 files changed, 107 insertions, 32 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index d0dc9b8..cee1ac4 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,69 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.281 2011/05/22 21:55:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.293 2011/07/28 06:05:29 jer Exp $
+
+  28 Jul 2011; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.20.ebuild:
+  Patch does not apply to 96.
+
+*nvidia-drivers-275.21 (26 Jul 2011)
+*nvidia-drivers-173.14.31 (26 Jul 2011)
+*nvidia-drivers-96.43.20 (26 Jul 2011)
+
+  26 Jul 2011; Doug Goldstein <cardoe@gentoo.org>
+  +nvidia-drivers-96.43.20.ebuild, +nvidia-drivers-173.14.31.ebuild,
+  +nvidia-drivers-275.21.ebuild:
+  Version bumps. Adds support for xorg-server 1.10 in the legacy drivers. Fix
+  KDE4 KWin issues in the 173.14.x series. Fix a multitude of issues in the
+  275.x series.
+
+  19 Jul 2011; Christoph Mende <angelos@gentoo.org>
+  nvidia-drivers-270.41.19.ebuild:
+  Stable on amd64 wrt bug #375587
+
+*nvidia-drivers-275.19 (18 Jul 2011)
+
+  18 Jul 2011; Doug Goldstein <cardoe@gentoo.org>
+  +nvidia-drivers-275.19.ebuild:
+  Version bump to latest stable drivers
+
+  14 Jul 2011; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.19.ebuild:
+  Set proper xorg-server version dependency (bug #375215).
+
+  23 Jun 2011; Markos Chandras <hwoarang@gentoo.org>
+  nvidia-drivers-173.14.30.ebuild:
+  Stable on amd64 wrt bug #371779
+
+  15 Jun 2011; Doug Goldstein <cardoe@gentoo.org>
+  -nvidia-drivers-260.19.36.ebuild, -nvidia-drivers-270.41.03.ebuild:
+  Remove older versions
+
+*nvidia-drivers-275.09.07 (14 Jun 2011)
+
+  14 Jun 2011; Jeroen Roovers <jer@gentoo.org>
+  +nvidia-drivers-275.09.07.ebuild:
+  Version bump.
+
+  14 Jun 2011; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.19.ebuild,
+  nvidia-drivers-173.14.28.ebuild, nvidia-drivers-173.14.30.ebuild,
+  nvidia-drivers-256.53.ebuild, nvidia-drivers-260.19.36.ebuild,
+  nvidia-drivers-260.19.44.ebuild, nvidia-drivers-270.41.03.ebuild,
+  nvidia-drivers-270.41.06.ebuild, nvidia-drivers-270.41.19.ebuild:
+  Set CC instead of HOST_CC or cross-compiling will fail.
+
+  31 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  nvidia-drivers-260.19.44.ebuild, nvidia-drivers-270.41.06.ebuild:
+  x86 stable wrt bug #368393 and bug #368395
+
+  29 May 2011; Markos Chandras <hwoarang@gentoo.org>
+  nvidia-drivers-260.19.44.ebuild, nvidia-drivers-270.41.06.ebuild:
+  Stable on amd64 wrt bug #368393 and bug #368395
+
+  28 May 2011; Mike Frysinger <vapier@gentoo.org>
+  nvidia-drivers-96.43.19.ebuild, nvidia-drivers-173.14.28.ebuild,
+  +files/nvidia-drivers-173.14.30-2.6.39.patch, nvidia-drivers-256.53.ebuild,
+  nvidia-drivers-260.19.36.ebuild, nvidia-drivers-260.19.44.ebuild,
+  +files/nvidia-drivers-260.19.44-2.6.39.patch:
+  Fix building with linux-2.6.39 #368939 by Alex Buell.
 
 *nvidia-drivers-270.41.19 (22 May 2011)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index c9cd9f6..447181c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,20 +1,21 @@
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
-AUX 256.35-unified-arch.patch 1498 RMD160 63285585705b880f4e745e1f6ffad493ea876d05 SHA1 a2537442b2d896cd8b6e8897b345fee3bfcf5222 SHA256 7861431595e425c5df8acffb8bf536befa7a13618d6f66456aef6dac4db5c314
+AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf
 AUX eblits/donvidia.eblit 695 RMD160 e83869944dfce52a62423412e6c22b4e4468bc3c SHA1 0c877bbe4402c2845f8f4353c9f2d8086d364fbc SHA256 d404dd7e5657d83ccf3687720fb978030a3716e47957fb8bb80dea3ed57b3672
 AUX eblits/mtrr_check.eblit 629 RMD160 a7f9090f419faa17e74b81346c4bb019a7700138 SHA1 edb9ba38de929a9a0406408701a454f514fe78ed SHA256 ae1b8fb37985fc3e42a4a776779b3fe3d70be2c826df5c3f99d03ba7209ca0b1
 AUX eblits/src_install-libs.eblit 3472 RMD160 3e00b70ea45c7fdf6ec6a48c121f56b8faae15da SHA1 ec4cb37556284846a24fcdd54cff1a4cd0ccc539 SHA256 6f301de374736cec316794bf1935a15de025b3c505981f24e06e3df75818ad6a
 AUX eblits/want_tls.eblit 952 RMD160 4f33e6aef50032665d68654af1cfdbd9abc54195 SHA1 cf96ae8227913439526f0ab2ec984e5be6f3a1fd SHA256 e5ce767a2e9a5c0682e764b9ba42a20e721a093f4c0626605570c8b5e3afecd0
-AUX fix-build-with-2.6.39-rcupdate-changes.patch 434 RMD160 ddd4fcafbc9a0428387492cf733dc6cce29d10a2 SHA1 afcc034309525f4afe3823494947bf33598bb385 SHA256 9defac313e1edffdaa0223b7dfcdee6c88e2055cb2a0d91f0ad0a1d384bde43f
 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-173.14.30-2.6.39.patch 599 RMD160 9dd06b0036a2ceed8b5a4874b584d32ac25c17f5 SHA1 d5dcbc8edfb05b79ea1f73068b87cd9068f8cf06 SHA256 f1528152fb786d74701bd5d99ccbabad0b1ac791958d83c17bf783484dda9474
 AUX nvidia-drivers-190.53-2.6.33.patch 2893 RMD160 29f6cf29909828f8d22504dfcb43b23aeeff78dd SHA1 412f8a2b208e8af886891985fcabf8623c9943c3 SHA256 68f5cdf4489fb6bc480319e4bda6e6481beb189cf37920b939b8f7bbf77aed1f
-DIST NVIDIA-FreeBSD-x86-270.41.19.tar.gz 28488689 RMD160 ec517f435d4b265f4236d680572a43d823be8b33 SHA1 264b8aaa5c9b71b5ea37d4367bae12464bb931e7 SHA256 352b3a666d7b799082896e82da6228eb61158dc1b9722a4f63ffe474b27b4750
-DIST NVIDIA-Linux-x86-270.41.19.run 29652783 RMD160 cf60d4ec6d8134285f97f8a76ebed7dd7e9a3a97 SHA1 5b5eb7b2650059b17537ed4b9d646a6dbd46d6a8 SHA256 a8c4aee97e3cb5bf9cd589b6245eeb633d20bae5420646384d48d568230994b1
-DIST NVIDIA-Linux-x86_64-270.41.19.run 49632218 RMD160 cc0bed4c9196d1ae53a926237a4c1029ce22427a SHA1 ad325e32e51d0f286f084c9b06298ec3aa2864d5 SHA256 4d7131f07e739abc787d69696ca4ac52df2fc0b338405ffd474288c2a4a1e7a6
-EBUILD nvidia-drivers-270.41.19.ebuild 16751 RMD160 69f26be31aa15dbbf4a8aa7e83ee40f83ab451dd SHA1 66bbfa5dc52525d050a1a6d6ed2e6f9239b8021e SHA256 a7dc48acf395b478d055310a2392b032a14f5ccb5f95fafe2d3feecce47e6045
-MISC ChangeLog 60694 RMD160 3bc7bb6179ba66bcf4d0579e0f9407f7049e0d90 SHA1 fdfde9abb25152bd864227250dc1c6c6f3fb1321 SHA256 65ca0f9d4303c51b4d9721604a8556b518a3f3740f1804af7fa4286185edd469
+AUX nvidia-drivers-260.19.44-2.6.39.patch 591 RMD160 8e53d800b86c380da9e9c978957a4d1b7f749fe4 SHA1 39be99b92fb16a71347fb8fb39301241550a1958 SHA256 dc9478bb4ff12d820f82bb13a8d7f956456ea97217ba89e6619f1c8d72127be3
+DIST NVIDIA-FreeBSD-x86-280.11.tar.gz 29589989 RMD160 ad67b2957d1063de0aa37d89dbd94687c114c1ff SHA1 bc0752f92ce816ab71bcd609ff09f2e217bfd17c SHA256 cbec9487ebbe39afdf6e825dbb1f1047a04b5445e391a1ed071d3f3d4a1c7d14
+DIST NVIDIA-Linux-x86-280.11.run 32704346 RMD160 3490ca6a6805b4da7f2aceea1834f0c583956c7a SHA1 a29b808b8debc6ca777b6fc768bbbe3392cebe05 SHA256 b084df215c51e064e6612883aa96d0bb66ca7208af75282bbe18d1f1c44e5c50
+DIST NVIDIA-Linux-x86_64-280.11.run 55017272 RMD160 f09a7e10a29d3c2cffe10cda7d7cdb8c7ba1f9bd SHA1 52718bca16e5d8786552ee745ba4039087a963be SHA256 9d56c08c45a0648c62f00745413f0828549928f0e4e7549bea3d9fce8e498e5f
+EBUILD nvidia-drivers-280.11.ebuild 16567 RMD160 2c5511c26a4a927ea24486b2f604ae8ed2daedd8 SHA1 2a39292612053ea46ae74eedcc40ae83abcae4c1 SHA256 d26efd18f89e7b6a030fa8fe4ec6bc873b5f78d855ecfd0934f65d03ff102257
+MISC ChangeLog 63189 RMD160 ef1a28a0ba19ee982e1d83ee17b82ecde1e07925 SHA1 a92883b3877b638e794e581590c323f90292bdf0 SHA256 6b8c9c02b1145fea7de1c64ed5084dcc14e5082ada94503644cca01b50939a9f
 MISC metadata.xml 549 RMD160 b6f8cfd5fe9668f4031b43d2167ba4712b3cb508 SHA1 c48be9c87aa8b237fa09848a53625f8312fa2056 SHA256 22653e2d8ee95e57ce47b6292a9988feecada431dde56c2c97198efd6f4b9354
diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
index da92b8f..401ce95 100644
--- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
+++ b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
@@ -1,6 +1,7 @@
-diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh
---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh	2010-05-19 05:38:57.000000000 +0200
-+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh	2010-05-22 02:13:56.000000000 +0200
+Add support for the 'x86' unified kernel arch in conftest.sh
+
+--- NVIDIA-Linux-x86-256.25/kernel/conftest.sh
++++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh
 @@ -101,7 +101,7 @@ build_cflags() {
  
      if [ "$OUTPUT" != "$SOURCES" ]; then
diff --git a/x11-drivers/nvidia-drivers/files/fix-build-with-2.6.39-rcupdate-changes.patch b/x11-drivers/nvidia-drivers/files/fix-build-with-2.6.39-rcupdate-changes.patch
deleted file mode 100644
index c06f8d9..0000000
--- a/x11-drivers/nvidia-drivers/files/fix-build-with-2.6.39-rcupdate-changes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Changes to rcupdate.h to use __always_inline break unoptimized 
-compilation, so stop doing that.
-
---- kernel/conftest.sh.orig	2011-05-26 08:52:54.529943895 -0500
-+++ kernel/conftest.sh	2011-05-26 08:52:13.780110714 -0500
-@@ -76,7 +76,7 @@
- }
- 
- build_cflags() {
--    BASE_CFLAGS="-D__KERNEL__ \
-+    BASE_CFLAGS="-O2 -D__KERNEL__ \
- -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
- -nostdinc -isystem $ISYSTEM"
- 
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch
new file mode 100644
index 0000000..de93e0b
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch
@@ -0,0 +1,14 @@
+linux/smp_lock.h no longer exists in linux-2.6.39+
+
+--- a/usr/src/nv/nv-linux.h
++++ b/usr/src/nv/nv-linux.h
+@@ -87,7 +87,9 @@
+ #if !defined(KERNEL_2_4)
+ #include <linux/sched.h>            /* suser(), capable() replacement   */
+ #include <linux/moduleparam.h>      /* module_param()                   */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+ #include <linux/smp_lock.h>         /* kernel_locked                    */
++#endif
+ #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
+ #include <asm/kmap_types.h>         /* page table entry lookup          */
+ #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
new file mode 100644
index 0000000..a1d3eb8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
@@ -0,0 +1,14 @@
+linux/smp_lock.h no longer exists in linux-2.6.39+
+
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -87,7 +87,9 @@
+ #if !defined(KERNEL_2_4)
+ #include <linux/sched.h>            /* suser(), capable() replacement   */
+ #include <linux/moduleparam.h>      /* module_param()                   */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+ #include <linux/smp_lock.h>         /* kernel_locked                    */
++#endif
+ #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
+ #include <asm/kmap_types.h>         /* page table entry lookup          */
+ #endif
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-280.11.ebuild
index 303bab3..4cb61d6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-280.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19.ebuild,v 1.1 2011/05/22 21:55:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-275.21.ebuild,v 1.1 2011/07/27 14:45:17 cardoe Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.10.99
+COMMON="<x11-base/xorg-server-1.11.99
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	>=app-admin/eselect-opengl-1.0.9
@@ -209,7 +209,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		MODULE_NAMES="nvidia(video:${S}/kernel)"
 		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
 		mtrr_check
 		lockdep_check
 	fi
@@ -280,12 +280,8 @@ src_prepare() {
 			-e 's:-Wsign-compare::g' \
 			"${NV_SRC}"/Makefile.kbuild
 
-		# Add support for the 'x86' unified kernel arch in conftest.sh
 		epatch "${FILESDIR}"/256.35-unified-arch.patch
 
-		# Build against >=2.6.39 kernel headers
-		epatch "${FILESDIR}"/fix-build-with-2.6.39-rcupdate-changes.patch
-
 		# If you set this then it's your own fault when stuff breaks :)
 		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*