From 588453cf8a12bc848f02f207cf28cc3380f04301 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Jan 2020 15:20:16 +0000 Subject: x11-drivers/nvidia-drivers && x11-misc/nvidia-settings && sys-kernel/nvidia-drivers-dkms : version bump, enable libglvnd --- sys-kernel/nvidia-drivers-dkms/Manifest | 1 + .../files/nvidia-drivers-440.44-conf.patch | 28 ++ .../files/nvidia-drivers-dkms-440.44-conf.patch | 28 ++ .../nvidia-drivers-dkms-440.44.ebuild | 47 ++++ x11-drivers/nvidia-drivers/Manifest | 1 + .../files/nvidia-drivers-440.26-locale.patch | 13 + .../files/nvidia-drivers-440.44-conf.patch | 28 ++ .../nvidia-drivers/nvidia-drivers-440.44.ebuild | 313 +++++++++++++++++++++ x11-misc/nvidia-settings/Manifest | 1 + .../nvidia-settings/nvidia-settings-440.44.ebuild | 91 ++++++ 10 files changed, 551 insertions(+) create mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch create mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.44-conf.patch create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-440.44-conf.patch create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild create mode 100644 x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest index 4577baa0..f874156e 100644 --- a/sys-kernel/nvidia-drivers-dkms/Manifest +++ b/sys-kernel/nvidia-drivers-dkms/Manifest @@ -1,2 +1,3 @@ DIST NVIDIA-Linux-x86_64-390.116.run 82282245 BLAKE2B 4dc5a1455eca985be5831e8670f461a11af28a31b07a266b633e5547751871da2cbe5753bc5f11f8a109bda50387b422984d2afff2d7284d8564edb4405421b6 SHA512 6afad9db6c56d475e34f6f4ee7a8a8351e132aab69fd3ad467a5f559a70cebda09dbd3ecfddd699b59c50903b81450b00c9197d05e149c759c2bb5d0a72d6fe8 DIST NVIDIA-Linux-x86_64-430.34.run 110148373 BLAKE2B 300dbc3edc30048717f4a9643981a2846552fd310dd0651c497664c7979f7afde6f9e77e5b9fa45bea22ffe6562999cd305e4f3b878b8e39af19f8b3ee1c3f1a SHA512 a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e +DIST NVIDIA-Linux-x86_64-440.44.run 141266881 BLAKE2B bc5ddcf9a6498c14bd9f9421a622bd647e83c8d296953923525680898548012cc9d01d078722a3194b6def5b5a90ed37b2dc08967a9603affabf449dbc87e69d SHA512 c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch new file mode 100644 index 00000000..b889c5bc --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-440.44-conf.patch @@ -0,0 +1,28 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2019-05-09 19:10:50.000000000 +0100 ++++ b/kernel/dkms.conf 2019-06-22 16:04:07.646270011 +0100 +@@ -1,12 +1,20 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="440.44" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_MODULE_NAME[0]="nvidia" ++DEST_MODULE_LOCATION[0]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++ diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.44-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.44-conf.patch new file mode 100644 index 00000000..b889c5bc --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.44-conf.patch @@ -0,0 +1,28 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2019-05-09 19:10:50.000000000 +0100 ++++ b/kernel/dkms.conf 2019-06-22 16:04:07.646270011 +0100 +@@ -1,12 +1,20 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="440.44" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_MODULE_NAME[0]="nvidia" ++DEST_MODULE_LOCATION[0]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++ diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild new file mode 100644 index 00000000..7e929ecd --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +NV_URI="http://us.download.nvidia.com/XFree86/" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" + +DESCRIPTION="NVIDIA driver sources for linux" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" + +LICENSE="GPL-2 NVIDIA-r2" +SLOT="0/44044" +KEYWORDS="amd64" +IUSE="" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/fs62142.patch + "${FILESDIR}"/"${P}"-conf.patch +) + +S="${WORKDIR}/${AMD64_NV_PACKAGE}" + +src_unpack() { + sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only +} + +src_install() { + dodir usr/src/${P} + insinto usr/src/${P} + doins -r "${S}"/kernel/* +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 4577baa0..f874156e 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,2 +1,3 @@ DIST NVIDIA-Linux-x86_64-390.116.run 82282245 BLAKE2B 4dc5a1455eca985be5831e8670f461a11af28a31b07a266b633e5547751871da2cbe5753bc5f11f8a109bda50387b422984d2afff2d7284d8564edb4405421b6 SHA512 6afad9db6c56d475e34f6f4ee7a8a8351e132aab69fd3ad467a5f559a70cebda09dbd3ecfddd699b59c50903b81450b00c9197d05e149c759c2bb5d0a72d6fe8 DIST NVIDIA-Linux-x86_64-430.34.run 110148373 BLAKE2B 300dbc3edc30048717f4a9643981a2846552fd310dd0651c497664c7979f7afde6f9e77e5b9fa45bea22ffe6562999cd305e4f3b878b8e39af19f8b3ee1c3f1a SHA512 a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e +DIST NVIDIA-Linux-x86_64-440.44.run 141266881 BLAKE2B bc5ddcf9a6498c14bd9f9421a622bd647e83c8d296953923525680898548012cc9d01d078722a3194b6def5b5a90ed37b2dc08967a9603affabf449dbc87e69d SHA512 c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch new file mode 100644 index 00000000..aa2a7434 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch @@ -0,0 +1,13 @@ +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -6,6 +6,10 @@ + SCRIPTDIR=`dirname $0` + cd $SCRIPTDIR + ++# translate_and_compile_header_files() expects the default locale ++# https://bugs.gentoo.org/698238 ++export LC_ALL=C ++ + CC="$1" + ARCH=$2 + ISYSTEM=`$CC -print-file-name=include 2> /dev/null` diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.44-conf.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.44-conf.patch new file mode 100644 index 00000000..b889c5bc --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.44-conf.patch @@ -0,0 +1,28 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2019-05-09 19:10:50.000000000 +0100 ++++ b/kernel/dkms.conf 2019-06-22 16:04:07.646270011 +0100 +@@ -1,12 +1,20 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="440.44" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_MODULE_NAME[0]="nvidia" ++DEST_MODULE_LOCATION[0]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild new file mode 100644 index 00000000..7fe768e0 --- /dev/null +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild @@ -0,0 +1,313 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils flag-o-matic multilib-minimal portability toolchain-funcs unpacker + +NV_URI="https://us.download.nvidia.com/XFree86/" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" + +DESCRIPTION="NVIDIA Accelerated Graphics Driver" +HOMEPAGE="https://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx" +SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" + +LICENSE="GPL-2 NVIDIA-r2" +SLOT="0/44044" +KEYWORDS="-* ~amd64" +RESTRICT="bindist mirror" +EMULTILIB_PKG="true" + +IUSE="acpi compat +dkms libglvnd multilib +tools wayland +X" + +COMMON=" + app-eselect/eselect-opencl + X? ( + !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) + libglvnd? ( + media-libs/libglvnd[${MULTILIB_USEDEP}] + !app-eselect/eselect-opengl + ) + app-misc/pax-utils + )" +DEPEND="${COMMON}" +PDEPEND=" + tools? ( x11-misc/nvidia-settings:${SLOT} )" +RDEPEND=" + ${COMMON} + acpi? ( sys-power/acpid ) + dkms? ( sys-kernel/${PN}-dkms:${SLOT} ) + wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + X? ( + =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + ) +" + +QA_PREBUILT="opt/* usr/lib*" + +PATCHES=( + "${FILESDIR}"/"${P}"-conf.patch + "${FILESDIR}"/"${PN}"-440.26-locale.patch +) + +S=${WORKDIR}/ + +pkg_setup() { + export DISTCC_DISABLE=1 + export CCACHE_DISABLE=1 + + NV_DOC="${S}" + NV_OBJ="${S}" + NV_SRC="${S}/kernel" + NV_MAN="${S}" + NV_X11="${S}" + NV_SOVER=${PV} +} + +src_prepare() { + default + local man_file + for man_file in "${NV_MAN}"/*1.gz; do + gunzip $man_file || die + done + + if ! [ -f nvidia_icd.json ]; then + cp nvidia_icd.json.template nvidia_icd.json || die + sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die + 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 it is not /usr/lib +donvidia() { + # Full path to library + nv_LIB="${1}" + + # SOVER to use + nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})" + + # Where to install + nv_DEST="${2}" + + # Get just the library name + nv_LIBNAME=$(basename "${nv_LIB}") + + if [[ "${nv_DEST}" ]]; then + exeinto ${nv_DEST} + action="doexe" + else + nv_DEST="/usr/$(get_libdir)" + action="dolib.so" + fi + + # Install the library + ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}" + + # If the library has a SONAME and SONAME does not match the library name, + # then we need to create a symlink + if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} + fi + + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} +} + +src_install() { + # NVIDIA kernel <-> userspace driver config lib + donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER} + + # NVIDIA framebuffer capture library + donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER} + + # NVIDIA video encode/decode <-> CUDA + donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER} + donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER} + + 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}/libglxserver_nvidia.so.${NV_SOVER} \ + /usr/$(get_libdir)/xorg/modules/extensions + + # Xorg nvidia.conf + if has_version '>=x11-base/xorg-server-1.16'; then + insinto /usr/share/X11/xorg.conf.d + newins {,50-}nvidia-drm-outputclass.conf + fi + + insinto /usr/share/glvnd/egl_vendor.d + doins ${NV_X11}/10_nvidia.json + fi + + if use wayland; then + insinto /usr/share/egl/egl_external_platform.d + doins ${NV_X11}/10_nvidia_wayland.json + fi + + # OpenCL ICD for NVIDIA + insinto /etc/OpenCL/vendors + doins ${NV_OBJ}/nvidia.icd + + # Helper Apps + exeinto /opt/bin/ + + if use X; then + doexe ${NV_OBJ}/nvidia-xconfig + + insinto /etc/vulkan/icd.d + doins nvidia_icd.json + fi + + doexe ${NV_OBJ}/nvidia-cuda-mps-control + doexe ${NV_OBJ}/nvidia-cuda-mps-server + doexe ${NV_OBJ}/nvidia-debugdump + doexe ${NV_OBJ}/nvidia-persistenced + doexe ${NV_OBJ}/nvidia-smi + + # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) + doexe ${NV_OBJ}/nvidia-modprobe + fowners root:video /opt/bin/nvidia-modprobe + fperms 4710 /opt/bin/nvidia-modprobe + dosym /{opt,usr}/bin/nvidia-modprobe + + doman nvidia-cuda-mps-control.1 + doman nvidia-modprobe.1 + doman nvidia-persistenced.1 + + #init + newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi + newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced + newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced + + 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" +} + +src_install-libs() { + local inslibdir=$(get_libdir) + if use libglvnd; then + local GL_ROOT="/usr/$(get_libdir)" + else + local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" + fi + local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" + local nv_libdir="${NV_OBJ}" + + if has_multilib_profile && [[ ${ABI} == "x86" ]]; then + nv_libdir="${NV_OBJ}"/32 + fi + + if use X; then + NV_GLX_LIBRARIES=( + "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libOpenCL.so.1.0.0 ${CL_ROOT}" + "libcuda.so.${NV_SOVER}" + "libnvcuvid.so.${NV_SOVER}" + "libnvidia-compiler.so.${NV_SOVER}" + "libnvidia-eglcore.so.${NV_SOVER}" + "libnvidia-encode.so.${NV_SOVER}" + "libnvidia-fatbinaryloader.so.${NV_SOVER}" + "libnvidia-fbc.so.${NV_SOVER}" + "libnvidia-glcore.so.${NV_SOVER}" + "libnvidia-glsi.so.${NV_SOVER}" + "libnvidia-glvkspirv.so.${NV_SOVER}" + "libnvidia-ifr.so.${NV_SOVER}" + "libnvidia-opencl.so.${NV_SOVER}" + "libnvidia-ptxjitcompiler.so.${NV_SOVER}" + "libvdpau_nvidia.so.${NV_SOVER}" + "libnvidia-ml.so.${NV_SOVER}" + "libnvidia-tls.so.${NV_SOVER}" + ) + + if ! use libglvnd; then + NV_GLX_LIBRARIES+=( + "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}" + "libGL.so.1.7.0 ${GL_ROOT}" + "libGLESv1_CM.so.1.2.0 ${GL_ROOT}" + "libGLESv2.so.2.1.0 ${GL_ROOT}" + "libGLX.so.0 ${GL_ROOT}" + "libGLdispatch.so.0 ${GL_ROOT}" + "libOpenGL.so.0 ${GL_ROOT}" + ) + fi + + if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + then + NV_GLX_LIBRARIES+=( + "libnvidia-egl-wayland.so.1.1.4" + ) + fi + + if has_multilib_profile && [[ ${ABI} == "amd64" ]]; + then + NV_GLX_LIBRARIES+=( + "libnvidia-cbl.so.${NV_SOVER}" + "libnvidia-rtcore.so.${NV_SOVER}" + "libnvoptix.so.${NV_SOVER}" + ) + fi + + for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do + donvidia "${nv_libdir}"/${NV_LIB} + done + fi +} + +pkg_preinst() { + if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then + rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* + fi + + if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then + rm -f "${ROOT}"/etc/env.d/09nvidia + fi +} + +pkg_postinst() { + if ! use libglvnd; then + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia + fi + "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia + if ! use X; then + elog "You have elected to not install the X.org driver. Along with" + elog "this the OpenGL libraries 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 +} + +pkg_prerm() { + if ! use libglvnd; then + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 + fi +} + +pkg_postrm() { + if ! use libglvnd; then + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 + fi +} diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest index 23cba1bc..45e3710d 100644 --- a/x11-misc/nvidia-settings/Manifest +++ b/x11-misc/nvidia-settings/Manifest @@ -1,2 +1,3 @@ DIST nvidia-settings-390.116.tar.gz 1297246 BLAKE2B d4bb69f5c84da8bfc1df88f0654821f91ee839dd18d99ab1132f10768f9eb9d093cc9a22e2f12611fd31d865bc40f8b65b6ea98d3269e3de6b212f03919c1e5a SHA512 81d15c4e969b8d5cc02749e9fa32d6ab75f2bccfcfd1d2d74dca4954384df730e50f774c7df45ae915fc64bb7369f438fab2d4d695044e0ba1d6d5db44875751 DIST nvidia-settings-430.34.tar.gz 1317422 BLAKE2B fa9fc1784c24bff6a61dff752d6b5574a7e8fe4e974a0b99e54245f990e0dafeb097a7078eda7f7718bcd89653e780d06c4b8040117b705b42ffe94b52c9f906 SHA512 c4a4deee291eb814a5bc74d33d5d5e9b4fa8ec5f2080ca110e162d5771f6f9547593c337007e5513141652e4b612b95221498012a1732edd3fd7e9e9308a479a +DIST nvidia-settings-440.44.tar.gz 1314352 BLAKE2B 5708f24bd98cf01064e5cc7eca8f6109d2072996a8ac9f77db1ccbc3e3995c28f6dec2e74729fddf0a7be324193b089835e30d9acb0bf3ae58592dad48914c9d SHA512 5826a5915f0ed50ab80f442d005668dc876565233eb0f36723db5047d7592ca9b81ebfa824bc04f5275792d8b34bb457a7db173d1bdf464df7a186bfc528da1d diff --git a/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild b/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild new file mode 100644 index 00000000..a634d144 --- /dev/null +++ b/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="NVIDIA Linux X11 Settings Utility" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/44044" +KEYWORDS="-* amd64" +IUSE="gtk3" + +QA_PREBUILT= + +COMMON_DEPEND=" + x11-libs/gtk+:2 + gtk3? ( x11-libs/gtk+:3 ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/gdk-pixbuf[X] + media-libs/mesa + x11-libs/pango[X] + x11-libs/libXv + x11-libs/libXrandr + dev-libs/glib:2 + dev-libs/jansson + x11-libs/cairo + >=x11-libs/libvdpau-1.0" + +RDEPEND="${COMMON_DEPEND} + x11-drivers/nvidia-drivers:${SLOT}" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto" + +src_prepare() { + default + eapply "${FILESDIR}"/nvidia-settings-linker.patch +} + + +src_compile() { + einfo "Building libXNVCtrl..." + emake -C src/libXNVCtrl \ + DO_STRIP= \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NV_VERBOSE=1 \ + OUTPUTDIR=. \ + RANLIB="$(tc-getRANLIB)" + + einfo "Building nvidia-settings..." + emake -C src/ \ + DO_STRIP= \ + GTK3_AVAILABLE=$(usex gtk3 1 0) \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NVML_ENABLED=0 \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + OUTPUTDIR=. +} + +src_install() { + emake -C src/ \ + DESTDIR="${D}" \ + DO_STRIP= \ + GTK3_AVAILABLE=$(usex gtk3 1 0) \ + LIBDIR="${D}/usr/$(get_libdir)" \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + OUTPUTDIR=. \ + PREFIX=/usr \ + install + + insinto /usr/$(get_libdir) + doins src/libXNVCtrl/libXNVCtrl.a + + insinto /usr/include/NVCtrl + doins src/libXNVCtrl/*.h + + doicon doc/${PN}.png + domenu ${FILESDIR}/${PN}.desktop + + dodoc doc/*.txt +} -- cgit v1.2.3