Add latest patches from Zander (thanks Chris Gianelloni for spotting them, bug #84896).

(Portage version: 2.0.51.19)

6 files changed, 187 insertions, 11 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index f28525200863..62b3f1d5d479 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.110 2005/03/11 19:43:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.111 2005/03/11 23:41:10 azarah Exp $
+
+*nvidia-kernel-1.0.7167-r1 (12 Mar 2005)
+
+  12 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch,
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch,
+  +nvidia-kernel-1.0.7167-r1.ebuild:
+  Add latest patches from Zander (thanks Chris Gianelloni for spotting them,
+  bug #84896).
 
 *nvidia-kernel-1.0.7167 (11 Mar 2005)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index c6f1866afd6a..35174b2a5053 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 17e5291b91d1eef96d55e54a2cba6d81 nvidia-kernel-1.0.6629-r1.ebuild 4748
 MD5 bf8f040d6927016f9da24ab89262d346 nvidia-kernel-1.0.6629-r4.ebuild 4567
 MD5 b4cc7148b83e220711ca00091219aa6b ChangeLog 29086
 MD5 3915412914635df4d7329ad27323f4c5 nvidia-kernel-1.0.6629-r2.ebuild 4264
 MD5 631e8deabfb0c7726b9b31259f1673a0 nvidia-kernel-1.0.6629-r3.ebuild 4330
+MD5 61096d57971be921160de186a367d419 nvidia-kernel-1.0.7167-r1.ebuild 3858
 MD5 0ba23f57441bbadc6c92d4ae80d75fcc nvidia-kernel-1.0.7167.ebuild 3776
 MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
 MD5 6efd7d5ad3c7739f685111aa84466b68 nvidia-kernel-1.0.6111-r3.ebuild 4488
@@ -15,6 +13,7 @@ MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r4 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r2 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r3 163
 MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-kernel-1.0.7167 163
+MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-kernel-1.0.7167-r1 163
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r3 163
 MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
 MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
@@ -43,11 +42,6 @@ MD5 da7644fcc801d40c26fb22b570a88835 files/1.0.6629/NVIDIA_kernel-1.0-6629-12010
 MD5 6c6bd7d2e4589cf3f4725082bb413a43 files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742
 MD5 7ae487fba8a81fb91d53f35b9066512f files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082
 MD5 9df3fbed7af6fcb4ad13b1b5c3851381 files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch 419
+MD5 70bb10b2da2423a6be2a4c2bce38d807 files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch 490
 MD5 82d99e72fddbc1b0447708afd84dc8c5 files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD4DBQFCMfWY1ZcsMnZjRyIRAhLpAJiCIQ/qN6dwfihmnzXH26fu6AFUAJ9Kxn1Q
-zvBiKVKI91QVH4msLQuhnw==
-=XgmS
------END PGP SIGNATURE-----
+MD5 e2625e9e0a6679c38783b5d8985fdaf6 files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch
new file mode 100644
index 000000000000..f85b7b1c1d76
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch
@@ -0,0 +1,12 @@
+diff -ru usr/src/nv/os-agp.c usr/src/nv.1233959/os-agp.c
+--- usr/src/nv/os-agp.c	2005-02-25 18:37:02.000000000 +0100
++++ usr/src/nv.1233959/os-agp.c	2005-03-07 20:57:17.235559352 +0100
+@@ -176,7 +176,7 @@
+     rm_read_registry_dword(NULL, "NVreg", "EnableAGPFW", &enable_fw);
+     agp_mode |= NV_AGPGART_MODE_BITS_SBA(enable_fw);
+ 
+-    agp_info.mode &= agp_mode;
++    agp_info.mode &= (0xff000000 | agp_mode);
+     NV_AGPGART_BACKEND_ENABLE(drm_agp_p, nvl->agp_bridge, agp_info.mode);
+ 
+ 
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch
new file mode 100644
index 000000000000..38088799f5ae
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch
@@ -0,0 +1,29 @@
+diff -ru usr/src/nv/nv.c usr/src/nv.1237815/nv.c
+--- usr/src/nv/nv.c	2005-02-25 18:37:02.000000000 +0100
++++ usr/src/nv.1237815/nv.c	2005-03-11 17:29:49.034335416 +0100
+@@ -3071,14 +3071,15 @@
+             nv_printf(NV_DBG_WARNINGS, "NVRM: not using NVAGP, AGPGART is loaded!\n");
+             return status;
+         }
+-#elif defined(NV_MULTIPLE_BRIDGE_AGPGART_PRESENT)
++#elif defined(AGPGART)
++#if defined(NV_MULTIPLE_BRIDGE_AGPGART_PRESENT)
+         if (!list_empty(&agp_bridges))
+         {
+             nv_printf(NV_DBG_WARNINGS,
+                       "NVRM: not using NVAGP, an AGPGART backend is loaded!\n");
+             return status;
+         }
+-#elif defined(AGPGART)
++#else /* NV_MULTIPLE_BRIDGE_AGPGART_PRESENT */
+         int error;
+         /*
+          * We can only safely use NvAGP when no backend has been
+@@ -3096,6 +3097,7 @@
+             return status;
+         }
+ #endif
++#endif /* AGPGART  */
+ #if defined(CONFIG_X86_64) && defined(CONFIG_GART_IOMMU)
+         nv_printf(NV_DBG_WARNINGS,
+             "NVRM: not using NVAGP, kernel was compiled with GART_IOMMU support!!\n");
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r1
new file mode 100644
index 000000000000..691dc4a42ce3
--- /dev/null
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r1
@@ -0,0 +1,2 @@
+MD5 d88d606873be255e8c4926961a1f09bf NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444
+MD5 a0433d841c41862af266300b589c12a7 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
new file mode 100644
index 000000000000..af3ccda3373a
--- /dev/null
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild,v 1.1 2005/03/11 23:41:10 azarah Exp $
+
+inherit eutils linux-mod
+
+X86_PKG_V="pkg1"
+AMD64_PKG_V="pkg2"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+
+DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
+	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+
+if use x86; then
+	PKG_V="${X86_PKG_V}"
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	PKG_V="${AMD64_PKG_V}"
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="nostrip"
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+export _POSIX2_VERSION="199209"
+
+MODULE_NAMES="nvidia(video:${S})"
+BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "This version needs MTRR support for most chipsets!"
+		eerror "Please enable MTRR support in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "MTRR support not detected!"
+	fi
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	mtrr_check;
+}
+
+src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
+
+	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
+		echo
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		ewarn "This is not officially supported for ${P}. It is likely you"
+		ewarn "will not be able to compile or use the kernel module."
+		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+		echo
+		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+	fi
+
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+
+	# Add patches below, with a breif description.
+	cd ${S}
+	# Any general patches should go here
+	# Shutup pointer arith warnings
+	use x86 && epatch ${NV_PATCH_PREFIX}-x86-shutup-warnings.patch
+	use amd64 && epatch ${NV_PATCH_PREFIX}-amd64-shutup-warnings.patch
+
+	# Patches from Zander goes here
+	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
+	#  archived here: http://www.minion.de/files/1.0-7167/)
+	epatch ${NV_PATCH_PREFIX}-1233959.patch
+	epatch ${NV_PATCH_PREFIX}-1237815.patch
+
+	# Now any patches specific to the 2.6 kernel should go here
+	if kernel_is 2 6 ; then
+		einfo "Applying 2.6 kernel patches"
+		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
+		epatch ${NV_PATCH_PREFIX}-conftest-koutput-includes.patch
+		# Fix calling of smp_processor_id() when preempt is enabled
+		epatch ${NV_PATCH_PREFIX}-disable-preempt-on-smp_processor_id.patch
+	fi
+
+	# if you set this then it's your own fault when stuff breaks :)
+	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
+
+	# If greater than 2.6.5 use M= instead of SUBDIR=
+	cd ${S}; convert_to_m Makefile.kbuild
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# Add the aliases
+	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
+	insinto /etc/modules.d
+	newins ${WORKDIR}/nvidia nvidia
+
+	# Docs
+	dodoc ${S}/../../share/doc/README
+
+	# The device creation script
+	into /
+	newsbin ${S}/makedevices.sh NVmakedevices.sh
+}
+
+pkg_postinst() {
+	if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
+		  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
+		/sbin/NVmakedevices.sh >/dev/null 2>&1
+	fi
+
+	linux-mod_pkg_postinst
+}