Added patch from Daniel Drake <dsd@gentoo.org> for compiling on 2.6.19 and closing bug #151177.

(Portage version: 2.1.2_pre2-r8)

5 files changed, 74 insertions, 8 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 7a5b05e2c8ed..cec9c5d10d7b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.17 2006/10/12 17:02:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.18 2006/10/13 16:26:22 wolf31o2 Exp $
+
+  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/NVIDIA_kernel-2.6.19.patch:
+  Added patch from Daniel Drake <dsd@gentoo.org> for compiling on 2.6.19 and
+  closing bug #151177.
 
   12 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +files/1.0.8178/NVIDIA-1.0.8178-1423627.diff,
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
new file mode 100644
index 000000000000..9d56d428e155
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
@@ -0,0 +1,47 @@
+Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h
+===================================================================
+--- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv-linux.h
++++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h
+@@ -14,10 +14,11 @@
+ 
+ #include "nv.h"
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/utsname.h>
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
++#include <linux/config.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
+ #  error This driver does not support 2.4 kernels older than 2.4.7!
+Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c
+===================================================================
+--- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv.c
++++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c
+@@ -288,7 +288,11 @@ int           nv_kern_ioctl(struct inode
+ long          nv_kern_unlocked_ioctl(struct file *, unsigned int, unsigned long);
+ long          nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long);
+ void          nv_kern_isr_bh(unsigned long);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
++#else
++irqreturn_t   nv_kern_isr(int, void *);
++#endif
+ void          nv_kern_rc_timer(unsigned long);
+ #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
+ static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
+@@ -2595,8 +2599,10 @@ long nv_kern_compat_ioctl(
+  */
+ irqreturn_t nv_kern_isr(
+     int   irq,
+-    void *arg,
+-    struct pt_regs *regs
++    void *arg
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
++	, struct pt_regs *regs
++#endif
+ )
+ {
+     nv_linux_state_t *nvl = (void *) arg;
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
index 1d22e0786e5d..89676058faec 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild,v 1.6 2006/10/12 17:02:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild,v 1.7 2006/10/13 16:26:22 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -393,6 +393,9 @@ pkg_postinst() {
 	echo
 	einfo "nVidia has requested that any bug reports submitted have the"
 	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+	echo
+	elog "If you are having resolution problems, try disabling DynamicTwinView."
+	echo
 }
 
 want_tls() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
index dc755ca93b5e..18a2e6e466ff 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.7 2006/10/09 13:37:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.8 2006/10/13 16:26:22 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -161,6 +161,9 @@ src_unpack() {
 
 		# Patch the Makefile to not warn about nvidia-installer
 #		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
+
+		# Patch for kernel 2.6.19 from Daniel Drake <dsd@gentoo.org>
+		epatch ${FILESDIR}/NVIDIA_kernel-2.6.19.patch
 	fi
 }
 
@@ -385,12 +388,15 @@ pkg_postinst() {
 	eselect opengl set --use-old nvidia
 
 	echo
-	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	elog "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	echo
+	elog "You may also be interested in media-video/nvidia-settings"
+	echo
+	elog "nVidia has requested that any bug reports submitted have the"
+	elog "output of /usr/bin/nvidia-bug-report.sh included."
 	echo
-	einfo "You may also be interested in media-video/nvidia-settings"
+	elog "If you are having resolution problems, try disabling DynamicTwinView."
 	echo
-	einfo "nVidia has requested that any bug reports submitted have the"
-	einfo "output of /usr/bin/nvidia-bug-report.sh included."
 }
 
 want_tls() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
index b11114f4413b..256b36f73a8f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild,v 1.6 2006/10/12 17:02:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild,v 1.7 2006/10/13 16:26:22 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -163,6 +163,9 @@ src_unpack() {
 
 		# Patch the Makefile to not warn about nvidia-installer
 #		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
+
+		# Patch for kernel 2.6.19 from Daniel Drake <dsd@gentoo.org>
+		epatch ${FILESDIR}/NVIDIA_kernel-2.6.19.patch
 	fi
 }
 
@@ -396,6 +399,8 @@ pkg_postinst() {
 	echo
 	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
 	echo
+	elog "If you are having resolution problems, try disabling DynamicTwinView."
+	echo
 }
 
 want_tls() {