x11-drivers/nvidia-drivers : version bump

4 files changed, 16 insertions, 18 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d65184cd..964f7d93 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-460.84.run 177840337 BLAKE2B fbaa295c59f1af79c59c28845b79924812ac1386cf2e42aa762120a618253686f1249d777cc6c8df88b52afa34b96131663962bf0b6621dea6dcbc1bad7f9e22 SHA512 2483a4d251da63334363f4ba9f7b5d2cbf310afdf16fbcfecf1269f65beaed0325f825472feea26ddca2455ed44f284f57a73662600a3b4a270167baeb33e4fb
+DIST NVIDIA-Linux-x86_64-470.57.02.run 273219658 BLAKE2B 4e9b6d0f08226f38e76157a64923a4b4bb07b46e1b37879da353a4ff39bcf6a3aa0689a04e16ebcb2ff19f453d9b265c53546f101f34cca998a5da4dba5c2826 SHA512 7123ee05aa0cc94c4cf1f0717daf85b116f0200b8f78f9322ea847db70e56386a065e0085959f27cbf0a8f9befe6fc7a0145d1bf2a28616df9bc8b5effd812f8
diff --git a/x11-drivers/nvidia-drivers/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms.patch
index c7b747fa..c16bc992 100644
--- a/x11-drivers/nvidia-drivers/files/dkms.patch
+++ b/x11-drivers/nvidia-drivers/files/dkms.patch
@@ -4,7 +4,7 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="460.84"
++PACKAGE_VERSION="470.57.02"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
@@ -24,4 +24,6 @@
 +DEST_MODULE_LOCATION[2]="/extra/dkms"
 +BUILT_MODULE_NAME[3]="nvidia-drm"
 +DEST_MODULE_LOCATION[3]="/extra/dkms"
++BUILT_MODULE_NAME[4]="nvidia-peermem"
++DEST_MODULE_LOCATION[4]="/extra/dkms"
 +
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
index 637ac1af..b8be3b7c 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
@@ -1,7 +1,7 @@
 # run-time configuration file for /etc/init.d/nvidia-persistenced
 
 # NVPD_USER: The user nvidia-persistenced is intended to run for
-NVPD_USER=""
+NVPD_USER="nvpd"
 
 # ARGS: Additional arguments to set the default persistence mode
 # (see nvidia-persistenced(1))
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
index c3e5f7c6..851732dd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
@@ -20,6 +20,8 @@ REQUIRED_USE="tools? ( X )"
 
 COMMON="
 	acct-group/video
+	acct-user/nvpd
+	net-libs/libtirpc
 	>=sys-libs/glibc-2.6.1
 	X? (
 		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
@@ -37,14 +39,16 @@ RDEPEND="
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
 	tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		>=gui-libs/egl-wayland-1.1.7-r1
+	)
 	X? (
 		<x11-base/xorg-server-1.20.99:=
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
-	net-libs/libtirpc
 "
 
 QA_PREBUILT="opt/* usr/lib*"
@@ -152,11 +156,6 @@ src_install() {
 		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
-
 	insinto /etc/vulkan/icd.d
 	doins nvidia_icd.json
 
@@ -182,8 +181,8 @@ src_install() {
 
 	# 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
+#	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
@@ -241,6 +240,7 @@ src_install-libs() {
 			"libcuda.so.${NV_SOVER}"
 			"libnvcuvid.so.${NV_SOVER}"
 			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-allocator.so.${NV_SOVER}"
 			"libnvidia-eglcore.so.${NV_SOVER}"
 			"libnvidia-encode.so.${NV_SOVER}"
 			"libnvidia-fbc.so.${NV_SOVER}"
@@ -250,6 +250,7 @@ src_install-libs() {
 			"libnvidia-ifr.so.${NV_SOVER}"
 			"libnvidia-opencl.so.${NV_SOVER}"
 			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libnvidia-opticalflow.so.${NV_SOVER}"
 			"libvdpau_nvidia.so.${NV_SOVER}"
 			"libnvidia-ml.so.${NV_SOVER}"
 			"libnvidia-tls.so.${NV_SOVER}"
@@ -266,15 +267,10 @@ src_install-libs() {
 			)
 		fi
 
-		if use wayland && [[ ${ABI} == "amd64" ]]; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.5"
-			)
-		fi
-
 		if has_multilib_profile && [[ ${ABI} == "amd64" ]]; then
 			NV_GLX_LIBRARIES+=(
 				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-cfg.so.${NV_SOVER}"
 				"libnvidia-ngx.so.${NV_SOVER}"
 				"libnvidia-rtcore.so.${NV_SOVER}"
 				"libnvoptix.so.${NV_SOVER}"