diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 5855ae1..3e644e9 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,19 +1,10 @@ -AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7 AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 AUX nvidia-drivers-pax-const.patch 833 RMD160 100c36ed4c7db0f30c0680b276a708cd5ed75749 SHA1 b336665366340fec6bd400f36d3e4b9de86473f5 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 AUX nvidia-drivers-pax-usercopy.patch 2350 RMD160 c102590aba1b4191c08fc0ac045640bab3f8f5e2 SHA1 5cd57aef42db6dbb5cf97ed773ec632d3a5f3ec7 SHA256 56980f43db38d582bc6a9bfd881973fce6e3e056b77ce4f4005bdcf79526a863 AUX nvidia-udev.sh 185 RMD160 26d8e7e1447daa7d4fd09993f855b58ae1754a72 SHA1 d607b57662e0542b335cbc86ed3c946bb522891f SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e AUX nvidia.udev-rule 462 RMD160 a7bc1d61d75a7fd7847903064ae5974e4079db5a SHA1 ac04cf8838bab05d5c092446d34c0154b9f6220e SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 -DIST NVIDIA-FreeBSD-x86-290.10.tar.gz 32042469 RMD160 712cd816ab24319d03ae475af0ac2a56518ef58b SHA1 4fe79060b9e475e4a74b7b17e95410bad1f33427 SHA256 f5accbdac0b231a8073f76c1d1d8ace7cb98ebe167888c31183a2752a669ee92 -DIST NVIDIA-FreeBSD-x86-295.20.tar.gz 31993959 RMD160 56a123e11f288fe9c0b4a8249326c653e151575a SHA1 b1a9d50668f7d958627939b26e33a574aaf06275 SHA256 fea6d5552a50e2aedc4726944fea85ac8baf0d0b26661fc3b1f97f54ebec6736 -DIST NVIDIA-FreeBSD-x86-295.40.tar.gz 32029253 RMD160 8bf52080d538eb26e1528a026036e82be2f5e4f4 SHA1 d5cbe7df001690c22653577953c7848ee97aa6da SHA256 f47b603f39dfd2e405949aab6fbc7abd4b24f43c6fb47b4f23d7618f32021364 -DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa -DIST NVIDIA-Linux-x86-295.20.run 34641353 RMD160 9727ee28dab4a5489124e3382d67be8d4b9c2b32 SHA1 67cac5eb191fa8e6661f24e1f37254689e634fe0 SHA256 0f9dc3d493053cffe37f72b6783edc6c14afd31532b43a7cf0bfce763cf2d500 -DIST NVIDIA-Linux-x86-295.40.run 34668138 RMD160 354c71a03f7b2538fed8f951b9a41bc6a7c01853 SHA1 d8c8f18b8b0998523df9f735c0b0b0e603eafecd SHA256 ccd46574dd843a50327f50daa6f0b635ad7eca4a5b9a5fa963d0871bfa74ce2a -DIST NVIDIA-Linux-x86_64-290.10.run 58334192 RMD160 a850a83643d507ff84be76691188a5ecd870c4d8 SHA1 f3e8b43248d9d167b1c3f67a8cba9c1f2c53e583 SHA256 34a2ab07f4ae7afdeb2c8415f3f37c1099e6690eb25f3dbef92eca771f7ce4cd -DIST NVIDIA-Linux-x86_64-295.20.run 58403208 RMD160 c7e1844a40ac6e4506d5e3671bfdbc6feb18c5f1 SHA1 fcf34baca50177bafb56cf64cedd24ecc543048c SHA256 3b84fdeae335c047193f68a1da26f2a736461c35cfe94566fc7ace1e5762d34c -DIST NVIDIA-Linux-x86_64-295.40.run 58446405 RMD160 d692f1e39457b78e4636f2ea0c44ad0cda3a10c2 SHA1 1793b7379e4d452b015e035be6971eecf2581ca1 SHA256 f6d5ae338b3b8ac6c512d06b335010934a62728f181a1fa5253aa84b7bf45e7a -EBUILD nvidia-drivers-290.10.ebuild 17274 RMD160 e33cadfb2af178dd5b88281d19a0d27a2ad03628 SHA1 6ac6114186b5cf7125790c09ea98d2e0fc1ca6f2 SHA256 135936bbc3aa5687a97f72c7c575c8a2668ec19fc73fcf6a69e552c8b66c41c2 -EBUILD nvidia-drivers-295.20-r1.ebuild 17875 RMD160 2b30c1b0912092f8876f348a3d5f518333dc7e27 SHA1 130e3102dedc800b662523740d851fa5c8354364 SHA256 a929bbbf5dd705f7e501175e9c6b7a34eb8df793b811621c86c7ef9ee5a698fe -EBUILD nvidia-drivers-295.40.ebuild 18325 RMD160 d69401aa24c91c0ab7d67694140fe31754f38198 SHA1 6238757e5e63be2be96d0b89d1695abd79aa2d7f SHA256 23d649ce571f9188da2daf71141ac4c076442d65e5319e0bb4f67f2f518430f1 +DIST NVIDIA-FreeBSD-x86-295.49.tar.gz 32078716 RMD160 faf9557831fdcfebdb9692d77aa23444cabe6e11 SHA1 814074a68cf3ca3476cae27f0011aabc5149d3ac SHA256 aa7c9a13931a55e358c542e1d18feb0aeaa7b18550e9675698b152265134d938 +DIST NVIDIA-Linux-x86-295.49.run 34716936 RMD160 7a3f528128b385a6cc70cea99d1f9ebb78378ba8 SHA1 cc0c6453ab23748652757a865bcaf5cccc3dad22 SHA256 f13b44725f4904ed3f5250d733b45b5815f54e8b588dfe6c6180918e80f35c6a +DIST NVIDIA-Linux-x86_64-295.49.run 58521195 RMD160 9873ed7fadad86f97843ef222d721aade6a8db09 SHA1 a013eba5a4c7e69ceee6d9b5eb26611ff546a152 SHA256 61dc9623ea1981f801d97de7c67c32b7e4f7ef4aaa6744910967cb634d9ace62 +EBUILD nvidia-drivers-295.49.ebuild 18485 RMD160 79a9b25d93e52037c8f96ee22aa6ef16ea81081f SHA1 6bdbb3dbdfc8420322634f92277d83f68bf5dfc7 SHA256 950b1be7d9399442f9306a057068513e4225bd2c0f2b16d7b0a3afd3bf31a570 MISC ebuild.diff 724 RMD160 1d864711efab5e60f1a3f14a5a63273ec8dc944e SHA1 ba16548f74141c9c7e95257d0c25a5a6488c35db SHA256 2dddfc340137c21bce4886672e4e212e3e21fe9c6c62c1b5dab7096cbb92c523 diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch deleted file mode 100644 index 401ce95..0000000 --- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add support for the 'x86' unified kernel arch in conftest.sh - ---- NVIDIA-Linux-x86-256.25/kernel/conftest.sh -+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh -@@ -101,7 +101,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -110,7 +110,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -121,7 +121,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild deleted file mode 100644 index cb1a057..0000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild +++ /dev/null @@ -1,561 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild,v 1.4 2012/01/18 23:11:13 ulm Exp $ - -EAPI="2" - -inherit eutils unpacker multilib portability 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? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* amd64 x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux pax_kernel" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=app-admin/eselect-opengl-1.0.9 - !" - 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}/kernel)" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} 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_LIB="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_EXEC="${S}" - NV_LIB="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=${PV} - 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 - cd "${S}" - unpack_makeself - else - unpack ${A} - fi -} - -src_prepare() { - # Please add a brief description for every added patch - use x86-fbsd && cd doc - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - epatch "${FILESDIR}"/256.35-unified-arch.patch - - # 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 - if use pax_kernel; then - epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch - epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch - 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() { - 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-169.07" ] || 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 - - # NVIDIA kernel <-> userspace driver config lib - dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ - die "failed to install libnvidia-cfg" - dosym libnvidia-cfg.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-cfg.so.1 || \ - die "failed to create libnvidia-cfg.so symlink" - dosym libnvidia-cfg.so.1 \ - /usr/$(get_libdir)/libnvidia-cfg.so || \ - die "failed to create libnvidia-cfg.so symlink" - - # NVIDIA monitoring library - dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ - die "failed to install libnvidia-ml" - dosym libnvidia-ml.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-ml.so.1 || \ - die "failed to create libnvidia-ml.so symlink" - dosym libnvidia-ml.so.1 \ - /usr/$(get_libdir)/libnvidia-ml.so || \ - die "failed to create libnvidia-ml.so symlink" - - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so.1 || \ - die "failed to create libnvcuvid.so symlink" - dosym libnvcuvid.so.1 \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" - - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" - - # Xorg GLX driver - insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ - die "failed to install libglx.so" - dosym libglx.so.${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ - die "failed to create libglx.so symlink" - - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ - die "failed to install libXvMCNVIDIA.so" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \ - die "failed to create libXvMCNVIDIA_dynamic.so symlink" - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - dodir /etc/OpenCL/vendors - insinto /etc/OpenCL/vendors - doins nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use x86-fbsd; then - dodoc "${NV_DOC}/README" - doman "${NV_MAN}/nvidia-xconfig.1" - use gtk && doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - doman "${NV_MAN}/nvidia-xconfig.1.gz" - use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" - fi - - # Helper Apps - dobin ${NV_EXEC}/nvidia-xconfig || die - if use gtk; then - dobin ${NV_EXEC}/nvidia-settings || die - fi - dobin ${NV_EXEC}/nvidia-bug-report.sh || die - if use kernel_linux; then - dobin ${NV_EXEC}/nvidia-smi || die - fi - - # Desktop entries for nvidia-settings - if use gtk; then - sed -e 's:__UTILS_PATH__:/usr/bin:' \ - -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ - -i "${NV_EXEC}/nvidia-settings.desktop" - domenu ${NV_EXEC}/nvidia-settings.desktop - - doicon ${NV_EXEC}/nvidia-settings.png - 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 || die "failed to iterate through all ABIs" -} - -# 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) - - doexe $2.$3 || die "failed to install $2" - dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local libdir= sover= - - if use kernel_linux; then - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - libdir=32 - else - libdir=. - fi - sover=${PV} - else - libdir=obj - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use x86-fbsd; then - donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} - else - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - fi - - # VDPAU - donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} - - # CUDA & OpenCL - if use kernel_linux; then - donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0 - dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so - fi -} - -pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # 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." - elog - - if ! use gtk; then - elog "USE=gtk controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. media-video/nvidia-settings" - elog "no longer installs nvidia-settings but only installs the" - elog "associated user space libraries." - fi -} - -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-295.20-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild deleted file mode 100644 index d965034..0000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild +++ /dev/null @@ -1,574 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild,v 1.5 2012/03/21 08:50:38 ssuominen Exp $ - -EAPI="2" - -inherit eutils unpacker multilib portability 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? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* amd64 ~x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux pax_kernel" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=app-admin/eselect-opengl-1.0.9 - app-admin/eselect-opencl - !" - 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}/kernel)" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} 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_LIB="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_EXEC="${S}" - NV_LIB="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=${PV} - 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 - cd "${S}" - unpack_makeself - else - unpack ${A} - fi -} - -src_prepare() { - # Please add a brief description for every added patch - use x86-fbsd && cd doc - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - epatch "${FILESDIR}"/256.35-unified-arch.patch - - # Fix building with Linux 3.3.x wrt #408841 - sed -i \ - -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \ - kernel/conftest.sh || die - - # 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 - cat <<- EOF > "${S}"/nvidia.icd - /usr/$(get_libdir)/libcuda.so - EOF - - if use pax_kernel; then - epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch - epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch - 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() { - 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-169.07" ] || 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 - - # NVIDIA kernel <-> userspace driver config lib - dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ - die "failed to install libnvidia-cfg" - dosym libnvidia-cfg.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-cfg.so.1 || \ - die "failed to create libnvidia-cfg.so symlink" - dosym libnvidia-cfg.so.1 \ - /usr/$(get_libdir)/libnvidia-cfg.so || \ - die "failed to create libnvidia-cfg.so symlink" - - # NVIDIA monitoring library - dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ - die "failed to install libnvidia-ml" - dosym libnvidia-ml.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-ml.so.1 || \ - die "failed to create libnvidia-ml.so symlink" - dosym libnvidia-ml.so.1 \ - /usr/$(get_libdir)/libnvidia-ml.so || \ - die "failed to create libnvidia-ml.so symlink" - - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so.1 || \ - die "failed to create libnvcuvid.so symlink" - dosym libnvcuvid.so.1 \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" - - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" - - # Xorg GLX driver - insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ - die "failed to install libglx.so" - dosym libglx.so.${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ - die "failed to create libglx.so symlink" - - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ - die "failed to install libXvMCNVIDIA.so" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \ - die "failed to create libXvMCNVIDIA_dynamic.so symlink" - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - insinto /etc/OpenCL/vendors - doins nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use x86-fbsd; then - dodoc "${NV_DOC}/README" - doman "${NV_MAN}/nvidia-xconfig.1" - use gtk && doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - doman "${NV_MAN}/nvidia-xconfig.1.gz" - use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" - fi - - # Helper Apps - dobin ${NV_EXEC}/nvidia-xconfig || die - if use gtk; then - dobin ${NV_EXEC}/nvidia-settings || die - fi - dobin ${NV_EXEC}/nvidia-bug-report.sh || die - if use kernel_linux; then - dobin ${NV_EXEC}/nvidia-smi || die - fi - - # Desktop entries for nvidia-settings - if use gtk; then - sed -e 's:__UTILS_PATH__:/usr/bin:' \ - -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ - -i "${NV_EXEC}/nvidia-settings.desktop" - domenu ${NV_EXEC}/nvidia-settings.desktop - - doicon ${NV_EXEC}/nvidia-settings.png - 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 || die "failed to iterate through all ABIs" -} - -# 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) - - doexe $2.$3 || die "failed to install $2" - dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local CL_ROOT=/usr/${inslibdir}/OpenCL/vendors/nvidia - local libdir= sover= - - if use kernel_linux; then - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - libdir=32 - else - libdir=. - fi - sover=${PV} - else - libdir=obj - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use x86-fbsd; then - donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} - else - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - fi - - # VDPAU - donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} - - # CUDA & OpenCL - if use kernel_linux; then - donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} - donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0 - #dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so - fi -} - -pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # 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 - eselect opencl 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 "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl 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." - elog - - if ! use gtk; then - elog "USE=gtk controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. media-video/nvidia-settings" - elog "no longer installs nvidia-settings but only installs the" - elog "associated user space libraries." - fi -} - -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-295.40.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild similarity index 90% rename from x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild index 990300f..a172df5 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild @@ -1,7 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: -# /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.4 2012/04/06 06:46:14 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.2 2012/05/04 14:58:57 cardoe Exp $ EAPI="2" @@ -20,7 +19,7 @@ SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_P LICENSE="NVIDIA" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux pax_kernel" +IUSE="acpi custom-cflags multilib kernel_linux +tools pax_kernel" RESTRICT="strip" EMULTILIB_PKG="true" @@ -34,8 +33,7 @@ DEPEND="${COMMON} RDEPEND="${COMMON} x11-libs/libXvMC acpi? ( sys-power/acpid )" -PDEPEND=">=x11-libs/libvdpau-0.3-r1 - gtk? ( media-video/nvidia-settings )" +PDEPEND=">=x11-libs/libvdpau-0.3-r1" QA_TEXTRELS_x86=" usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 @@ -55,8 +53,8 @@ QA_TEXTRELS_x86=" QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko usr/lib/opengl/nvidia/lib/libGL.so.1 usr/lib/libnvidia-glcore.so.1 + usr/lib/libvdpau_nvidia.so.1 usr/lib/libnvidia-cfg.so.1 - usr/lib/libnvidia-ml.so.1 usr/lib/opengl/nvidia/extensions/libglx.so.1 usr/lib/xorg/modules/drivers/nvidia_drv.so" @@ -236,6 +234,7 @@ pkg_setup() { # set variables to where files are in the package structure if use kernel_FreeBSD; then + S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}" NV_DOC="${S}/doc" NV_EXEC="${S}/obj" NV_LIB="${S}/obj" @@ -289,20 +288,26 @@ src_prepare() { -e 's:-Wsign-compare::g' \ "${NV_SRC}"/Makefile.kbuild + # Fix building with Linux 3.3.x wrt #408841 + sed -i \ + -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \ + kernel/conftest.sh || die + # 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 - cat <<- EOF > "${S}"/nvidia.icd - /usr/$(get_libdir)/libcuda.so - EOF if use pax_kernel; then epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch fi + + cat <<- EOF > "${S}"/nvidia.icd + /usr/$(get_libdir)/libcuda.so + EOF } src_compile() { @@ -345,10 +350,10 @@ src_install() { newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules elif use x86-fbsd; then insinto /boot/modules - doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die + doins "${S}/src/nvidia.kld" || die exeinto /boot/modules - doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die + doexe "${S}/src/nvidia.ko" || die fi # NVIDIA kernel <-> userspace driver config lib @@ -361,25 +366,27 @@ src_install() { /usr/$(get_libdir)/libnvidia-cfg.so || \ die "failed to create libnvidia-cfg.so symlink" - # NVIDIA monitoring library - dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ - die "failed to install libnvidia-ml" - dosym libnvidia-ml.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-ml.so.1 || \ - die "failed to create libnvidia-ml.so symlink" - dosym libnvidia-ml.so.1 \ - /usr/$(get_libdir)/libnvidia-ml.so || \ - die "failed to create libnvidia-ml.so symlink" + if use kernel_linux; then + # NVIDIA monitoring library + dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ + die "failed to install libnvidia-ml" + dosym libnvidia-ml.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvidia-ml.so.1 || \ + die "failed to create libnvidia-ml.so symlink" + dosym libnvidia-ml.so.1 \ + /usr/$(get_libdir)/libnvidia-ml.so || \ + die "failed to create libnvidia-ml.so symlink" - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so.1 || \ - die "failed to create libnvcuvid.so symlink" - dosym libnvcuvid.so.1 \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" + # NVIDIA video decode <-> CUDA + dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ + die "failed to install libnvcuvid.so" + dosym libnvcuvid.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvcuvid.so.1 || \ + die "failed to create libnvcuvid.so symlink" + dosym libnvcuvid.so.1 \ + /usr/$(get_libdir)/libnvcuvid.so || \ + die "failed to create libnvcuvid.so symlink" + fi # Xorg DDX driver insinto /usr/$(get_libdir)/xorg/modules/drivers @@ -418,21 +425,21 @@ src_install() { if use x86-fbsd; then dodoc "${NV_DOC}/README" doman "${NV_MAN}/nvidia-xconfig.1" - use gtk && doman "${NV_MAN}/nvidia-settings.1" + doman "${NV_MAN}/nvidia-settings.1" else # Docs newdoc "${NV_DOC}/README.txt" README dodoc "${NV_DOC}/NVIDIA_Changelog" doman "${NV_MAN}/nvidia-smi.1.gz" doman "${NV_MAN}/nvidia-xconfig.1.gz" - use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" + doman "${NV_MAN}/nvidia-settings.1.gz" fi # Helper Apps exeinto /opt/bin/ doexe ${NV_EXEC}/nvidia-xconfig || die - doexe ${NV_EXEC}/nvidia-debugdump || die - if use gtk; then + use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump || die ; } + if use tools; then doexe ${NV_EXEC}/nvidia-settings || die fi doexe ${NV_EXEC}/nvidia-bug-report.sh || die @@ -441,15 +448,15 @@ src_install() { fi # Desktop entries for nvidia-settings - if use gtk; then + if use tools && use kernel_linux ; then sed -e 's:__UTILS_PATH__:/opt/bin:' \ -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ -i "${NV_EXEC}/nvidia-settings.desktop" newmenu ${NV_EXEC}/nvidia-settings.desktop nvidia-settings-opt.desktop - - doicon ${NV_EXEC}/nvidia-settings.png fi + doicon ${NV_EXEC}/nvidia-settings.png + if has_multilib_profile ; then local OABI=${ABI} for ABI in $(get_install_abis) ; do @@ -563,12 +570,11 @@ pkg_postinst() { elog "If you are having resolution problems, try disabling DynamicTwinView." elog - if ! use gtk; then - elog "USE=gtk controls whether the nvidia-settings application" + if ! use tools; then + elog "USE=tools controls whether the nvidia-settings application" elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. media-video/nvidia-settings" - elog "no longer installs nvidia-settings but only installs the" - elog "associated user space libraries." + elog "flag and re-emerge this ebuild. Optionally you can install" + elog "media-video/nvidia-settings" fi }