x11/nvidia-driver, x11/linux-nvidia-libs: update to 510.47.03

PR:		261666
Approved by:	maintainer timeout
Sponsored by:	BBOX.io

4 files changed, 41 insertions, 27 deletions

diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index 014d21f1d0ad..850207f4af09 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-libs
-DISTVERSION?=	470.86
+DISTVERSION?=	510.47.03
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 linux
@@ -121,7 +121,11 @@ PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \
 		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
 .endif
-.if ${NVVERSION} >= 470.04201 # 470.42.01
+.if ${NVVERSION} >= 495.02905 # 495.29.05
+LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.9
+LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'
+.elif ${NVVERSION} >= 470.04201 # 470.42.01
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.7
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/'
@@ -168,25 +172,29 @@ PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
 .endif
+.if ${NVVERSION} >= 331.013 && ${NVVERSION} < 495.02905
+LINUX_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
+LINUX_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
+		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
+LINUX32_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
+LINUX32_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
+		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
+.else
+PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-ifr,d'
+.endif
 .if ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 		libnvidia-fbc.so.${PORTVERSION} \
-		libnvidia-glsi.so.${PORTVERSION} \
-		libnvidia-ifr.so.${PORTVERSION}
+		libnvidia-glsi.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
-		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
+		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
 LINUX32_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 		libnvidia-fbc.so.${PORTVERSION} \
-		libnvidia-glsi.so.${PORTVERSION} \
-		libnvidia-ifr.so.${PORTVERSION}
+		libnvidia-glsi.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
-		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
+		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
 .else
-PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi|ifr),d'
+PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi),d'
 .endif
 .if ${NVVERSION} >= 310.014
 LINUX_LIBS+=	libnvidia-encode.so.${PORTVERSION}
@@ -240,12 +248,15 @@ LINUX_DATA+=	nvidia_icd.json /etc/vulkan/icd.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
 .endif
+.if ${NVVERSION} >= 410.057 && ${NVVERSION} < 495.02905
+LINUX_LIBS+=	libnvidia-cbl.so.${PORTVERSION}
+.else
+PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-cbl\.so,d'
+.endif
 .if ${NVVERSION} >= 410.057
-LINUX_LIBS+=	libnvidia-cbl.so.${PORTVERSION} \
-		libnvidia-rtcore.so.${PORTVERSION}
+LINUX_LIBS+=	libnvidia-rtcore.so.${PORTVERSION}
 .else
-PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-cbl\.so,d' \
-		'\,${LINUXBASE}.*libnvidia-rtcore\.so,d'
+PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-rtcore\.so,d'
 .endif
 .if ${NVVERSION} >= 396.018
 LINUX_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 32e385798c66..2ea449ae90e7 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1636390330
-SHA256 (NVIDIA-Linux-x86_64-470.86.run) = 4fb7a039dbd210648c785030e81844350b1b69e8d56c8da6953b050958673c4f
-SIZE (NVIDIA-Linux-x86_64-470.86.run) = 273149806
+TIMESTAMP = 1643748640
+SHA256 (NVIDIA-Linux-x86_64-510.47.03.run) = f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690
+SIZE (NVIDIA-Linux-x86_64-510.47.03.run) = 328823536
 SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
 SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417
 SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 116d555cc1e1..bd5278c5f99b 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
-DISTVERSION?=	470.86
+DISTVERSION?=	510.47.03
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -64,9 +64,12 @@ SUB_FILES+=	nvidia.conf
 SUB_FILES+=	pkg-deinstall pkg-install
 .endif
 SUB_PATCHES=	extra-patch-src-Makefile \
-		extra-patch-src-nv-freebsd.h \
-		extra-patch-src-nvidia_dev.c \
+		extra-patch-src-nv-freebsd.h
+.if ${NVVERSION} < 510.03901
+SUB_PATCHES+=	extra-patch-src-nvidia_dev.c \
 		extra-patch-src-nvidia_pci.c
+.endif
+
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia
@@ -90,7 +93,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebs
 .  endif
 SUB_PATCHES+=	extra-patch-src-nvidia_ctl.c \
 		extra-patch-src-nvidia_linux.c
-.else
+.elif ${NVVERSION} < 510.03901
 EXTRA_PATCHES+=	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
 		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
 		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index f4b95b8072eb..63d2db77c47f 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1636390338
-SHA256 (NVIDIA-FreeBSD-x86_64-470.86.tar.xz) = 6174da504982270a971a3e0af02eba7ad383214c18b97be70afc70c8907cb726
-SIZE (NVIDIA-FreeBSD-x86_64-470.86.tar.xz) = 99463184
+TIMESTAMP = 1643747691
+SHA256 (NVIDIA-FreeBSD-x86_64-510.47.03.tar.xz) = 232e3cd9c4d2ae6648f3301241c1f46ad2624eca206a85b72b209400be8f2ddf
+SIZE (NVIDIA-FreeBSD-x86_64-510.47.03.tar.xz) = 108088660
 SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd
 SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942
 SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b