New patch added to 7174 to fix build problems. Bumped revision to -r2.

Package-Manager: portage-2.0.53

5 files changed, 161 insertions, 2 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index cdd90ff0cc31..deeaad9da67b 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.131 2006/01/22 21:44:25 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.132 2006/01/24 15:03:35 augustus Exp $
+
+*nvidia-kernel-1.0.7174-r2 (24 Jan 2006)
+
+  24 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
+  +files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff,
+  +nvidia-kernel-1.0.7174-r2.ebuild:
+  New patch added to 7174 to fix build problems. Bumped revision to -r2.
 
 *nvidia-kernel-1.0.8178-r3 (22 Jan 2006)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index c720609d64db..ca318dd56cbc 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,4 +1,4 @@
-MD5 d48451c27e0623958c726faf862ad5ca ChangeLog 34017
+MD5 e130b764e38ac4e78b66f9381227c2ec ChangeLog 34280
 MD5 b5b7f947ffb9e6c19f7457ff7c14d0db files/1.0.6111/conftest_koutput_includes.patch 1082
 MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
 MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
@@ -42,6 +42,7 @@ MD5 5125c6d55ae72122144771ef1697db53 files/1.0.7676/NVIDIA_kernel-1.0-7676-13610
 MD5 196649a84a2396a6588f27457a39d1fa files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff 2491
 MD5 5eaf8c4597d2f0b2670caa1303b2a4bc files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff 2359
 MD5 1cac21325aacb18a199949ee20979165 files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff 11631
+MD5 36d3b1bbd86b11dd8f4ab3339ec0cac8 files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff 397
 MD5 44d01e81815beb8fae5b10442dc7e78b files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff 16515
 MD5 804a9ea8bf5164aa3248c89ab2f6792e files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff 24637
 MD5 3b5a2525633e88b9d78c4721190542e6 files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff 16010
@@ -51,6 +52,7 @@ MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r5 163
 MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-kernel-1.0.7167-r1 163
 MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-kernel-1.0.7174 163
 MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-kernel-1.0.7174-r1 163
+MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-kernel-1.0.7174-r2 163
 MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-kernel-1.0.7667 163
 MD5 4ea42a34abde5c81fe828b09afab7651 files/digest-nvidia-kernel-1.0.7676 163
 MD5 4ea42a34abde5c81fe828b09afab7651 files/digest-nvidia-kernel-1.0.7676-r1 163
@@ -67,6 +69,7 @@ MD5 29777a7a6934d750d1f2743d384267d2 nvidia-kernel-1.0.6629-r4.ebuild 4600
 MD5 8aac41beeb1f441bb1dc5fe1aaabbd84 nvidia-kernel-1.0.6629-r5.ebuild 4772
 MD5 b44523732e779c46cebed035eb62cbfc nvidia-kernel-1.0.7167-r1.ebuild 3982
 MD5 574b07187a85bf2e576649bc0629d553 nvidia-kernel-1.0.7174-r1.ebuild 4226
+MD5 ca24e01d6a1f384a349d4ed597a4c077 nvidia-kernel-1.0.7174-r2.ebuild 4277
 MD5 2e12cd6f21aaabd1424b51b10d2c0c34 nvidia-kernel-1.0.7174.ebuild 4025
 MD5 0da986517ab8d7beb13c5d1fe5a4c1c6 nvidia-kernel-1.0.7667.ebuild 4538
 MD5 6e28642fae4a75a66584dd04910cbac4 nvidia-kernel-1.0.7676-r1.ebuild 4669
diff --git a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff b/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff
new file mode 100644
index 000000000000..d6b85295f125
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff
@@ -0,0 +1,11 @@
+diff -ru usr/src/nv/conftest.sh usr/src/nv.1444349/conftest.sh
+--- usr/src/nv/conftest.sh	2005-12-15 01:57:35.000000000 +0100
++++ usr/src/nv.1444349/conftest.sh	2006-01-06 13:54:29.916051750 +0100
+@@ -22,6 +22,7 @@
+ OUTPUT=$4
+ 
+ CFLAGS="-D__KERNEL__ \
++-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
+ -nostdinc -isystem $ISYSTEM \
+ -Werror -Wimplicit-function-declaration"
+ 
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r2 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r2
new file mode 100644
index 000000000000..c09b689e40ca
--- /dev/null
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r2
@@ -0,0 +1,2 @@
+MD5 71e56aa82021c5b0c1e34944f88c6432 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
+MD5 125ec3ecc64202c6c27ef762a438d0f0 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
new file mode 100644
index 000000000000..5eed263e2277
--- /dev/null
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2006 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.7174-r2.ebuild,v 1.1 2006/01/24 15:03:35 augustus Exp $
+
+inherit eutils linux-mod
+
+X86_PKG_V="pkg0"
+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=""
+
+RDEPEND="virtual/modutils"
+DEPEND="virtual/linux-sources"
+export _POSIX2_VERSION="199209"
+
+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
+	MODULE_NAMES="nvidia(video:${S})"
+	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+	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//7174/7167}-x86-shutup-warnings.patch
+	use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-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
+	epatch ${NV_PATCH_PREFIX}-1258475.diff
+	epatch ${NV_PATCH_PREFIX}-1296092.diff
+	epatch ${NV_PATCH_PREFIX}-1321905.diff
+	epatch ${NV_PATCH_PREFIX}-1361053.diff
+	epatch ${NV_PATCH_PREFIX}-1386866.diff
+	epatch ${NV_PATCH_PREFIX//7174/8178}-1444349.diff
+
+	# 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//7174/7167}-conftest-koutput-includes.patch
+		# Fix calling of smp_processor_id() when preempt is enabled
+		epatch ${NV_PATCH_PREFIX//7174/7167}-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
+}