Added new NVIDIA driver release 1.0.7184.

(Portage version: 2.1.1_pre5-r3)

4 files changed, 356 insertions, 3 deletions

diff --git a/x11-drivers/nvidia-legacy-drivers/ChangeLog b/x11-drivers/nvidia-legacy-drivers/ChangeLog
index e689e66c1aa5..18449fceb55e 100644
--- a/x11-drivers/nvidia-legacy-drivers/ChangeLog
+++ b/x11-drivers/nvidia-legacy-drivers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/nvidia-legacy-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.3 2006/08/08 04:06:37 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.4 2006/08/25 05:16:00 augustus Exp $
+
+*nvidia-legacy-drivers-1.0.7184 (25 Aug 2006)
+
+  25 Aug 2006; Kristopher Kersey <augustus@gentoo.org>
+  nvidia-legacy-drivers-1.0.7182.ebuild,
+  +nvidia-legacy-drivers-1.0.7184.ebuild:
+  Added new NVIDIA driver release 1.0.7184.  Fixed a couple of whitespace
+  errors.
 
   08 Aug 2006; Joshua Jackson <tsunam@gentoo.org>
   nvidia-legacy-drivers-1.0.7182.ebuild:
diff --git a/x11-drivers/nvidia-legacy-drivers/files/digest-nvidia-legacy-drivers-1.0.7184 b/x11-drivers/nvidia-legacy-drivers/files/digest-nvidia-legacy-drivers-1.0.7184
new file mode 100644
index 000000000000..8bf0d9552390
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/files/digest-nvidia-legacy-drivers-1.0.7184
@@ -0,0 +1,6 @@
+MD5 68cf7f155786daf6946b9daeb64c7a35 NVIDIA-Linux-x86-1.0-7184-pkg1.run 11508286
+RMD160 cb6f793e2d4279e0b3b690cb165c5f6f24be9451 NVIDIA-Linux-x86-1.0-7184-pkg1.run 11508286
+SHA256 d42b6fdd4607cac10700a870737be8f5d143303a955899d01b2f3ad695d616d7 NVIDIA-Linux-x86-1.0-7184-pkg1.run 11508286
+MD5 332850387c4e7a4619753b856e3199e5 NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868
+RMD160 07c847f6ee245f28f501b08ff01d81e5ec1cc3a5 NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868
+SHA256 660055c55cfba815593408244a9162ca550558331977cc371b50e9f5f9dcb7da NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868
diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7182.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7182.ebuild
index af8ae21ca76f..b18f9cc3448b 100644
--- a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7182.ebuild
+++ b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7182.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-legacy-drivers/nvidia-legacy-drivers-1.0.7182.ebuild,v 1.3 2006/08/08 04:06:37 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7182.ebuild,v 1.4 2006/08/25 05:16:00 augustus Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -238,7 +238,7 @@ src_install-libs() {
 	exeinto ${X11_LIB_DIR}/modules/drivers
 
 	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
-		has_version "x11-base/xorg-server"; then 
+		has_version "x11-base/xorg-server"; then
 		[[ -f ${drvdir}/nvidia_drv.so ]] && \
 			doexe ${drvdir}/nvidia_drv.so
 	else
diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild
new file mode 100644
index 000000000000..5c488ed490d8
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild,v 1.1 2006/08/25 05:16:00 augustus Exp $
+
+inherit eutils multilib versionator 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="NVIDIA X11 driver and GLX libraries for older NVIDIA cards"
+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
+			 )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 x86"
+IUSE="dlloader"
+RESTRICT="nostrip multilib-pkg-force"
+
+DEPEND="virtual/linux-sources"
+RDEPEND="virtual/modutils
+	 || ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
+	 || ( media-libs/mesa virtual/x11 )
+	 app-admin/eselect-opengl
+	 kernel_linux? ( !media-video/nvidia-kernel )
+	 kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+	 !app-emulation/emul-linux-x86-nvidia
+	 !x11-drivers/nvidia-drivers
+	 !media-video/nvidia-glx"
+
+PROVIDE="virtual/opengl"
+export _POSIX2_VERSION="199209"
+
+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"
+
+# On BSD userland it wants real make command
+MAKE="make"
+
+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() {
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	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-${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
+
+	# Patchs go below here, add breif description
+	cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+	# Use the correct defines to make gtkglext build work
+	epatch ${FILESDIR}/NVIDIA_glx-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
+
+	# Quiet down warnings the user do not need to see
+	sed -i \
+		-e 's:-Wpointer-arith::g' \
+		-e 's:-Wsign-compare::g' \
+		${S}/Makefile.kbuild
+
+	# 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_compile() {
+	linux-mod_src_compile
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+
+	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
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif use amd64 ; then
+		src_install-libs lib32 $(get_multilibdir)
+		src_install-libs lib $(get_libdir)
+
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || return 0
+
+	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+	dodoc usr/share/doc/README
+	dodoc usr/share/doc/NVIDIA_Changelog
+	dodoc usr/share/doc/XF86Config.sample
+	dohtml usr/share/doc/html/*
+
+	# nVidia want bug reports using this script
+	exeinto /usr/bin
+	doexe usr/bin/nvidia-bug-report.sh
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second paramis the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
+
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [[ ${#} -eq 2 ]] ; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+		pkglibdir=lib32
+	fi
+
+	local usrpkglibdir=usr/${pkglibdir}
+	local libdir=usr/X11R6/${pkglibdir}
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
+	local incdir=usr/include/GL
+	local sover=${PV}
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
+
+	if ! has_version x11-base/xorg-server ; then
+		X11_LIB_DIR="/usr/${inslibdir}"
+	fi
+
+	# The GLX libraries
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
+
+	dodir ${NO_TLS_ROOT}
+	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
+
+	donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
+
+	if want_tls ; then
+		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	else
+		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	fi
+
+	# Not sure whether installing the .la file is neccessary;
+	# this is adopted from the `nvidia' ebuild
+	local ver1=$(get_version_component_range 1)
+	local ver2=$(get_version_component_range 2)
+	local ver3=$(get_version_component_range 3)
+	sed -e "s:\${PV}:${PV}:"     \
+		-e "s:\${ver1}:${ver1}:" \
+		-e "s:\${ver2}:${ver2}:" \
+		-e "s:\${ver3}:${ver3}:" \
+		-e "s:\${libdir}:${inslibdir}:" \
+		${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
+		has_version "x11-base/xorg-server"; then
+		[[ -f ${drvdir}/nvidia_drv.so ]] && \
+			doexe ${drvdir}/nvidia_drv.so
+	else
+		[[ -f ${drvdir}/nvidia_drv.o ]] && \
+			doexe ${drvdir}/nvidia_drv.o
+	fi
+
+	insinto /usr/${inslibdir}
+	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
+		doins ${libdir}/libXvMCNVIDIA.a
+	exeinto /usr/${inslibdir}
+	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe ${libdir}/libXvMCNVIDIA.so.${PV}
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f ${extdir}/libglx.so.${sover} ]] && \
+		newexe ${extdir}/libglx.so.${sover} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins ${incdir}/*.h
+}
+
+pkg_preinst() {
+	# Can we make up our minds ?!?!?
+	local NV_D=${IMAGE:-${D}}
+
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# Clean the dinamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
+		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
+		rm -f ${ROOT}/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	#switch to the nvidia implementation
+	eselect opengl set --use-old nvidia
+
+	echo
+	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	echo
+	einfo "You may also be interested in media-video/nvidia-settings"
+	echo
+	einfo "nVidia has requested that any bug reports submitted have the"
+	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+}
+
+want_tls() {
+	# For uclibc or anything non glibc, return false
+	has_version sys-libs/glibc || return 1
+
+	# Old versions of glibc were lt/no-tls only
+	has_version '<sys-libs/glibc-2.3.2' && return 1
+
+	local valid_chost="true"
+	if use x86 ; then
+		case ${CHOST/-*} in
+			i486|i586|i686) ;;
+			*) valid_chost="false"
+		esac
+	fi
+
+	[[ ${valid_chost} == "false" ]] && return 1
+
+	# If we've got nptl, we've got tls
+	built_with_use sys-libs/glibc nptl && return 0
+
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
+	# These versions built linuxthreads version to support tls, too
+	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
+
+	return 1
+}
+
+pkg_postrm() {
+	eselect opengl set --use-old xorg-x11
+}