Re: [PR PATCH] [Updated] nvidia: update to 495.46.

[motorto <motorto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages nvidiaDrivers
https://github.com/void-linux/void-packages/pull/34664

nvidia: update to 495.46.
#### Testing the changes
- I tested the changes in this PR: **NO**

- I built this PR locally for my native architecture, x86_64

Still haven't got the time to test on hardware, but it builds and installs fine .

Testers are welcome, hope I didn't miss anything  ...

@abenson  how does it look for you ? 

A patch file from https://github.com/void-linux/void-packages/pull/34664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidiaDrivers-34664.patch --]
[-- Type: text/x-diff, Size: 3888 bytes --]

From f83057f90bd86715d94880bf2af6b3c3a8d73cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 22 Dec 2021 18:08:55 +0000
Subject: [PATCH 1/2] nvidia: update to 495.46.

---
 srcpkgs/nvidia/template | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index d64cc8019c86..25966c435e01 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.94
+version=495.46
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=9585aa29330ebad9bdf22ce3ca2bac2026c85a9a32f03d7c59f714a7798500eb
+checksum=d83b77d17da0c54667aa5b13d6ea95a5c51304257b1ecf2f8d4a3b5ae31c62f5
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
@@ -69,10 +69,6 @@ _install_libs() {
 	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/${libdir}/libnvidia-encode.so
 	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/${libdir}/libnvidia-encode.so.1
 
-	vinstall libnvidia-ifr.so.${version} 755 ${libdir}
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/${libdir}/libnvidia-ifr.so
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/${libdir}/libnvidia-ifr.so.1
-
 	vinstall libnvidia-fbc.so.${version} 755 ${libdir}
 	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/${libdir}/libnvidia-fbc.so
 	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/${libdir}/libnvidia-fbc.so.1
@@ -128,9 +124,13 @@ do_install() {
 	ln -sf libglxserver_nvidia.so.${version} \
 		${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1
 
-	vinstall libnvidia-egl-wayland.so.1.1.7 755 usr/lib
-	ln -sf libnvidia-egl-wayland.so.1.1.7 \
+	# Wayland/GBM
+	vinstall libnvidia-egl-wayland.so.1.1.9 755 usr/lib
+	ln -sf libnvidia-egl-wayland.so.1.1.9 \
 		${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1
+	vinstall libnvidia-egl-gbm.so.1.1.0 755 usr/lib
+	ln -sf libnvidia-egl-gbm.so.1.1.0 \
+		${DESTDIR}/usr/lib/libnvidia-egl-gbm.so.1
 
 	vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d
 	vinstall 10_nvidia_wayland.json \
@@ -204,7 +204,12 @@ do_install() {
 
 	# vulkan real-time ray tracing extensions
 	vinstall libnvidia-rtcore.so.${version} 755 usr/lib
-	vinstall libnvidia-cbl.so.${version} 755 usr/lib
+
+	vinstall libnvidia-vulkan-producer.so.${version} 755 usr/lib
+	ln -sf libnvidia-vulkan-producer.so.${version} \
+		${DESTDIR}/usr/lib/libnvidia-vulkan-producer.so
+	ln -sf libnvidia-vulkan-producer.so.${version} \
+		${DESTDIR}/usr/lib/libnvidia-vulkan-producer.so.1
 
 	# ngx
 	vbin nvidia-ngx-updater

From 747483cb3cacf5cf38de59e889c0100cf9a17fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 23 Dec 2021 08:46:32 +0000
Subject: [PATCH 2/2] add missing parts

---
 srcpkgs/nvidia/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 25966c435e01..04b884b6744b 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -132,6 +132,13 @@ do_install() {
 	ln -sf libnvidia-egl-gbm.so.1.1.0 \
 		${DESTDIR}/usr/lib/libnvidia-egl-gbm.so.1
 
+	vmkdir usr/share/glvnd/egl_vendor.d
+	vinstall 15_nvidia_gbm.json 755 usr/share/glvnd/egl_vendor.d
+
+	vmkdir usr/lib/gbm
+	ln -sf libnvidia-allocator.so.${version} \
+		${DESTDIR}/usr/lib/gbm/nvidia-drm_gbm.so
+
 	vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d
 	vinstall 10_nvidia_wayland.json \
 		755 usr/share/egl/egl_external_platform.d