git: d978418fa211 - main - x11/nvidia-driver, x11/linux-nvidia-libs: update to 535.146.02

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kevin Bowling <kbowling_at_FreeBSD.org>
Date: Mon, 01 Jan 2024 23:11:04 UTC
The branch main has been updated by kbowling:

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

commit d978418fa21111ad3fd8ea6e4ea911587f40aaf8
Author:     Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
AuthorDate: 2024-01-01 20:57:25 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2024-01-01 22:51:51 +0000

    x11/nvidia-driver, x11/linux-nvidia-libs: update to 535.146.02
    
    PR:             275569
    Approved by:    danfe (maintainer timeout)
---
 x11/linux-nvidia-libs/Makefile     | 11 ++++++++++-
 x11/linux-nvidia-libs/distinfo     |  6 +++---
 x11/nvidia-driver/Makefile         |  8 ++++++--
 x11/nvidia-driver/Makefile.version |  2 +-
 x11/nvidia-driver/distinfo         |  6 +++---
 x11/nvidia-driver/pkg-plist        |  4 ++++
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index 811be656adf5..b2b7ea3fc7e9 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -127,7 +127,12 @@ PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-compiler\.so,d'
 LINUX_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 .endif
-.if ${NVVERSION} >= 535.05403 # 535.54.03
+
+.if ${NVVERSION} >= 545.00000 # 545.00
+LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.12
+LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.12 libnvidia-egl-wayland.so.1
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.12/'
+.elif ${NVVERSION} >= 535.05403 # 535.54.03
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.11
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/'
@@ -274,6 +279,10 @@ LINUX32_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
 .endif
+.if ${NVVERSION} >= 545.00000 # 545.00
+LINUX_LIBS+=	libnvidia-gpucomp.so.${PORTVERSION}
+LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
+.endif # 545.00
 .if ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \
 		libnvidia-nvvm.so.${PORTVERSION} \
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index ddfefc765496..a5abe3935139 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1693025243
-SHA256 (NVIDIA-Linux-x86_64-535.104.05.run) = 2f9d609d1da770beee757636635c46e7ed8253ade887b87c7a5482e33fcbedc9
-SIZE (NVIDIA-Linux-x86_64-535.104.05.run) = 340936244
+TIMESTAMP = 1702278185
+SHA256 (NVIDIA-Linux-x86_64-535.146.02.run) = 49fd1cc9e445c98b293f7c66f36becfe12ccc1de960dfff3f1dc96ba3a9cbf70
+SIZE (NVIDIA-Linux-x86_64-535.146.02.run) = 341737575
 SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
 SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700
 SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index cb28a6a24b46..1529bf3af8e4 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
 PORTNAME?=	nvidia-driver
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # 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}
@@ -355,7 +355,7 @@ post-install: .SILENT
 .elif ${NVVERSION} < 465.01901
 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
 .endif
-.if ${NVVERSION} < 470.074
+.if ${NVVERSION} < 470.074 || ${NVVERSION} >= 545.000
 	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 495.02905
@@ -366,6 +366,10 @@ post-install: .SILENT
 	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
 		/nvidia-drm_gbm\.so/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 545.000
+	${REINPLACE_CMD} -e '/libnvidia-gpucomp\.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/Makefile.version b/x11/nvidia-driver/Makefile.version
index 6f7994a7a727..f7f34aa6a79d 100644
--- a/x11/nvidia-driver/Makefile.version
+++ b/x11/nvidia-driver/Makefile.version
@@ -1,4 +1,4 @@
 # NVIDIA Distversion
 #
 # This will be included from x11/nvidia-driver and the nvidia-drm port
-NVIDIA_DISTVERSION = 535.104.05
+NVIDIA_DISTVERSION = 535.146.02
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 86cf2492185a..4260ee06a0d7 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1693024601
-SHA256 (NVIDIA-FreeBSD-x86_64-535.104.05.tar.xz) = dca3fee09e57cd61d1bfb50e3b91ec5ca79fc1b3ff520c0e19ed19c8b9412afe
-SIZE (NVIDIA-FreeBSD-x86_64-535.104.05.tar.xz) = 142454808
+TIMESTAMP = 1702277904
+SHA256 (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 96c3243d0d4979c3235bd2aa7b418a42ed264732b4a3cc7e3004de77f825ccc1
+SIZE (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 142287240
 SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607
 SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576
 SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 181879ff34bf..ade919f5371f 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -47,6 +47,8 @@ lib/libnvidia-glsi.so
 lib/libnvidia-glsi.so.1
 lib/libnvidia-glvkspirv.so
 lib/libnvidia-glvkspirv.so.1
+lib/libnvidia-gpucomp.so
+lib/libnvidia-gpucomp.so.1
 lib/libnvidia-ml.so
 lib/libnvidia-ml.so.1
 lib/libnvidia-tls.so
@@ -87,6 +89,8 @@ lib32/libnvidia-glsi.so
 lib32/libnvidia-glsi.so.1
 lib32/libnvidia-glvkspirv.so
 lib32/libnvidia-glvkspirv.so.1
+lib32/libnvidia-gpucomp.so
+lib32/libnvidia-gpucomp.so.1
 lib32/libnvidia-tls.so
 lib32/libnvidia-tls.so.1
 lib32/vdpau/libvdpau_nvidia.so.1