git: a236f4529fc3 - main - x11/{linux-nvidia-libs, nvidia-driver}: update the ports to version 470.74.

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a236f4529fc39171194f3146cdd3ffecb5986f60

commit a236f4529fc39171194f3146cdd3ffecb5986f60
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-24 08:04:10 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-24 08:04:10 +0000

    x11/{linux-nvidia-libs,nvidia-driver}: update the ports to version 470.74.
    
    PR:     258682
---
 x11/linux-nvidia-libs/Makefile | 2 +-
 x11/linux-nvidia-libs/distinfo | 4 ++--
 x11/nvidia-driver/Makefile     | 7 +++++--
 x11/nvidia-driver/distinfo     | 4 ++--
 x11/nvidia-driver/pkg-plist    | 2 ++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index 321ef0a5c964..4f994b3efc93 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-libs
-DISTVERSION?=	470.63.01
+DISTVERSION?=	470.74
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 linux
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index b6feffae26c9..7f3b5d88832b 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1628632967
-SHA256 (NVIDIA-Linux-x86_64-470.63.01.run) = 6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
-SIZE (NVIDIA-Linux-x86_64-470.63.01.run) = 271484294
+SHA256 (NVIDIA-Linux-x86_64-470.74.run) = 33e513dee329f2a9b106882979f1747eccb64eb698952c12cd030987cecadf6a
+SIZE (NVIDIA-Linux-x86_64-470.74.run) = 270479241
 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 4fcc7f8922cb..c47ebdf7279f 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,9 +14,9 @@
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
-DISTVERSION?=	470.63.01
+DISTVERSION?=	470.74
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -291,6 +291,9 @@ post-install: .SILENT
 .elif ${NVVERSION} < 465.01901
 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 470.074
+	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
+.endif
 .if ${NVVERSION} < 410.057
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 8b70905d80fb..cd2c83326729 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1628632441
-SHA256 (NVIDIA-FreeBSD-x86_64-470.63.01.tar.xz) = cb0c223577738eb9e09108af9cd728d7453be8e544b0bf96754e3259ee7c4438
-SIZE (NVIDIA-FreeBSD-x86_64-470.63.01.tar.xz) = 98994888
+SHA256 (NVIDIA-FreeBSD-x86_64-470.74.tar.xz) = 76683f1b7d6bb9fd181d4b729c6f15c71cc3cc591218836a074e273eae64c402
+SIZE (NVIDIA-FreeBSD-x86_64-470.74.tar.xz) = 98669440
 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
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index caa1dc84ae52..e3c2ccfda9bb 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -46,6 +46,8 @@ lib/libnvidia-ml.so
 lib/libnvidia-ml.so.1
 lib/libnvidia-tls.so
 lib/libnvidia-tls.so.1
+lib/libnvidia-vulkan-producer.so
+lib/libnvidia-vulkan-producer.so.1
 lib/libvdpau_nvidia.so
 lib/vdpau/libvdpau_nvidia.so.1
 lib32/libEGL.so