diff options
author | Ionen Wolkens <sudinave@gmail.com> | 2021-04-21 14:19:42 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2021-04-21 14:19:42 +0200 |
commit | 04aee62d5203fa4b66ca9829e0227a6af342ade7 (patch) | |
tree | 6db7ff74aa150558fe8c1526d02f29ed76a56aef /x11-drivers | |
parent | net-im/skypeforlinux: Bump to 8.71.0.36 (diff) | |
download | gentoo-04aee62d5203fa4b66ca9829e0227a6af342ade7.tar.gz gentoo-04aee62d5203fa4b66ca9829e0227a6af342ade7.tar.bz2 gentoo-04aee62d5203fa4b66ca9829e0227a6af342ade7.zip |
x11-drivers/nvidia-drivers: drop 390.141
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-drivers')
-rw-r--r-- | x11-drivers/nvidia-drivers/Manifest | 1 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch | 22 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild | 470 |
3 files changed, 0 insertions, 493 deletions
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 8c5a1f26d147..5bb82f2c4b14 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -19,7 +19,6 @@ DIST nvidia-persistenced-390.141.tar.gz 55984 BLAKE2B c4e889d15643f6e8a4e37b32d8 DIST nvidia-persistenced-450.102.04.tar.gz 52485 BLAKE2B 1fec24c86875789303aee8bf4362c9c35f76957a2906e2682aa5c07e914cc2acde769439d88007420904a71526e9f0d03ab9d0a3c5dcd1355047e03958d006f9 SHA512 6c51daaed3e7ecdb8d98bdcf0618e50962895895f88cc45a5f861c08d3c10f590d4a6a3f0a683ce0dce0e327d5977da1a76fdde974a97031dc698120ef990b07 DIST nvidia-persistenced-460.67.tar.gz 53334 BLAKE2B 1354ec98fd2b95d264fd7df6219f639cf5d73173e6f0843a0880e6b18953904412cb756bd2c60432f6ae4c253d047515a9e32a128210fd94386ae6bc9a341b5c SHA512 0b4f7d8aa781c3536f6cd020225d2a3bab4b83498090419198488a2bec811534e61ba90461ae846bd09f4530f19984d77ca41edf0a851b1b700d1c0e053d537f DIST nvidia-persistenced-465.19.01.tar.gz 53555 BLAKE2B 0b163a2cf37c9180512f9d3af442f52d4417f1ca0b286bafc154cd3c235bc8ff82380fbb92633f9dc0e010c9cc4e36ab3b5f6aad726b5357dc368edafe737146 SHA512 ebe8a8eff5770605e751665f325a82cbe24b20395684d124558838553a2815f6cf2804cb58a9624105a99442fea91d774ad4978bcd2ad13a52f55e777ae13c5d -DIST nvidia-settings-390.141.tar.bz2 1108755 BLAKE2B 210c33d4bb483dd9abe13275feb641a00d7c39a7222cbe828c925b9cfca6d4422f8fa3333dd77b73f2ba4071a7badf77625be88e02a1835177bda490c3c3c368 SHA512 44bf5f6b5bfbe3146f97d9ac82a75cc5653b6002002623ac6fa6cd233bbd3ef0d15f0b8091b59de5dbfdbde4fbe1b5212c9f9a1653ec98597c9049c9b137902e DIST nvidia-settings-390.141.tar.gz 1297261 BLAKE2B 452870df1ba598692f5da47444eb2daf4db40c79cac98c10b1c994c0ff39fc7936909b9d7788cbfe784999e68a2bdbbc12e85d63c3bc02ac872e6b3c46834697 SHA512 dbf7c389bbdc94291a1b974adfa33414148b1ab752aa7d948a27e91ee1bceb3b8435aceb6b7ef3cb806333572db11b5524667045ef7686b119d7955d2699cb04 DIST nvidia-settings-450.102.04.tar.bz2 1057126 BLAKE2B 4e27ac75441d455122860b3834f2584e4736fff1f641e9a1d3ced4a354cb0e0e35c4e7a71e7bc05940d585e0ceca576f726fdfffbb84aae8057d06355b91293f SHA512 33f27b9a2832f7f24603d3a741b6c34cdd3f27a7075b523f8b98ae89325f810e13c134fcc7503e72d44a6f6c7a0d8587bfdad898a4ab5fa252bd9c7360a32341 DIST nvidia-settings-450.102.04.tar.gz 1229675 BLAKE2B 166b73a0e9fe1cc1c16f83128aa94f3b9ef44fc71004e80c2681299dd564df6b458b52bedfd60eaaecf6142d0ea7d5147cb9c509d4db4e6b85bc72dd4dc75751 SHA512 c514bb3cc72954a52f4821674f9b783ebc0bd8c7294a296716619ddad15f2b63f50ada47797dee1386709deb7d407cb1d6c04532b7ca6e03d84234555751c9a9 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch b/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch deleted file mode 100644 index 06e046ff61d3..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.c -+++ b/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.c -@@ -103,6 +103,8 @@ - const gchar* __video_mixer_attribute_help = - "This shows the video mixer attributes and any applicable ranges."; - -+struct VDPAUDeviceImpl VDPAUDeviceFunctions; -+ - static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device, - VdpGetProcAddress *getProcAddress); - ---- a/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.h -+++ b/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.h -@@ -46,7 +46,7 @@ - (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass)) - - --struct VDPAUDeviceImpl { -+extern struct VDPAUDeviceImpl { - - VdpGetErrorString *GetErrorString; - VdpGetProcAddress *GetProcAddress; diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild deleted file mode 100644 index d2473bd071db..000000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild +++ /dev/null @@ -1,470 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ - nvidia-driver toolchain-funcs unpacker udev - -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" - -NV_URI="https://us.download.nvidia.com/XFree86/" -SRC_URI=" - amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - tools? ( - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 - )" - -EMULTILIB_PKG="true" - -LICENSE="GPL-2 NVIDIA-r2" -SLOT="0/${PV%%.*}" -KEYWORDS="-* amd64 x86" -IUSE="compat +driver +kms multilib static-libs +tools uvm wayland +X" -REQUIRED_USE=" - tools? ( X ) - static-libs? ( tools )" - -COMMON=" - driver? ( acct-group/video ) - tools? ( - dev-libs/atk - dev-libs/glib:2 - dev-libs/jansson - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/pango[X] - ) - X? ( - app-misc/pax-utils - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - )" -DEPEND=" - ${COMMON} - virtual/linux-sources - tools? ( sys-apps/dbus )" -RDEPEND=" - ${COMMON} - uvm? ( >=virtual/opencl-3 ) - wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - X? ( - <x11-base/xorg-server-1.20.99:= - >=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*" -S="${WORKDIR}" -NV_KV_MAX_PLUS="5.11" -CONFIG_CHECK=" - !DEBUG_MUTEXES - ~!I2C_NVIDIA_GPU - ~!LOCKDEP - ~DRM - ~DRM_KMS_HELPER - ~SYSVIPC" - -pkg_pretend() { - use x86 && CONFIG_CHECK+=" ~HIGHMEM" - nvidia-driver_check -} - -pkg_setup() { - use x86 && CONFIG_CHECK+=" ~HIGHMEM" - nvidia-driver_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 driver; then - MODULE_NAMES="nvidia(video:${S}/kernel)" - use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)" - use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)" - - # This needs to run after MODULE_NAMES (so that the eclass checks - # whether the kernel supports loadable modules) but before BUILD_PARAMS - # is set (so that KV_DIR is populated). - linux-mod_pkg_setup - - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1" - - # 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 -} - -src_prepare() { - gunzip *1.gz || die - - if use tools; then - cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die - cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die - sed -i \ - -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-fno-common.patch \ - "${WORKDIR}"/nvidia-settings-linker.patch \ - || die - eapply "${WORKDIR}"/nvidia-settings-fno-common.patch - eapply "${WORKDIR}"/nvidia-settings-linker.patch - - # remove GTK2 support entirely (#592730) - sed -i \ - -e '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \ - nvidia-settings-${PV}/src/Makefile || die - fi - - default - - 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 - - sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/nvidia-390.conf" \ - > "${T}"/nvidia-390.conf || die -} - -src_configure() { - tc-export AR CC LD OBJCOPY - default -} - -src_compile() { - pushd kernel >/dev/null || die - if use driver; then - BUILD_TARGETS=module linux-mod_src_compile \ - KERNELRELEASE="${KV_FULL}" \ - src="${KERNEL_DIR}" - fi - popd >/dev/null || die - - if use tools; then - emake -C nvidia-settings-${PV}/src \ - DO_STRIP= \ - LIBDIR="$(get_libdir)" \ - NVLD="$(tc-getLD)" \ - NV_VERBOSE=1 \ - RANLIB="$(tc-getRANLIB)" \ - build-xnvctrl - - emake -C nvidia-settings-${PV}/src \ - DO_STRIP= \ - GTK3_AVAILABLE=1 \ - LIBDIR="$(get_libdir)" \ - NVLD="$(tc-getLD)" \ - NVML_ENABLED=0 \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 - 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 [[ -n ${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 [[ -n ${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() { - if use driver; 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 - if use uvm; then - doins "${FILESDIR}"/nvidia-rmmod.conf - udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules - else - sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \ - > "${T}"/nvidia-rmmod.conf || die - doins "${T}"/nvidia-rmmod.conf - fi - - # 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 - fi - - # NVIDIA kernel <-> userspace driver config lib - donvidia libnvidia-cfg.so.${PV} - - # NVIDIA framebuffer capture library - donvidia libnvidia-fbc.so.${PV} - - # NVIDIA video encode/decode <-> CUDA - donvidia libnvcuvid.so.${PV} - donvidia libnvidia-encode.so.${PV} - - if use X; then - # Xorg DDX driver - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe nvidia_drv.so - - # Xorg GLX driver - donvidia libglx.so.${PV} \ - /usr/$(get_libdir)/extensions/nvidia - - # Xorg nvidia.conf - insinto /usr/share/X11/xorg.conf.d - newins {,50-}nvidia-drm-outputclass.conf - - insinto /usr/share/glvnd/egl_vendor.d - doins 10_nvidia.json - fi - - if use wayland; then - insinto /usr/share/egl/egl_external_platform.d - doins 10_nvidia_wayland.json - fi - - # OpenCL ICD for NVIDIA - insinto /etc/OpenCL/vendors - doins nvidia.icd - - # Helper Apps - exeinto /opt/bin/ - - if use X; then - doexe nvidia-xconfig - - insinto /etc/vulkan/icd.d - doins nvidia_icd.json - - insinto /etc/X11/xorg.conf.d - doins "${T}"/nvidia-390.conf - fi - - doexe nvidia-cuda-mps-control - doexe nvidia-cuda-mps-server - doexe nvidia-debugdump - doexe nvidia-persistenced - doexe nvidia-smi - - # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) - doexe nvidia-modprobe - fowners root:video /opt/bin/nvidia-modprobe - fperms 4710 /opt/bin/nvidia-modprobe - dosym ../../opt/bin/nvidia-modprobe /usr/bin/nvidia-modprobe - - doman nvidia-cuda-mps-control.1 - doman nvidia-modprobe.1 - doman nvidia-persistenced.1 - newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi - newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced - newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced - - if use tools; then - emake -C nvidia-settings-${PV}/src/ \ - DESTDIR="${ED}" \ - DO_STRIP= \ - GTK3_AVAILABLE=1 \ - LIBDIR="${ED}/usr/$(get_libdir)" \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 \ - PREFIX=/usr \ - install - - if use static-libs; then - dolib.a nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins nvidia-settings-${PV}/src/libXNVCtrl/*.h - fi - - insinto /usr/share/nvidia/ - doins nvidia-application-profiles-${PV}-key-documentation - - insinto /etc/nvidia - newins \ - nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - - doicon nvidia-settings.png - domenu "${FILESDIR}"/nvidia-settings.desktop - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings - fi - - dobin nvidia-bug-report.sh - - if has_multilib_profile && use multilib; then - local OABI=${ABI} - for ABI in $(multilib_get_enabled_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" - - # Documentation - newdoc README.txt README - dodoc NVIDIA_Changelog - doman nvidia-smi.1 - use X && doman nvidia-xconfig.1 - use tools && doman nvidia-settings.1 - doman nvidia-cuda-mps-control.1 - - readme.gentoo_create_doc - - docinto html - dodoc -r html/. -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local GL_ROOT="/usr/$(get_libdir)" - local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" - local nv_libdir="${S}" - - if has_multilib_profile && [[ ${ABI} == "x86" ]]; then - nv_libdir="${S}"/32 - fi - - if use X; then - NV_GLX_LIBRARIES=( - "libEGL_nvidia.so.${PV} ${GL_ROOT}" - "libGLESv1_CM_nvidia.so.${PV} ${GL_ROOT}" - "libGLESv2_nvidia.so.${PV} ${GL_ROOT}" - "libGLX_nvidia.so.${PV} ${GL_ROOT}" - "libOpenCL.so.1.0.0 ${CL_ROOT}" - "libcuda.so.${PV}" - "libnvcuvid.so.${PV}" - "libnvidia-compiler.so.${PV}" - "libnvidia-eglcore.so.${PV}" - "libnvidia-encode.so.${PV}" - "libnvidia-fatbinaryloader.so.${PV}" - "libnvidia-fbc.so.${PV}" - "libnvidia-glcore.so.${PV}" - "libnvidia-glsi.so.${PV}" - "libnvidia-ifr.so.${PV}" - "libnvidia-opencl.so.${PV}" - "libnvidia-ptxjitcompiler.so.${PV}" - "libvdpau_nvidia.so.${PV}" - ) - - if use wayland && [[ ${ABI} == "amd64" ]]; then - NV_GLX_LIBRARIES+=( - "libnvidia-egl-wayland.so.1.0.2" - ) - fi - - if [[ ${ABI} == "amd64" ]]; then - NV_GLX_LIBRARIES+=( - "libnvidia-wfb.so.${PV}" - ) - fi - - NV_GLX_LIBRARIES+=( - "libnvidia-ml.so.${PV}" - "tls/libnvidia-tls.so.${PV}" - ) - - local nv_lib - for nv_lib in "${NV_GLX_LIBRARIES[@]}"; do - donvidia "${nv_libdir}"/${nv_lib} - done - fi -} - -pkg_preinst() { - if use driver; then - linux-mod_pkg_preinst - - local videogroup="$(getent 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}:" \ - "${ED}"/etc/modprobe.d/nvidia.conf || die - fi - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - rm -rf "${EROOT}"/usr/lib/opengl/nvidia/* || die - # Make sure we nuke the old nvidia-glx's env.d file - rm -f "${EROOT}"/etc/env.d/09nvidia || die -} - -pkg_postinst() { - use driver && linux-mod_pkg_postinst - - 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 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_postrm() { - use driver && linux-mod_pkg_postrm -} |