summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-kernel/nvidia-drivers-dkms/Manifest2
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch (renamed from sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch)0
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch (renamed from sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch)0
-rw-r--r--sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild (renamed from sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild)0
-rw-r--r--x11-drivers/nvidia-drivers/Manifest4
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-304.137-r1.ebuild494
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-384.111.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-384.98-r1.ebuild)11
7 files changed, 6 insertions, 505 deletions
diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 858e871a..4141e8d7 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-384.98.run 80981256 SHA256 fb10b66d9a835c8a5fca9bf2aeb2a240732108b1d6fd11dea19c326463c6b6bb SHA512 cd337d538d5a35f52b90a4437f44146f4982484c68171ee3570c2ff44b4bd96e0a65223a141770fbe3a7794e68832386a1d2bbaf66cff7f4cafba8462ef402b5 WHIRLPOOL 638700b0c209b27e99267b90c5e6e674946c1fef3dc65233195a3cca580a1bcc6684dd6a8c42f1a0ca1641784c4edf0db941e9c9b1cbcff57c01b116911660ff
+DIST NVIDIA-Linux-x86_64-384.111.run 81005322 SHA256 85886d52d37ff03ba84946a407638f43171e409a50aed52149e1b67b92e017b1 SHA512 ddfe787a37f2a0e5409b302b13da16bd32a4a018958aa6f3b046eae7bf06d140f8d8f496e04726c57057139ebfce40811240b13d6a4ac6412655af6b257a0c5e WHIRLPOOL 43a75bbe6853e3189f8e2a93a5523be7782ae05e1f4a0774c581c1b77b221edef5014e921c80bd0418be9dbdd74a3ceca16f806c2a7857518670915c283df43d
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch
index 01052415..01052415 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
index 89ad2df3..89ad2df3 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild
index 6c7d4f2c..6c7d4f2c 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 40a8f022..240b2e4c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,4 +1,2 @@
-DIST NVIDIA-Linux-x86_64-304.137.run 70087133 SHA256 eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2 SHA512 d7fae1e486005ffa2f2bf7f14f901bf5156fc784407a9acfea584f49bdab92ff5f4d0fb66c4c5b2800a461fc06aebb7d760bcb59f69ce4f2cb4e03e11816b3e9 WHIRLPOOL d6dee3634b0d6052c8fbaedc6e24c893af9c9d4f0f0a7836827bfaf26313f3877f398e6cfd22c27527c30dd37347206375d9c7e642cdc9a43a682bc787b1122b
-DIST NVIDIA-Linux-x86_64-384.98.run 80981256 SHA256 fb10b66d9a835c8a5fca9bf2aeb2a240732108b1d6fd11dea19c326463c6b6bb SHA512 cd337d538d5a35f52b90a4437f44146f4982484c68171ee3570c2ff44b4bd96e0a65223a141770fbe3a7794e68832386a1d2bbaf66cff7f4cafba8462ef402b5 WHIRLPOOL 638700b0c209b27e99267b90c5e6e674946c1fef3dc65233195a3cca580a1bcc6684dd6a8c42f1a0ca1641784c4edf0db941e9c9b1cbcff57c01b116911660ff
-DIST nvidia-settings-304.137.tar.bz2 1481361 SHA256 b1de2296add50c2c67f8c0e08ae231ca707edb15c1b3db517c4b4d69b0b3bf44 SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc WHIRLPOOL d5f57bb3d72906fe3b387a05c454ecd4fe4f59a6c4536baebff3a3840498b85a2b44ed3a44a91a561b3c56690e8d0943b3ba9fddd219b6948e22a4cdbf79c203
+DIST NVIDIA-Linux-x86_64-384.111.run 81005322 SHA256 85886d52d37ff03ba84946a407638f43171e409a50aed52149e1b67b92e017b1 SHA512 ddfe787a37f2a0e5409b302b13da16bd32a4a018958aa6f3b046eae7bf06d140f8d8f496e04726c57057139ebfce40811240b13d6a4ac6412655af6b257a0c5e WHIRLPOOL 43a75bbe6853e3189f8e2a93a5523be7782ae05e1f4a0774c581c1b77b221edef5014e921c80bd0418be9dbdd74a3ceca16f806c2a7857518670915c283df43d
DIST nvidia-settings-384.98.tar.gz 2136346 SHA256 7ff2d6c31581a15acb25c6a2b04379bb32f545dbdedd0e2234315d953611dc6a SHA512 c4427241b15ffe5ecb0355d3e512c517d5ad1a5f5335c187dcde379074021a4990db9c048502e62a7ce9dda651b017e06d8117fb7c724bd3a08f6fbd10b49e26 WHIRLPOOL 0a023d349e084264da4f0816069949145dcf20d744a229dc35834f631d83077ed2aba40d9e6ae71449acf5f2b356ae372768dda8393b7814c0899d7aadf770c3
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.137-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.137-r1.ebuild
deleted file mode 100644
index f6c5dc3a..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.137-r1.ebuild
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user versionator udev
-
-NV_URI="http://http.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="
- amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
- tools? ( ${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2 )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0/${PV}"
-KEYWORDS="-* amd64"
-IUSE="acpi +dkms multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-COMMON="
- app-eselect/eselect-opencl
- kernel_linux? ( >=sys-libs/glibc-2.6.1 )
- tools? (
- dev-libs/atk
- dev-libs/glib:2
- x11-libs/gdk-pixbuf[X]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/pango[X]
- x11-libs/pangox-compat
- )
- X? (
- >=app-eselect/eselect-opengl-1.0.9
- )
-"
-DEPEND="${COMMON}
- kernel_linux? (
- virtual/linux-sources
- virtual/pkgconfig
- )"
-RDEPEND="${COMMON}
- acpi? ( sys-power/acpid )
- dkms? ( ~sys-kernel/${PN}-dkms-${PV} )
- tools? ( !media-video/nvidia-settings )
- X? (
- <x11-base/xorg-server-1.19.99:=
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- x11-libs/libXvMC[${MULTILIB_USEDEP}]
- )
-"
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="
- tools? ( X )
- static-libs? ( tools )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- 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 && kernel_is ge 4 14; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-4.14"
- ewarn "<sys-kernel/vanilla-sources-4.14"
- ewarn ""
- ewarn "You are free to utilize eapply_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many 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
-
- # Kernel features/options to check for
- CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
- use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
- nvidia_drivers_versions_check
-}
-
-pkg_setup() {
- nvidia_drivers_versions_check
-
- # 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 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)"
- # linux-mod_src_compile calls set_arch_to_kernel, which
- # sets the ARCH to x86 but NVIDIA's wrapping Makefile
- # expects x86_64 or i386 and then converts it to x86
- # later on in the build process
- BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
- fi
-
- # set variables to where files are in the package structure
- if use kernel_FreeBSD; then
- use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
- use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
- NV_DOC="${S}/doc"
- NV_OBJ="${S}/obj"
- NV_SRC="${S}/src"
- NV_MAN="${S}/x11/man"
- NV_X11="${S}/obj"
- NV_SOVER=1
- elif use kernel_linux; then
- NV_DOC="${S}"
- NV_OBJ="${S}"
- NV_SRC="${S}/kernel"
- NV_MAN="${S}"
- NV_X11="${S}"
- NV_SOVER=${PV}
- else
- die "Could not determine proper NVIDIA package"
- fi
-}
-
-src_prepare() {
- # Please add a brief description for every added patch
-
- if use kernel_linux; then
- if kernel_is lt 2 6 9 ; then
- eerror "You must build this against 2.6.9 or higher kernels."
- fi
-
- # If greater than 2.6.5 use M= instead of SUBDIR=
- convert_to_m "${NV_SRC}"/Makefile.kbuild
- fi
-
- if use pax_kernel; then
- ewarn "Using PAX patches is not supported. You will be asked to"
- ewarn "use a standard kernel should you have issues. Should you"
- ewarn "need support with these patches, contact the PaX team."
- eapply "${FILESDIR}"/${PN}-pax-const.patch
- eapply "${FILESDIR}"/${PN}-pax-usercopy.patch
- fi
-
- cat <<- EOF > "${S}"/nvidia.icd
- /usr/$(get_libdir)/libnvidia-opencl.so
- EOF
-
- local man_file
- for man_file in "${NV_MAN}"/*1.gz; do
- gunzip $man_file || die
- done
-
- # Allow user patches so they can support RC kernels and whatever else
- eapply_user
-}
-
-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 kernel_FreeBSD; then
- MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
- LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
- elif use kernel_linux; then
- MAKEOPTS=-j1 linux-mod_src_compile
- fi
-
- if use tools; then
- emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean
- emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- libXNVCtrl.a
- emake -C "${S}"/nvidia-settings-${PV}/src \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC)" \
- LIBDIR="$(get_libdir)" \
- NVML_ENABLED=0 \
- NV_USE_BUNDLED_LIBJANSSON=0 \
- NV_VERBOSE=1 \
- RANLIB="$(tc-getRANLIB)" \
- STRIP_CMD=true
- fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
- # Full path to library minus SOVER
- MY_LIB="$1"
-
- # SOVER to use
- MY_SOVER="$2"
-
- # Where to install
- MY_DEST="$3"
-
- if [[ -z "${MY_DEST}" ]]; then
- MY_DEST="/usr/$(get_libdir)"
- action="dolib.so"
- else
- exeinto ${MY_DEST}
- action="doexe"
- fi
-
- # Get just the library name
- libname=$(basename $1)
-
- # Install the library with the correct SOVER
- ${action} ${MY_LIB}.${MY_SOVER} || \
- die "failed to install ${libname}"
-
- # If SOVER wasn't 1, then we need to create a .1 symlink
- if [[ "${MY_SOVER}" != "1" ]]; then
- dosym ${libname}.${MY_SOVER} \
- ${MY_DEST}/${libname}.1 || \
- die "failed to create ${libname} symlink"
- fi
-
- # Always create the symlink from the raw lib to the .1
- dosym ${libname}.1 \
- ${MY_DEST}/${libname} || \
- die "failed to create ${libname} symlink"
-}
-
-src_install() {
- if use kernel_linux; then
- linux-mod_src_install
-
- # Add the aliases
- # This file is tweaked with the appropriate video group in
- # pkg_preinst, see bug #491414
- insinto /etc/modprobe.d
- newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
- # Ensures that our device nodes are created when not using X
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
- udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
- elif use kernel_FreeBSD; then
- if use x86-fbsd; then
- insinto /boot/modules
- doins "${S}/src/nvidia.kld"
- fi
-
- exeinto /boot/modules
- doexe "${S}/src/nvidia.ko"
- fi
-
- # NVIDIA kernel <-> userspace driver config lib
- donvidia "${NV_OBJ}"/libnvidia-cfg.so ${NV_SOVER}
-
- if use kernel_linux; then
- # NVIDIA video decode <-> CUDA
- donvidia "${NV_OBJ}"/libnvcuvid.so ${NV_SOVER}
- fi
-
- if use X; then
- # Xorg DDX driver
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- doins "${NV_X11}"/nvidia_drv.so
-
- # Xorg GLX driver
- donvidia "${NV_X11}"/libglx.so ${NV_SOVER} \
- /usr/$(get_libdir)/opengl/nvidia/extensions
-
- # XvMC driver
- dolib.a "${NV_X11}"/libXvMCNVIDIA.a || \
- die "failed to install libXvMCNVIDIA.so"
- donvidia "${NV_X11}"/libXvMCNVIDIA.so ${NV_SOVER}
- dosym libXvMCNVIDIA.so.${NV_SOVER} \
- /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
- die "failed to create libXvMCNVIDIA_dynamic.so symlink"
- fi
-
- # OpenCL ICD for NVIDIA
- if use kernel_linux; then
- insinto /etc/OpenCL/vendors
- doins nvidia.icd
- donvidia "${NV_OBJ}"/libnvidia-opencl.so ${NV_SOVER}
- fi
-
- # Documentation
- dodoc -r "${NV_DOC}"/html
- if use kernel_FreeBSD; then
- dodoc "${NV_DOC}"/README
- use X && doman "${NV_MAN}"/nvidia-xconfig.1
- use tools && 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
- use X && doman "${NV_MAN}"/nvidia-xconfig.1
- use tools && doman "${NV_MAN}"/nvidia-settings.1
- doman "${NV_MAN}"/nvidia-cuda-proxy-control.1
- fi
-
- # Helper Apps
- exeinto /opt/bin/
-
- if use X; then
- doexe "${NV_OBJ}"/nvidia-xconfig
- fi
-
- if use kernel_linux ; then
- doexe "${NV_OBJ}"/nvidia-debugdump
- doexe "${NV_OBJ}"/nvidia-cuda-proxy-control
- doexe "${NV_OBJ}"/nvidia-cuda-proxy-server
- doexe "${NV_OBJ}"/nvidia-smi
- newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
- fi
-
- dobin "${NV_OBJ}"/nvidia-bug-report.sh
-
- # Desktop entries for nvidia-settings
- if use tools ; then
- emake -C "${S}"/nvidia-settings-${PV}/src/ \
- DESTDIR="${D}" \
- LIBDIR="${D}/usr/$(get_libdir)" \
- PREFIX=/usr \
- NV_USE_BUNDLED_LIBJANSSON=0 \
- install
-
- if use static-libs; then
- dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
- insinto /usr/include/NVCtrl
- doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
- fi
-
- # There is no icon in the FreeBSD tarball.
- use kernel_FreeBSD || \
- doicon "${NV_OBJ}"/nvidia-settings.png
-
- domenu "${FILESDIR}"/nvidia-settings.desktop
-
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
- fi
-
- #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
- if has_multilib_profile && use multilib ; 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"
-
- readme.gentoo_create_doc
-}
-
-src_install-libs() {
- local inslibdir=$(get_libdir)
- local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
- local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
- local nv_libdir="${NV_OBJ}"
-
- if use kernel_linux && has_multilib_profile && \
- [[ ${ABI} == "x86" ]] ; then
- nv_libdir="${NV_OBJ}"/32
- fi
-
- if use X; then
- # The GLX libraries
- donvidia "${nv_libdir}"/libGL.so ${NV_SOVER} ${GL_ROOT}
- donvidia "${nv_libdir}"/libnvidia-glcore.so ${NV_SOVER}
- if use kernel_FreeBSD; then
- donvidia "${nv_libdir}"/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
- else
- donvidia "${nv_libdir}"/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
- fi
-
- # VDPAU
- donvidia "${nv_libdir}"/libvdpau_nvidia.so ${NV_SOVER}
- fi
-
- # NVIDIA monitoring library
- if use kernel_linux ; then
- donvidia "${nv_libdir}"/libnvidia-ml.so ${NV_SOVER}
- fi
-
- # CUDA & OpenCL
- if use kernel_linux; then
- donvidia "${nv_libdir}"/libcuda.so ${NV_SOVER}
- donvidia "${nv_libdir}"/libnvidia-compiler.so ${NV_SOVER}
- donvidia "${nv_libdir}"/libOpenCL.so 1.0.0 ${CL_ROOT}
- fi
-}
-
-pkg_preinst() {
- if use kernel_linux; then
- linux-mod_pkg_preinst
-
- local 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"
- else
- sed -i \
- -e "s:PACKAGE:${PF}:g" \
- -e "s:VIDEOGID:${videogroup}:" \
- "${D}"/etc/modprobe.d/nvidia.conf || die
- fi
- 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() {
- use kernel_linux && linux-mod_pkg_postinst
-
- # Switch to the nvidia implementation
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
- "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
- readme.gentoo_print_elog
-
- if ! use X; then
- elog "You have elected to not install the X.org driver. Along with"
- elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
- elog "installed. Additionally, once the driver is loaded your card"
- elog "and fan will run at max speed which may not be desirable."
- elog "Use the 'nvidia-smi' init script to have your card and fan"
- elog "speed scale appropriately."
- elog
- fi
- 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. Optionally you can install"
- elog "media-video/nvidia-settings"
- elog
- fi
-}
-
-pkg_prerm() {
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
- use kernel_linux && linux-mod_pkg_postrm
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-384.98-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-384.111.ebuild
index 26efb84e..70351d71 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-384.98-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-384.111.ebuild
@@ -6,18 +6,15 @@ inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver
portability toolchain-funcs unpacker user udev
NV_URI="http://http.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+NV_TOOLS_PV="384.98"
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
SRC_URI="
amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
tools? (
- https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
+ https://github.com/NVIDIA/nvidia-settings/archive/${NV_TOOLS_PV}.tar.gz -> nvidia-settings-${NV_TOOLS_PV}.tar.gz
)
"
@@ -210,7 +207,7 @@ src_compile() {
fi
if use tools; then
- emake -C "${S}"/nvidia-settings-${PV}/src \
+ emake -C "${S}"/nvidia-settings-${NV_TOOLS_PV}/src \
AR="$(tc-getAR)" \
CC="$(tc-getCC)" \
LIBDIR="$(get_libdir)" \
@@ -219,7 +216,7 @@ src_compile() {
DO_STRIP= \
build-xnvctrl
- emake -C "${S}"/nvidia-settings-${PV}/src \
+ emake -C "${S}"/nvidia-settings-${NV_TOOLS_PV}/src \
CC="$(tc-getCC)" \
GTK3_AVAILABLE=$(usex gtk3 1 0) \
LD="$(tc-getCC)" \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 11:22:37 +0000