Update version.

Package-Manager: portage-2.0.51.19

8 files changed, 221 insertions, 2 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 571c60a26c0f..f28525200863 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,16 @@
 # 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.109 2005/03/05 10:43:53 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.110 2005/03/11 19:43:04 azarah Exp $
+
+*nvidia-kernel-1.0.7167 (11 Mar 2005)
+
+  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch,
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch,
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id
+  .patch, +files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch,
+  +nvidia-kernel-1.0.7167.ebuild:
+  Update version.
 
 *nvidia-kernel-1.0.6629-r4 (05 Mar 2005)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 7e919fc31cb8..c6f1866afd6a 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,8 +1,12 @@
+-----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 30b5adc05523d11a2d9297cbf4d8688b ChangeLog 28645
+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 0ba23f57441bbadc6c92d4ae80d75fcc nvidia-kernel-1.0.7167.ebuild 3776
 MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
 MD5 6efd7d5ad3c7739f685111aa84466b68 nvidia-kernel-1.0.6111-r3.ebuild 4488
 MD5 d8fcf2021aa68584d4a4d9e96b671da0 files/nvidia 501
@@ -10,6 +14,7 @@ MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r1 163
 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 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
@@ -35,3 +40,14 @@ MD5 bca6ad85efa6071a949bdcb24fce1733 files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_b
 MD5 d4e8ffdb0cc67c56884e6055d2045e51 files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch 2608
 MD5 e210d99cae87c3f60120ea474b97fca7 files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch 8072
 MD5 da7644fcc801d40c26fb22b570a88835 files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff 9445
+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 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-----
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch
new file mode 100644
index 000000000000..bd75515c50c8
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch
@@ -0,0 +1,12 @@
+diff -urpN nv.orig/Makefile.kbuild nv/Makefile.kbuild
+--- nv.orig/Makefile.kbuild	2004-11-09 20:27:54.012160376 +0200
++++ nv/Makefile.kbuild	2004-11-09 20:52:59.256328480 +0200
+@@ -73,7 +73,7 @@ endif
+ #
+ 
+ EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
++EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar  -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
+ 
+ #
+ # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch
new file mode 100644
index 000000000000..ad408f3ec7ff
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch
@@ -0,0 +1,22 @@
+--- 1/conftest.sh	2004-11-07 12:20:02.776660256 +1100
++++ 2/conftest.sh	2004-11-07 12:23:32.432787680 +1100
+@@ -17,7 +17,7 @@
+ 
+ if [ "$OUTPUT" != "$SOURCES" ]; then
+     CFLAGS="$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \
+--I$HEADERS -I$HEADERS/asm/mach-default"
++-I$HEADERS -I$OUTPUT/include2/asm/mach-default"
+ else
+     CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/asm/mach-default"
+ fi
+@@ -260,8 +260,8 @@
+             echo "installed on your system. If you specified a separate";
+             echo "output directory using either the \"KBUILD_OUTPUT\" or";
+             echo "the \"O\" KBUILD parameter, make sure to specify this";
+-            echo "directory with the SYSOUT environment variable or with";
+-            echo "the appropriate nvidia-installer command line option.";
++            echo "directorys _PARENT_ with the KBUILD_OUTPUT_PREFIX";
++            echo "environment variable, (or see /etc/env.d/05kernel)";
+             echo "";
+             if [ "$VERBOSE" = "full_output" ]; then
+                 echo "*** Unable to determine the target kernel version. ***";
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch
new file mode 100644
index 000000000000..a8246e5516ac
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch
@@ -0,0 +1,18 @@
+--- nv.orig/nv.c	2004-12-27 11:38:13.298374416 +1100
++++ nv/nv.c	2004-12-27 11:42:48.876480176 +1100
+@@ -2814,6 +2814,7 @@
+     int cpu;
+ 
+     nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++    preempt_disable();
+     cpu = get_cpu();
+ 
+     if (nvl->rm_lock_cpu == cpu)
+@@ -2829,6 +2830,7 @@
+ 
+     nvl->rm_lock_cpu = smp_processor_id();
+     nvl->rm_lock_count = 1;
++    preempt_enable();
+ }
+ 
+ void NV_API_CALL nv_unlock_rm(
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch
new file mode 100644
index 000000000000..a82a147f2658
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch
@@ -0,0 +1,12 @@
+diff -urpN nv.orig/Makefile.kbuild nv/Makefile.kbuild
+--- nv.orig/Makefile.kbuild	2004-11-09 20:27:54.012160376 +0200
++++ nv/Makefile.kbuild	2004-11-09 20:52:59.256328480 +0200
+@@ -73,7 +73,7 @@ endif
+ #
+ 
+ EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -fno-common -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
++EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar  -Werror -O -fno-common -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
+ 
+ #
+ # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167
new file mode 100644
index 000000000000..691dc4a42ce3
--- /dev/null
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167
@@ -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.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167.ebuild
new file mode 100644
index 000000000000..110cb4b23920
--- /dev/null
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167.ebuild
@@ -0,0 +1,127 @@
+# 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.ebuild,v 1.1 2005/03/11 19:43:04 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.minion.de/files/1.0-7167/)
+
+	# 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
+}