commit:     fcc779a9f7cfcd2c0f2de3ef16fb5ab51eca7d36
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 03:25:21 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 03:28:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc779a9

x11-drivers/nvidia-drivers: drop 495.46, 495.46-r20

Keep 495.44-r2 and 495.46-r10 for now in case of regressions, but
-r0 and -r20 should have no real uses.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../nvidia-drivers-495.46-r20.ebuild               | 461 ---------------------
 .../nvidia-drivers/nvidia-drivers-495.46.ebuild    | 447 --------------------
 2 files changed, 908 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
deleted file mode 100644
index 694ae76105ad..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-       systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.15"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx";
-SRC_URI="
-       amd64? ( 
https://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run
 )
-       arm64? ( 
https://us.download.nvidia.com/XFree86/aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run
 )
-       $(printf "https://github.com/NVIDIA/%s/archive/refs/tags/${PV}.tar.gz 
-> %s-${PV}.tar.gz " \
-               nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-#KEYWORDS="-* ~amd64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
-RESTRICT="bindist"
-
-COMMON_DEPEND="
-       acct-group/video
-       persistenced? (
-               acct-user/nvpd
-               net-libs/libtirpc:=
-       )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson:=
-               media-libs/harfbuzz:=
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf:2
-               x11-libs/gtk+:3
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXxf86vm
-               x11-libs/pango
-       )"
-RDEPEND="
-       ${COMMON_DEPEND}
-       X? (
-               media-libs/libglvnd[X,abi_x86_32(-)?]
-               x11-libs/libX11[abi_x86_32(-)?]
-               x11-libs/libXext[abi_x86_32(-)?]
-       )
-       wayland? (
-               gui-libs/egl-gbm
-               >=gui-libs/egl-wayland-1.1.7-r1
-               media-libs/libglvnd
-       )"
-DEPEND="
-       ${COMMON_DEPEND}
-       static-libs? (
-               x11-libs/libX11
-               x11-libs/libXext
-       )
-       tools? (
-               media-libs/libglvnd
-               sys-apps/dbus
-               x11-base/xorg-proto
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libvdpau
-       )"
-BDEPEND="
-       sys-devel/m4
-       virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-       "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-       "${FILESDIR}"/nvidia-settings-390.144-desktop.patch
-       "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
-       "${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-)
-
-pkg_setup() {
-       use driver || return
-
-       local CONFIG_CHECK="
-               PROC_FS
-               ~DRM_KMS_HELPER
-               ~SYSVIPC
-               ~!DRM_SIMPLEDRM
-               ~!LOCKDEP
-               ~!SLUB_DEBUG_ON
-               !DEBUG_MUTEXES"
-       local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but 
needed for Xorg auto-detection
-       of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-       Cannot be directly selected in the kernel's menuconfig, and may need
-       selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-       DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-       Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
-
-       use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-       MODULE_NAMES="
-               nvidia(video:kernel)
-               nvidia-drm(video:kernel)
-               nvidia-modeset(video:kernel)
-               nvidia-peermem(video:kernel)
-               nvidia-uvm(video:kernel)"
-
-       linux-mod_pkg_setup
-
-       [[ ${MERGE_TYPE} == binary ]] && return
-
-       BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" 
SYSOUT="${KV_OUT_DIR}"'
-       BUILD_TARGETS="modules"
-
-       if linux_chkconfig_present CC_IS_CLANG; then
-               ewarn "Warning: building ${PN} with a clang-built kernel is 
experimental"
-
-               BUILD_PARAMS+=' CC=${CHOST}-clang'
-               if linux_chkconfig_present LD_IS_LLD; then
-                       BUILD_PARAMS+=' LD=ld.lld'
-                       if linux_chkconfig_present LTO_CLANG_THIN; then
-                               # kernel enables cache by default leading to 
sandbox violations
-                               BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= 
LDFLAGS_MODULE=--thinlto-cache-dir='
-                       fi
-               fi
-       fi
-
-       if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-               ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break 
this version of ${PN}"
-               ewarn "or was not tested with it. It is recommended to use one 
of:"
-               ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
-               ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
-               ewarn "You are free to try or use /etc/portage/patches, but 
support will"
-               ewarn "not be given and issues wait until NVIDIA releases a 
fixed version."
-               ewarn
-               ewarn "Do _not_ file a bug report if run into issues."
-               ewarn
-       fi
-}
-
-src_prepare() {
-       # make patches usable across versions
-       rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-       rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-       rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-       rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-       default
-
-       # prevent detection of incomplete kernel DRM support (bug #603818)
-       sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-               -i kernel/conftest.sh || die
-
-       sed 's/__USER__/nvpd/' \
-               
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-               > "${T}"/nvidia-persistenced.service || die
-
-       # enable nvidia-drm.modeset=1 by default with USE=wayland
-       cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-       use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || 
die
-
-       # temporary workaround for dbus powerd spam in 495 series
-       # (jz -> jmp after nvidia.powerd.server, need RESTRICT=bindist)
-       # 
https://forums.developer.nvidia.com/t/bug-nvidia-v495-29-05-driver-spamming-dbus-enabled-applications-with-invalid-messages/192892/14
-       if use amd64; then
-               sed 
's/\x0f\x84\[\x01\x00\x00\x4c\x8d/\xe9\x5c\x01\x00\x00\x00\x4c\x8d/' \
-                       -i libnvidia-glcore.so.495.46 || die
-               sed 
's/\x0f\x84\x65\x01\x00\x00\x83\xec\x08\x89/\xe9\x66\x01\x00\x00\x00\x83\xec\x08\x89/'
 \
-                       -i 32/libnvidia-glcore.so.495.46 || die
-       fi
-}
-
-src_compile() {
-       tc-export AR CC LD OBJCOPY
-
-       NV_ARGS=(
-               PREFIX="${EPREFIX}"/usr
-               HOST_CC="$(tc-getBUILD_CC)"
-               HOST_LD="$(tc-getBUILD_LD)"
-               NV_USE_BUNDLED_LIBJANSSON=0
-               NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-       )
-
-       use driver && linux-mod_src_compile
-
-       emake "${NV_ARGS[@]}" -C nvidia-modprobe
-       use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-       use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-       if use tools; then
-               # cflags: avoid noisy logs, only use here and set first to let 
override
-               # ldflags: abi currently needed if LD=ld.lld
-               CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-                       RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
-                       emake "${NV_ARGS[@]}" -C nvidia-settings
-       elif use static-libs; then
-               emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
-       fi
-}
-
-src_install() {
-       local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-       NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-       local -A paths=(
-               [APPLICATION_PROFILE]=/usr/share/nvidia
-               [CUDA_ICD]=/etc/OpenCL/vendors
-               
[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-               [FIRMWARE]=/lib/firmware/nvidia/${PV}
-               [GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-               [GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-               [VULKAN_ICD_JSON]=/usr/share/vulkan
-               [WINE_LIB]=/usr/${libdir}/nvidia/wine
-               [XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-               [GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-               [GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-               [XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-       )
-
-       local skip_files=(
-               $(usex X '' '
-                       libGLX_nvidia libglxserver_nvidia
-                       nvidia_icd.json nvidia_layers.json')
-               $(usex wayland '' 'libnvidia-vulkan-producer')
-               libGLX_indirect # non-glvnd unused fallback
-               libnvidia-gtk nvidia-{settings,xconfig} # built from source
-               libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-               libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-       )
-       local skip_modules=(
-               $(usex X '' 'nvfbc vdpau xdriver')
-               $(usex driver '' 'gsp')
-               installer nvpd # handled separately / built from source
-       )
-       local skip_types=(
-               GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # 
media-libs/libglvnd
-               OPENCL_WRAPPER.\* # virtual/opencl
-               DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF # handled 
separately / unused
-       )
-
-       local DOCS=(
-               README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-               nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-       )
-       local HTML_DOCS=( html/. )
-       einstalldocs
-
-       local DISABLE_AUTOFORMATTING=yes
-       local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usex driver "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options." '')\
-$(use amd64 && usex abi_x86_32 '' "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For general information on using ${PN}, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers";
-       readme.gentoo_create_doc
-
-       if use driver; then
-               linux-mod_src_install
-
-               insinto /etc/modprobe.d
-               doins "${T}"/nvidia.conf
-
-               # used for gpu verification with binpkgs (not kept, see 
pkg_preinst)
-               insinto /usr/share/nvidia
-               doins supported-gpus/supported-gpus.json
-       fi
-
-       emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-       fowners :video /usr/bin/nvidia-modprobe #505092
-       fperms 4710 /usr/bin/nvidia-modprobe
-
-       if use persistenced; then
-               emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-               newconfd "${FILESDIR}"/nvidia-persistenced.confd 
nvidia-persistenced
-               newinitd "${FILESDIR}"/nvidia-persistenced.initd 
nvidia-persistenced
-               systemd_dounit "${T}"/nvidia-persistenced.service
-       fi
-
-       if use tools; then
-               emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-               doicon nvidia-settings/doc/nvidia-settings.png
-               domenu nvidia-settings/doc/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       if use static-libs; then
-               dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-               insinto /usr/include/NVCtrl
-               doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-       fi
-
-       use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-       # mimic nvidia-installer by reading .manifest to install files
-       # 0:file 1:perms 2:type 3+:subtype/arguments -:module
-       local m into
-       while IFS=' ' read -ra m; do
-               ! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-                       eval '[[ " ${m[0]##*/}" =~ ^(\ 
'${skip_files[*]/%/.*|\\}' )$ ]]' ||
-                       eval '[[ " ${m[2]}" =~ ^(\ '${skip_types[*]/%/|\\}' )$ 
]]' ||
-                       has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-               case ${m[2]} in
-                       MANPAGE)
-                               gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-                               continue
-                       ;;
-                       GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-                       VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so 
to vdpau/
-               esac
-
-               if [[ -v paths[${m[2]}] ]]; then
-                       into=${paths[${m[2]}]}
-               elif [[ ${m[2]} =~ _BINARY$ ]]; then
-                       into=/opt/bin
-               elif [[ ${m[3]} == COMPAT32 ]]; then
-                       use abi_x86_32 || continue
-                       into=/usr/${libdir32}
-               elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
-                       into=/usr/${libdir}
-               else
-                       die "No known installation path for ${m[0]}"
-               fi
-               [[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-               [[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-               if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-                       [[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-                       dosym ${m[4]} ${into}/${m[0]}
-                       continue
-               fi
-               [[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-                       dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in 
.manifest
-
-               printf -v m[1] %o $((m[1] | 0200)) # 444->644
-               insopts -m${m[1]}
-               insinto ${into}
-               doins ${m[0]}
-       done < .manifest || die
-
-       # MODULE:installer non-skipped extras
-       exeinto /lib/systemd/system-sleep
-       doexe systemd/system-sleep/nvidia
-       dobin systemd/nvidia-sleep.sh
-       systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-       dobin nvidia-bug-report.sh
-}
-
-pkg_preinst() {
-       has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=
-       has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-       use driver || return
-       linux-mod_pkg_preinst
-
-       # set video group id based on live system (bug #491414)
-       local g=$(getent group video | cut -d: -f3)
-       [[ ${g} ]] || die "Failed to determine video group id"
-       sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-       # try to find driver mismatches using temporary supported-gpus.json
-       for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-               g=$(grep -io 
"\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-                       "${ED}"/usr/share/nvidia/supported-gpus.json 
2>/dev/null)
-               if [[ ${g} ]]; then
-                       g=$((${g##*\"}+1))
-                       if ver_test -ge ${g}; then
-                               NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-                               break
-                       fi
-               fi
-       done
-       rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-       use driver && linux-mod_pkg_postinst
-
-       readme.gentoo_print_elog
-
-       if [[ -r /proc/driver/nvidia/version &&
-               $(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-               ewarn "Currently loaded NVIDIA modules do not match the newly 
installed"
-               ewarn "libraries and may prevent launching GPU-accelerated 
applications."
-               use driver && ewarn "The easiest way to fix this is usually to 
reboot."
-       fi
-
-       if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-               ewarn "Detected that the current kernel command line is using 
'slub_debug=',"
-               ewarn "this may lead to system instability/freezes with this 
version of"
-               ewarn "${PN}. Bug: https://bugs.gentoo.org/796329";
-       fi
-
-       if [[ -v NV_LEGACY_MASK ]]; then
-               ewarn
-               ewarn "***WARNING***"
-               ewarn
-               ewarn "You are installing a version of ${PN} known not to work"
-               ewarn "with a GPU of the current system. If unwanted, add the 
mask:"
-               if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-                       ewarn "  echo '${NV_LEGACY_MASK}' > 
${EROOT}/etc/portage/package.mask/${PN}"
-               else
-                       ewarn "  echo '${NV_LEGACY_MASK}' >> 
${EROOT}/etc/portage/package.mask"
-               fi
-               ewarn "...then downgrade to a legacy branch if possible. For 
details, see:"
-               ewarn "https://www.nvidia.com/object/IO_32667.html";
-       fi
-
-       if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then
-               elog
-               elog "USE=abi_x86_32 is disabled, 32bit applications will not 
be able to"
-               elog "use nvidia-drivers for acceleration without it (e.g. 
commonly used"
-               elog "with app-emulation/wine-* or steam). Re-enable if needed."
-       fi
-
-       if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
-               elog
-               elog "With USE=wayland, this version of ${PN} sets 
nvidia-drm.modeset=1"
-               elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is 
considered"
-               elog "experimental but is required for wayland."
-               elog
-               elog "If you experience issues, either disable wayland or edit 
nvidia.conf."
-               elog "Of note, may possibly cause issues with SLI and Reverse 
PRIME."
-       fi
-
-       ewarn
-       ewarn "This revision of ${PN} is applying a binary patch to prevent 
heavy"
-       ewarn "dbus spamming while using OpenGL. If you experience issues, 
please try to"
-       ewarn "mask =${CATEGORY}/${PN}-${PVR} to use NVIDIA's intended version."
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
deleted file mode 100644
index 5ccf1a12923c..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-       systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.15"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx";
-SRC_URI="
-       amd64? ( 
https://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run
 )
-       arm64? ( 
https://us.download.nvidia.com/XFree86/aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run
 )
-       $(printf "https://github.com/NVIDIA/%s/archive/refs/tags/${PV}.tar.gz 
-> %s-${PV}.tar.gz " \
-               nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
-
-COMMON_DEPEND="
-       acct-group/video
-       persistenced? (
-               acct-user/nvpd
-               net-libs/libtirpc:=
-       )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson:=
-               media-libs/harfbuzz:=
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf:2
-               x11-libs/gtk+:3
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXxf86vm
-               x11-libs/pango
-       )"
-RDEPEND="
-       ${COMMON_DEPEND}
-       X? (
-               media-libs/libglvnd[X,abi_x86_32(-)?]
-               x11-libs/libX11[abi_x86_32(-)?]
-               x11-libs/libXext[abi_x86_32(-)?]
-       )
-       wayland? (
-               >=gui-libs/egl-wayland-1.1.7-r1
-               media-libs/libglvnd
-               >=media-libs/mesa-21.2[gbm(+)]
-               x11-libs/libdrm
-       )"
-DEPEND="
-       ${COMMON_DEPEND}
-       static-libs? (
-               x11-libs/libX11
-               x11-libs/libXext
-       )
-       tools? (
-               media-libs/libglvnd
-               sys-apps/dbus
-               x11-base/xorg-proto
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libvdpau
-       )"
-BDEPEND="
-       sys-devel/m4
-       virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-       "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-       "${FILESDIR}"/nvidia-settings-390.144-desktop.patch
-       "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
-       "${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-)
-
-pkg_setup() {
-       use driver || return
-
-       local CONFIG_CHECK="
-               PROC_FS
-               ~DRM_KMS_HELPER
-               ~SYSVIPC
-               ~!DRM_SIMPLEDRM
-               ~!LOCKDEP
-               ~!SLUB_DEBUG_ON
-               !DEBUG_MUTEXES"
-       local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but 
needed for Xorg auto-detection
-       of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-       Cannot be directly selected in the kernel's menuconfig, and may need
-       selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-       DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-       Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
-
-       use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-       MODULE_NAMES="
-               nvidia(video:kernel)
-               nvidia-drm(video:kernel)
-               nvidia-modeset(video:kernel)
-               nvidia-peermem(video:kernel)
-               nvidia-uvm(video:kernel)"
-
-       linux-mod_pkg_setup
-
-       [[ ${MERGE_TYPE} == binary ]] && return
-
-       BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" 
SYSOUT="${KV_OUT_DIR}"'
-       BUILD_TARGETS="modules"
-
-       if linux_chkconfig_present CC_IS_CLANG; then
-               ewarn "Warning: building ${PN} with a clang-built kernel is 
experimental"
-
-               BUILD_PARAMS+=' CC=${CHOST}-clang'
-               if linux_chkconfig_present LD_IS_LLD; then
-                       BUILD_PARAMS+=' LD=ld.lld'
-                       if linux_chkconfig_present LTO_CLANG_THIN; then
-                               # kernel enables cache by default leading to 
sandbox violations
-                               BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= 
LDFLAGS_MODULE=--thinlto-cache-dir='
-                       fi
-               fi
-       fi
-
-       if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-               ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break 
this version of ${PN}"
-               ewarn "or was not tested with it. It is recommended to use one 
of:"
-               ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
-               ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
-               ewarn "You are free to try or use /etc/portage/patches, but 
support will"
-               ewarn "not be given and issues wait until NVIDIA releases a 
fixed version."
-               ewarn
-               ewarn "Do _not_ file a bug report if run into issues."
-               ewarn
-       fi
-}
-
-src_prepare() {
-       # make patches usable across versions
-       rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-       rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-       rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-       rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-       default
-
-       # prevent detection of incomplete kernel DRM support (bug #603818)
-       sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-               -i kernel/conftest.sh || die
-
-       sed 's/__USER__/nvpd/' \
-               
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-               > "${T}"/nvidia-persistenced.service || die
-
-       # enable nvidia-drm.modeset=1 by default with USE=wayland
-       cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-       use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || 
die
-}
-
-src_compile() {
-       tc-export AR CC LD OBJCOPY
-
-       NV_ARGS=(
-               PREFIX="${EPREFIX}"/usr
-               HOST_CC="$(tc-getBUILD_CC)"
-               HOST_LD="$(tc-getBUILD_LD)"
-               NV_USE_BUNDLED_LIBJANSSON=0
-               NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-       )
-
-       use driver && linux-mod_src_compile
-
-       emake "${NV_ARGS[@]}" -C nvidia-modprobe
-       use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-       use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-       if use tools; then
-               # cflags: avoid noisy logs, only use here and set first to let 
override
-               # ldflags: abi currently needed if LD=ld.lld
-               CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-                       RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
-                       emake "${NV_ARGS[@]}" -C nvidia-settings
-       elif use static-libs; then
-               emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
-       fi
-}
-
-src_install() {
-       local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-       NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-       local -A paths=(
-               [APPLICATION_PROFILE]=/usr/share/nvidia
-               [CUDA_ICD]=/etc/OpenCL/vendors
-               
[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-               [FIRMWARE]=/lib/firmware/nvidia/${PV}
-               [GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-               [GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-               [VULKAN_ICD_JSON]=/usr/share/vulkan
-               [WINE_LIB]=/usr/${libdir}/nvidia/wine
-               [XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-               [GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-               [GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-               [XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-       )
-
-       local skip_files=(
-               $(usex X '' '
-                       libGLX_nvidia libglxserver_nvidia
-                       nvidia_icd.json nvidia_layers.json')
-               $(usex wayland '' '
-                       libnvidia-egl-gbm 15_nvidia_gbm
-                       libnvidia-vulkan-producer')
-               libGLX_indirect # non-glvnd unused fallback
-               libnvidia-gtk nvidia-{settings,xconfig} # built from source
-               libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-       )
-       local skip_modules=(
-               $(usex X '' 'nvfbc vdpau xdriver')
-               $(usex driver '' 'gsp')
-               installer nvpd # handled separately / built from source
-       )
-       local skip_types=(
-               GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # 
media-libs/libglvnd
-               OPENCL_WRAPPER.\* # virtual/opencl
-               DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF # handled 
separately / unused
-       )
-
-       local DOCS=(
-               README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-               nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-       )
-       local HTML_DOCS=( html/. )
-       einstalldocs
-
-       local DISABLE_AUTOFORMATTING=yes
-       local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usex driver "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options." '')\
-$(use amd64 && usex abi_x86_32 '' "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For general information on using ${PN}, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers";
-       readme.gentoo_create_doc
-
-       if use driver; then
-               linux-mod_src_install
-
-               insinto /etc/modprobe.d
-               doins "${T}"/nvidia.conf
-
-               # used for gpu verification with binpkgs (not kept, see 
pkg_preinst)
-               insinto /usr/share/nvidia
-               doins supported-gpus/supported-gpus.json
-       fi
-
-       emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-       fowners :video /usr/bin/nvidia-modprobe #505092
-       fperms 4710 /usr/bin/nvidia-modprobe
-
-       if use persistenced; then
-               emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-               newconfd "${FILESDIR}"/nvidia-persistenced.confd 
nvidia-persistenced
-               newinitd "${FILESDIR}"/nvidia-persistenced.initd 
nvidia-persistenced
-               systemd_dounit "${T}"/nvidia-persistenced.service
-       fi
-
-       if use tools; then
-               emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-               doicon nvidia-settings/doc/nvidia-settings.png
-               domenu nvidia-settings/doc/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       if use static-libs; then
-               dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-               insinto /usr/include/NVCtrl
-               doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-       fi
-
-       use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-       # mimic nvidia-installer by reading .manifest to install files
-       # 0:file 1:perms 2:type 3+:subtype/arguments -:module
-       local m into
-       while IFS=' ' read -ra m; do
-               ! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-                       eval '[[ " ${m[0]##*/}" =~ ^(\ 
'${skip_files[*]/%/.*|\\}' )$ ]]' ||
-                       eval '[[ " ${m[2]}" =~ ^(\ '${skip_types[*]/%/|\\}' )$ 
]]' ||
-                       has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-               case ${m[2]} in
-                       MANPAGE)
-                               gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-                               continue
-                       ;;
-                       GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-                       VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so 
to vdpau/
-               esac
-
-               if [[ -v paths[${m[2]}] ]]; then
-                       into=${paths[${m[2]}]}
-               elif [[ ${m[2]} =~ _BINARY$ ]]; then
-                       into=/opt/bin
-               elif [[ ${m[3]} == COMPAT32 ]]; then
-                       use abi_x86_32 || continue
-                       into=/usr/${libdir32}
-               elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
-                       into=/usr/${libdir}
-               else
-                       die "No known installation path for ${m[0]}"
-               fi
-               [[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-               [[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-               if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-                       [[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-                       dosym ${m[4]} ${into}/${m[0]}
-                       continue
-               fi
-               [[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-                       dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in 
.manifest
-
-               printf -v m[1] %o $((m[1] | 0200)) # 444->644
-               insopts -m${m[1]}
-               insinto ${into}
-               doins ${m[0]}
-       done < .manifest || die
-
-       # MODULE:installer non-skipped extras
-       exeinto /lib/systemd/system-sleep
-       doexe systemd/system-sleep/nvidia
-       dobin systemd/nvidia-sleep.sh
-       systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-       dobin nvidia-bug-report.sh
-}
-
-pkg_preinst() {
-       has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=
-       has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-       use driver || return
-       linux-mod_pkg_preinst
-
-       # set video group id based on live system (bug #491414)
-       local g=$(getent group video | cut -d: -f3)
-       [[ ${g} ]] || die "Failed to determine video group id"
-       sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-       # try to find driver mismatches using temporary supported-gpus.json
-       for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-               g=$(grep -io 
"\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-                       "${ED}"/usr/share/nvidia/supported-gpus.json 
2>/dev/null)
-               if [[ ${g} ]]; then
-                       g=$((${g##*\"}+1))
-                       if ver_test -ge ${g}; then
-                               NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-                               break
-                       fi
-               fi
-       done
-       rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-       use driver && linux-mod_pkg_postinst
-
-       readme.gentoo_print_elog
-
-       if [[ -r /proc/driver/nvidia/version &&
-               $(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-               ewarn "Currently loaded NVIDIA modules do not match the newly 
installed"
-               ewarn "libraries and may prevent launching GPU-accelerated 
applications."
-               use driver && ewarn "The easiest way to fix this is usually to 
reboot."
-       fi
-
-       if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-               ewarn "Detected that the current kernel command line is using 
'slub_debug=',"
-               ewarn "this may lead to system instability/freezes with this 
version of"
-               ewarn "${PN}. Bug: https://bugs.gentoo.org/796329";
-       fi
-
-       if [[ -v NV_LEGACY_MASK ]]; then
-               ewarn
-               ewarn "***WARNING***"
-               ewarn
-               ewarn "You are installing a version of ${PN} known not to work"
-               ewarn "with a GPU of the current system. If unwanted, add the 
mask:"
-               if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-                       ewarn "  echo '${NV_LEGACY_MASK}' > 
${EROOT}/etc/portage/package.mask/${PN}"
-               else
-                       ewarn "  echo '${NV_LEGACY_MASK}' >> 
${EROOT}/etc/portage/package.mask"
-               fi
-               ewarn "...then downgrade to a legacy branch if possible. For 
details, see:"
-               ewarn "https://www.nvidia.com/object/IO_32667.html";
-       fi
-
-       if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then
-               elog
-               elog "USE=abi_x86_32 is disabled, 32bit applications will not 
be able to"
-               elog "use nvidia-drivers for acceleration without it (e.g. 
commonly used"
-               elog "with app-emulation/wine-* or steam). Re-enable if needed."
-       fi
-
-       if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
-               elog
-               elog "With USE=wayland, this version of ${PN} sets 
nvidia-drm.modeset=1"
-               elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is 
considered"
-               elog "experimental but is required for wayland."
-               elog
-               elog "If you experience issues, either disable wayland or edit 
nvidia.conf."
-               elog "Of note, may possibly cause issues with SLI and Reverse 
PRIME."
-       fi
-}

Reply via email to