summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2009-11-03 03:58:59 +0000
committerDoug Goldstein <cardoe@gentoo.org>2009-11-03 03:58:59 +0000
commitc9bba56c7c7668d00682991ac7027de9c16a3b20 (patch)
treeaf0c34541a48ba03f27ede2ce7239b2c430b334d /x11-drivers
parentVersion bump, new rc. Dropped JNI patch - no longer applies. (diff)
downloadgentoo-2-c9bba56c7c7668d00682991ac7027de9c16a3b20.tar.gz
gentoo-2-c9bba56c7c7668d00682991ac7027de9c16a3b20.tar.bz2
gentoo-2-c9bba56c7c7668d00682991ac7027de9c16a3b20.zip
no longer need to block newer mesa since eselect-opengl has been updated. remove older revision of 190.42
(Portage version: 2.1.7.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog8
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild7
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild582
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild9
4 files changed, 14 insertions, 592 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 4de614f597c3..f3c6a2cd92a0 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.194 2009/11/01 07:58:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.195 2009/11/03 03:58:59 cardoe Exp $
+
+ 03 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
+ nvidia-drivers-185.18.36-r1.ebuild, -nvidia-drivers-190.42-r1.ebuild,
+ nvidia-drivers-190.42-r2.ebuild:
+ no longer need to block newer mesa since eselect-opengl has been updated.
+ remove older revision of 190.42
01 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
nvidia-drivers-173.14.20.ebuild, nvidia-drivers-173.14.20-r1.ebuild,
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild
index b7125f620df2..26fd03be0bb6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild,v 1.6 2009/11/01 07:58:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild,v 1.7 2009/11/03 03:58:59 cardoe Exp $
EAPI="2"
@@ -25,15 +25,14 @@ EMULTILIB_PKG="true"
COMMON="<x11-base/xorg-server-1.6.99
multilib? ( app-emulation/emul-linux-x86-xlibs )
+ >=app-admin/eselect-opengl-1.0.9
kernel_FreeBSD? ( !media-video/nvidia-freebsd )
!app-emulation/emul-linux-x86-nvidia
!x11-drivers/nvidia-legacy-drivers"
DEPEND="${COMMON}
- kernel_linux? ( virtual/linux-sources )
- app-admin/eselect-opengl"
+ kernel_linux? ( virtual/linux-sources )"
RDEPEND="${COMMON}
kernel_linux? ( virtual/modutils )
- !>=media-libs/mesa-7.6
acpi? ( sys-power/acpid )"
PDEPEND="x11-libs/libvdpau
gtk? ( media-video/nvidia-settings )"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild
deleted file mode 100644
index ec2750a2a7c4..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild,v 1.7 2009/11/01 07:58:10 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
- amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
- x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib kernel_linux"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="<x11-base/xorg-server-1.7.99
- multilib? ( app-emulation/emul-linux-x86-xlibs )
- kernel_FreeBSD? ( !media-video/nvidia-freebsd )
- !app-emulation/emul-linux-x86-nvidia
- !x11-drivers/nvidia-legacy-drivers"
-DEPEND="${COMMON}
- kernel_linux? ( virtual/linux-sources )
- app-admin/eselect-opengl"
-RDEPEND="${COMMON}
- kernel_linux? ( virtual/modutils )
- !>=media-libs/mesa-7.6
- acpi? ( sys-power/acpid )"
-PDEPEND="x11-libs/libvdpau
- gtk? ( media-video/nvidia-settings )"
-
-QA_TEXTRELS_x86="usr/lib/libXvMCNVIDIA.so.${PV}
- usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/xorg/modules/drivers/nvidia_drv.so
- usr/lib/libcuda.so.${PV}
- usr/lib/libvdpau_nvidia.so.${PV}"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
- usr/lib/opengl/nvidia/lib/libGL.so.1
- usr/lib/opengl/nvidia/lib/libGLcore.so.1
- usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.1
- usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib32/libcuda.so.${PV}
- usr/lib32/libvdpau_nvidia.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
-
-QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/xorg/modules/drivers/nvidia_drv.so
- usr/lib64/libnvcompiler.so.${PV}
- usr/lib64/libXvMCNVIDIA.so.${PV}
- usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib64/opengl/nvidia/extensions/libglx.so
- usr/bin/nvidia-smi
- usr/bin/nvidia-xconfig
- usr/lib64/libXvMCNVIDIA.a:NVXVMC.o"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/libXvMCNVIDIA.a"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/opengl/nvidia/extensions/libglx.so"
-
-QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
-
-# we really should have QA_DT_HASH_x86 and QA_DT_HASH_amd64 but Portage
-# does not support it. bug #271416
-
-QA_DT_HASH="usr/lib32/libcuda.so.${PV}
- usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib32/libvdpau_nvidia.so.${PV}
- usr/bin/nvidia-xconfig
- usr/lib64/libcuda.so.${PV}
- usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib64/opengl/nvidia/extensions/libwfb.so
- usr/lib64/opengl/nvidia/extensions/libglx.so
- usr/lib64/xorg/modules/drivers/nvidia_drv.so
- usr/lib64/libXvMCNVIDIA.so.${PV}
- usr/lib64/libvdpau_nvidia.so.${PV}
-
- usr/lib/libcuda.so.${PV}
- usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib/opengl/nvidia/extensions/libwfb.so
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/xorg/modules/drivers/nvidia_drv.so
- usr/lib/libXvMCNVIDIA.so.${PV}
- usr/lib/libvdpau_nvidia.so.${PV}"
-
-# Bug #290081
-# QA_LDFLAGS="usr/bin/nvidia-smi"
-
-if use x86; then
- PKG_V="-pkg0"
- NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
- PKG_V="-pkg2"
- NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
- PKG_V=""
- NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-mtrr_check() {
- ebegin "Checking for MTRR support"
- linux_chkconfig_present MTRR
- eend $?
-
- if [[ $? -ne 0 ]] ; then
- 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
-}
-
-lockdep_check() {
- if linux_chkconfig_present LOCKDEP; then
- eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
- eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
- eerror "which will prevent ${P} from compiling."
- eerror "Please make sure the following options have been unset:"
- eerror " Kernel hacking --->"
- eerror " [ ] Lock debugging: detect incorrect freeing of live locks"
- eerror " [ ] Lock debugging: prove locking correctness"
- eerror " [ ] Lock usage statistics"
- eerror "in 'menuconfig'"
- die "LOCKDEP enabled"
- fi
-}
-
-pkg_setup() {
- # try to turn off distcc and ccache for people that have a problem with it
- export DISTCC_DISABLE=1
- export CCACHE_DISABLE=1
-
- 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
-
- if use kernel_linux; then
- linux-mod_pkg_setup
- MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
- BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
- SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
- mtrr_check
- lockdep_check
- fi
-
- # On BSD userland it wants real make command
- use userland_BSD && MAKE="$(get_bmake)"
-
- export _POSIX2_VERSION="199209"
-
- # Since Nvidia ships 3 different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # set variables to where files are in the package structure
- if use kernel_FreeBSD; then
- NV_DOC="${S}/doc"
- NV_EXEC="${S}/obj"
- NV_SRC="${S}/src"
- NV_MAN="${S}/x11/man"
- elif use kernel_linux; then
- NV_DOC="${S}/usr/share/doc"
- NV_EXEC="${S}/usr/bin"
- NV_SRC="${S}/usr/src/nv"
- NV_MAN="${S}/usr/share/man/man1"
- else
- die "Could not determine proper NVIDIA package"
- fi
-}
-
-src_unpack() {
- if use kernel_linux && kernel_is lt 2 6 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
-
- if ! use x86-fbsd; then
- mkdir "${S}"
- cd "${S}"
- unpack_makeself
- else
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # Please add a brief description for every added patch
- cd "${S}"
- use x86-fbsd && cd doc
-
- # 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
-
- if use kernel_linux; then
- # Quiet down warnings the user does not need to see
- sed -i \
- -e 's:-Wpointer-arith::g' \
- -e 's:-Wsign-compare::g' \
- "${NV_SRC}"/Makefile.kbuild
-
- # If you set this then it's your own fault when stuff breaks :)
- use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
- # If greater than 2.6.5 use M= instead of SUBDIR=
- convert_to_m "${NV_SRC}"/Makefile.kbuild
- fi
-}
-
-src_compile() {
- # This is already the default on Linux, as there's no toplevel Makefile, but
- # on FreeBSD there's one and triggers the kernel module build, as we install
- # it by itself, pass this.
-
- cd "${NV_SRC}"
- if use x86-fbsd; then
- MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
- LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
- elif use kernel_linux; then
- linux-mod_src_compile
- fi
-}
-
-src_install() {
- local MLTEST=$(type dyn_unpack)
-
- cd "${S}"
-
- if use kernel_linux; then
- linux-mod_src_install
-
- VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
- if [ -z "$VIDEOGROUP" ]; then
- eerror "Failed to determine the video group gid."
- die "Failed to determine the video group gid."
- fi
-
- # Add the aliases
- [ -f "${FILESDIR}/nvidia" ] || die "nvidia missing in FILESDIR"
- sed -e 's:PACKAGE:'${PF}':g' \
- -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
- "${WORKDIR}"/nvidia
- insinto /etc/modprobe.d
- newins "${WORKDIR}"/nvidia nvidia.conf || die
- elif use x86-fbsd; then
- insinto /boot/modules
- doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
- exeinto /boot/modules
- doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
- fi
-
- if has_multilib_profile ; then
- local OABI=${ABI}
- for ABI in $(get_install_abis) ; do
- src_install-libs
- done
- ABI=${OABI}
- unset OABI
- else
- src_install-libs
- fi
-
- is_final_abi || return 0
-
- # Documentation
- dodoc "${NV_DOC}"/XF86Config.sample
- dohtml "${NV_DOC}"/html/*
- if use x86-fbsd; then
- dodoc "${NV_DOC}/README"
- else
- # Docs
- newdoc "${NV_DOC}/README.txt" README
- dodoc "${NV_DOC}/NVIDIA_Changelog"
- fi
-
- if use kernel_linux; then
- doman "${NV_MAN}/nvidia-smi.1.gz"
- fi
- doman "${NV_MAN}/nvidia-xconfig.1.gz"
-
- # Helper Apps
- dobin ${NV_EXEC}/nvidia-xconfig || die
- dobin ${NV_EXEC}/nvidia-bug-report.sh || die
- if use kernel_linux; then
- dobin ${NV_EXEC}/nvidia-smi || die
- fi
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
- dodir $1
- exeinto $1
-
- libname=$(basename $2)
-
- # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully
- if [ -e $2.$3 ] ; then
- doexe $2.$3
- dosym ${libname}.$3 $1/${libname}
- [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
- fi
-}
-
-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 use x86-fbsd; then
- # on FreeBSD everything is on obj/
- pkglibdir=obj
- usrpkglibdir=obj
- x11pkglibdir=obj
- drvdir=obj
- extdir=obj
-
- # don't ask me why the headers are there.. glxext.h is missing
- incdir=doc
-
- # on FreeBSD it has just .1 suffix
- sover=1
- fi
-
- # The GLX libraries
- donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
- donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
-
- donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover}
-
- dodir ${NO_TLS_ROOT}
- donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
-
- if ! use x86-fbsd; then
- donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
- fi
-
- 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
-
- if ! use x86-fbsd; then
- # Install the .la file for libtool, to prevent e.g. bug #176423
- [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
- 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
- fi
-
- exeinto ${X11_LIB_DIR}/modules/drivers
-
- [[ -f ${drvdir}/nvidia_drv.so ]] && \
- doexe ${drvdir}/nvidia_drv.so
-
- insinto /usr/${inslibdir}
- [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
- doins ${libdir}/libXvMCNVIDIA.a
- exeinto /usr/${inslibdir}
- # fix Bug 131315
- [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
- doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
- dosym libXvMCNVIDIA.so.${PV} \
- /usr/${inslibdir}/libXvMCNVIDIA.so
-
- exeinto ${NV_ROOT}/extensions
- [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
- newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
- [[ -f ${extdir}/libglx.so.${sover} ]] && \
- newexe ${extdir}/libglx.so.${sover} libglx.so
-
- # Includes
- insinto ${NV_ROOT}/include
- doins ${incdir}/*.h
-
- #cuda
- if [[ -f usr/include/cuda/cuda.h ]]; then
- dodir /usr/include/cuda
- insinto /usr/include/cuda
- doins usr/include/cuda/*.h
-
- if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then
- dolib.so usr/${pkglibdir}/libcuda.so.${PV}
- dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1
- dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
- fi
- fi
-
- #vdpau
- if [[ -f usr/include/vdpau/vdpau.h ]]; then
- dolib.so usr/${pkglibdir}/libvdpau_nvidia.so.${PV}
- dosym libvdpau_nvidia.so.${PV} /usr/${inslibdir}/libvdpau_nvidia.so.1
- dosym libvdpau_nvidia.so.1 /usr/${inslibdir}/libvdpau_nvidia.so
- fi
-
- # OpenCL
- # NOTE: This isn't currently available in the publicly released drivers.
- if [[ -f usr/${pkglibdir}/libOpenCL.so.1.0.0 ]]; then
- dodir /usr/include/CL
- insinto /usr/include/CL
- doins usr/include/CL/*.h
-
- dolib.so usr/${pkglibdir}/libnvcompiler.so.${PV}
- dosym libnvcompiler.so.${PV} /usr/${inslibdir}/libnvcompiler.so.1
- dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
-
- dolib.so usr/${pkglibdir}/libOpenCL.so.1.0.0
- dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
- dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
- fi
-}
-
-pkg_preinst() {
-
- # Clean the dynamic 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() {
- if use kernel_linux; then
- linux-mod_pkg_postinst
- fi
-
- # Switch to the nvidia implementation
- eselect opengl set --use-old nvidia
-
- echo
- elog "You must be in the video group to use the NVIDIA device"
- elog "For more info, read the docs at"
- elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
- elog
-
- elog "This ebuild installs a kernel module and X driver. Both must"
- elog "match explicitly in their version. This means, if you restart"
- elog "X, you must modprobe -r nvidia before starting it back up"
- elog
-
- elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
- elog
- elog "nVidia has requested that any bug reports submitted have the"
- elog "output of /usr/bin/nvidia-bug-report.sh included."
- elog
- elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
- elog
- elog "If you are having resolution problems, try disabling DynamicTwinView."
- echo
-}
-
-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
-
- if use x86 ; then
- case ${CHOST/-*} in
- i486|i586|i686) ;;
- *) return 1 ;;
- esac
- fi
-
- # 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() {
- if use kernel_linux; then
- linux-mod_pkg_postrm
- fi
- eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild
index 1f4427e41488..ed2fa43bbf8b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild,v 1.3 2009/11/01 07:58:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild,v 1.4 2009/11/03 03:58:59 cardoe Exp $
EAPI="2"
@@ -25,13 +25,12 @@ EMULTILIB_PKG="true"
COMMON="<x11-base/xorg-server-1.7.99
kernel_linux? ( >=sys-libs/glibc-2.6.1 )
- multilib? ( app-emulation/emul-linux-x86-xlibs )"
+ multilib? ( app-emulation/emul-linux-x86-xlibs )
+ >=app-admin/eselect-opengl-1.0.9"
DEPEND="${COMMON}
- kernel_linux? ( virtual/linux-sources )
- app-admin/eselect-opengl"
+ kernel_linux? ( virtual/linux-sources )"
RDEPEND="${COMMON}
kernel_linux? ( virtual/modutils )
- !>=media-libs/mesa-7.6
acpi? ( sys-power/acpid )"
PDEPEND="x11-libs/libvdpau
gtk? ( media-video/nvidia-settings )"