[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     dd9f772696b5974e71426b03a986167c44f07ab6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 13:21:21 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 13:31:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9f7726

x11-drivers/nvidia-drivers: add 550.40.53:0/vulkan, drop 535.43.28

No real testing like usual for 0/vulkan (beside a basic build test)
despite major bump, please report if issues.

Seems to have received the pfn_valid fix from 550.54.14.

Reminder that this branch is only intended for vulkan developers
that also need the latest vulkan extensions, most users should
use 535.154.05 or 550.54.14.

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

 x11-drivers/nvidia-drivers/Manifest                |  4 +--
 ...3.28.ebuild => nvidia-drivers-550.40.53.ebuild} | 40 +++++-----------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index fb607828dd3b..720a219e76b6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -11,9 +11,9 @@ DIST NVIDIA-Linux-x86_64-470.239.06.run 272849102 BLAKE2B 556c8f7058b83d8c4c7ccb
 DIST NVIDIA-Linux-x86_64-525.147.05.run 414135234 BLAKE2B 77a12905771772804a5e5cf36df3e5032fe0160ac7c8a1b4ea002f65dac3732d9c900c1787a3e26d08b951a8de4893467cc7a80d424e017990d12669354d4191 SHA512 0c7b31715fce6a7bd77a2d9f9a3dca54a929a7790d748051576f62cdaeaeb6a9d0f3fbb13f0b20a51966bdb9470acdbc9ee529a9e84f38a9c834a1bd28d81773
 DIST NVIDIA-Linux-x86_64-535.154.05.run 341691657 BLAKE2B 63a56771eea30d467e5a8eb4ab4746e80bda7f055c02bb130cf188b6fc30bc91427c903ac43db0837cc3855cb29f44dc1832afd76d3e39ba111e83f6f60e9d2d SHA512 29c54814ed1d93abb7888c821feb14cc419ca76db70f0a57ee56777b7b48f252303562efb8ebe026b9ce6ae624064e9e185414fbe8e5818c241de9fb576ad480
 DIST NVIDIA-Linux-x86_64-535.161.07.run 341770032 BLAKE2B e6d741a59d6cc9273f889f4eddc5a69d23b2a9f5c8b167c7f95e6fcdd084b7fefb8c35689fe84e61a1e46cccf5ff990cb47608435d3867a2165673abdf7e2a81 SHA512 4e8dd709157c15519f01a8d419daa098da64666d20a80edf3894239707ff1e83b48553f3edc5d567109d36e52b31ac7c0c7218ea77862a04e89aa3cc1f16a5ba
-DIST NVIDIA-Linux-x86_64-535.43.28.run 341943540 BLAKE2B 845ead98e8609cdde80ceb25aab0a982e001e5fea3d05002a4d37faafd755895444f06d125620969e45ebd5e439d6834fd0f615a2755ed88de367ad9c2598664 SHA512 27e3a2e2ab117929f1bd18002d87067d2b386d131a7a10ec6099925f341c5a56ba8e8617f861cc60c02cae6065e518c0ec27f2d0845657250c258e0313e919f5
 DIST NVIDIA-Linux-x86_64-545.29.06.run 324708574 BLAKE2B 4b6ef76942f34422a366eb226a75f0e2fa17c8eda58b239fcff7a217bce0e237677a762603553120b49bbf458be763461266f5454bf1b37d99905701cc1d1aa5 SHA512 b80e1643471c48477479a48d2e8a9c4a241874d6207ddeaccdeedd3f9f1121d79be90be07d37df094fa6f7cc5806857bf2368337ba40cb5cfe6d04c117c5c45d
 DIST NVIDIA-Linux-x86_64-550.40.07.run 306517958 BLAKE2B 770d3d1b6778ce69a7ad28da963bc992fbec3eeee41bb29f507af569fda51b1e201fd5def9a8755827a749fe890ba4542f375bc43abb2a79c75fff482ed24813 SHA512 7e16f09b1924d3c375dc05710b5bb7c4d94c4b5c459e9b9c88a8f864d7719b84495ca89a27b2bb4ff08bbac1a10d810dc249050b07f2c804319792ac9bbbdad4
+DIST NVIDIA-Linux-x86_64-550.40.53.run 306875178 BLAKE2B 6d3a1534e6cc77a6f6b3fac1a07c313ea17b7a45d17ab96a74ffcb8e5830a9d1c3f2ecb31d4533ee2d3b898af4382e1daf21e67af776b9e27e9b9b05ce27809b SHA512 f7b232654b70f3296d302df84477ce56820c4893fc337cd25d18ccae68f1e9940acd4ec9ea487fec5fb00f06b000259dbf3c4c49335b0f648ef746d258ee0731
 DIST NVIDIA-Linux-x86_64-550.54.14.run 306861083 BLAKE2B 13ebc9f2900c4300687a2806dc12c2fc14b516097e279511b64c6f7a321223fabe408887378ba08ec2a28b9af37f8adb2d3b689b0f8a7ca44e47c731e50f497a SHA512 65fe0a3498e1b46368cfc7995fea720e4ba6373b0a74f4fc6280fbf75b2697948adf5b52b7d068b8df5ddbd347df7c0361db7e1a1fdc0d9fcfc6f478888936be
 DIST NVIDIA-kernel-module-source-525.147.05.tar.xz 10140684 BLAKE2B a8ce7c1d1047be9154fd67366c5bfa13a19f03c883f24ee35043d17d517e83303420449750f9e7adc7142f61564dd5d8e5a19884dbe540514979df6381ff7f1f SHA512 58920b26081a68e05178176edb0ce8ac4a5d365492adf51d6ffe57102385ff08abc5e14741e0500419e62a752441c97051d60939245eea64b039cc7efca15b7d
 DIST NVIDIA-kernel-module-source-535.154.05.tar.xz 12482832 BLAKE2B 07bf08068f7f0d597a3527970032ab3c204e1540d48494e992eb1c3fce030c68289e0512ea481e791bddd3a0e5cfc505adfe7e724c9f768d0d12cf657273103e SHA512 129829abbecd7cfa2b6fafedde606d38e12036695a8176b0d7c138a63c467917e2ca60552d813d584a18f2e68d0465a52d88fb32c405c2c841c690f9e2d265f8
@@ -66,4 +66,4 @@ DIST nvidia-xconfig-535.161.07.tar.bz2 111040 BLAKE2B 3ecfc95beb88671f463cb48285
 DIST nvidia-xconfig-545.29.06.tar.bz2 110995 BLAKE2B 6c32bc45215f3d0ae65f5430eea46d93ec85b8b10d1d85f3ea40dfd358587cbc2b5493341e4da190586d2da5278abbd9dfb9b907f159448143715a8835d736fb SHA512 cfb3b1e1c96062d2e32c6fcf22410f8f3977b56097ef97de1e01ce325a381ad77e77a0e33a5deeb2889cc7dc74aa13c1a0796800696d60e5e1dcee7a7779d52b
 DIST nvidia-xconfig-550.40.07.tar.bz2 111172 BLAKE2B bfa5deedbb521ac60424aed72f18d1e78680ba15e09b2567206fb32ac39e71ffc421c02a9d02835180ce39a05ee64fed5b3af47178caf6465cf56218a4c3133e SHA512 ac5c6ffd1216f9008253ac4bfcb7f78566f895de20bbfeac5b5bca8404c9194e8c78c48e745603f2c93360a1b005144d7d59e8a879e2de3202102082da81b35e
 DIST nvidia-xconfig-550.54.14.tar.bz2 111161 BLAKE2B 332647c44ab3debc046c1c57a3f896bb58e925e97ffef8b8c535acaae9c353b9ad9fc945b9973f5050d046e7460ce1fa3d505fd5c923943d938b2d4f0f1acc0d SHA512 0be3db50a32e76def20d01d3be76b12b3799f3a385a8006b2eceb7cfa37917abd077b18b8cd45a8087c708e2d80faf2653199f629a1894808ca91b22e28c1e37
-DIST open-gpu-kernel-modules-535.43.28.tar.gz 12787974 BLAKE2B acadf01f499f4b456877dea7cccefe6b858f513a30bd4e4a94dd948bd0686535d59208d7d8033aabc9e1e1351e68d763fe0777e908665b0ca9b59e369f3de0b7 SHA512 534213a82f2db7a40d1134b34b240e50fd3b1b69c0a392f99b6cfd7fe52900c78a9648c107b1fc4809cb985105f427e1dc27afc6c693fb302e39a6936866336a
+DIST open-gpu-kernel-modules-550.40.53.tar.gz 13720448 BLAKE2B d1af700bc2bb6831ec4d962fc352361f3a632f6c1e997f9c37e15f90152ede70862fbf2a644fdf746fc26a637125f2b4af09830fe2336088107bf2305cbb8faf SHA512 b470e9d9789b122535767f15b82d3948f7eb4c8b97259d61b2055ca332068b619c754c5a7cb7536804263d5cd9ef4da2ee0aeadf1f6d25b35a95effa91b56451

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.28.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.53.ebuild
similarity index 91%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-535.43.28.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-550.40.53.ebuild
index 0068037fc501..c178d0195aa7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.28.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.53.ebuild
@@ -4,11 +4,11 @@
 EAPI=8
 
 MODULES_OPTIONAL_IUSE=+modules
-inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1
+inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1
 inherit systemd toolchain-funcs unpacker user-info
 
 MODULES_KERNEL_MAX=6.7
-NV_PIN=535.154.05
+NV_PIN=550.54.14
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://developer.nvidia.com/vulkan-driver"
@@ -31,8 +31,6 @@ REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
 	acct-group/video
-	sys-libs/glibc
-	dev-libs/openssl:0/3
 	X? ( x11-libs/libpciaccess )
 	persistenced? (
 		acct-user/nvpd
@@ -65,7 +63,6 @@ RDEPEND="
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
-		media-libs/libglvnd
 	)
 "
 DEPEND="
@@ -92,11 +89,8 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-470.223.02-gpl-pfn_valid.patch
 	"${FILESDIR}"/nvidia-drivers-525.147.05-gcc14.patch
-	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
 )
 
@@ -119,12 +113,6 @@ pkg_setup() {
 	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."
 
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the CPU supports the feature,
-	this *could* lead to modules load failure with ENDBR errors, or to
-	broken CUDA/NVENC. Please ignore if not having issues, but otherwise
-	try to unset or pass ibt=off to the kernel's command line." #911142
-	use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
-
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
 	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
@@ -145,9 +133,6 @@ src_prepare() {
 
 	default
 
-	kernel_is -ge 6 7 &&
-		eapply "${FILESDIR}"/nvidia-drivers-535.43.22-kernel-6.7.patch
-
 	# prevent detection of incomplete kernel DRM support (bug #603818)
 	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel{,-module-source/kernel-open}/conftest.sh || die
@@ -156,31 +141,22 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !powerd || # file is missing on arm64 (masked)
-		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
 
 	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
 	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
 
 	# makefile attempts to install wayland library even if not built
 	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
 		nvidia-settings/src/Makefile || die
-
-	# temporary option, nvidia will remove in the future
-	use !kernel-open ||
-		sed -i '/blacklist/a\
-\
-# Enable using kernel-open with workstation GPUs (experimental)\
-options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
 }
 
 src_compile() {
 	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
-	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
 
 	local xnvflags=-fPIC #840389
 	# lto static libraries tend to cause problems without fat objects
@@ -263,7 +239,6 @@ src_install() {
 
 	local skip_files=(
 		$(usev !X "libGLX_nvidia libglxserver_nvidia")
-		$(usev !wayland libnvidia-vulkan-producer)
 		libGLX_indirect # non-glvnd unused fallback
 		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
 		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
@@ -434,15 +409,16 @@ documentation that is installed alongside this README."
 	# don't attempt to strip firmware files (silences errors)
 	dostrip -x ${paths[FIRMWARE]}
 
-	# sandbox issues with /dev/nvidiactl (and /dev/char wrt bug #904292)
+	# sandbox issues with /dev/nvidiactl others (bug #904292,#921578)
 	# are widespread and sometime affect revdeps of packages built with
 	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
 	# ebuilds should handle manually if need others or addwrite)
 	insinto /etc/sandbox.d
-	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
+	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
 }
 
 pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[kernel-open]" && NV_HAD_KERNEL_OPEN=
 	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
 
 	use modules || return
@@ -507,7 +483,7 @@ pkg_postinst() {
 		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
 
-	if use kernel-open; then
+	if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
 		ewarn
 		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
 		ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."