git: fbde2bdc53a5 - main - x11/nvidia-driver, x11/linux-nvidia-libs: Update to 550.54.14

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Tue, 27 Feb 2024 18:29:58 UTC
The branch main has been updated by arrowd:

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

commit fbde2bdc53a59e3d9190ff4653e20e0678ba012f
Author:     Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
AuthorDate: 2024-02-27 18:26:11 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-02-27 18:29:01 +0000

    x11/nvidia-driver, x11/linux-nvidia-libs: Update to 550.54.14
    
    PR:             277028
    Approved by:    danfe (via Telegram)
---
 x11/linux-nvidia-libs/Makefile     | 27 +++++++++++++++++++++------
 x11/linux-nvidia-libs/distinfo     |  6 +++---
 x11/linux-nvidia-libs/pkg-plist    |  4 +++-
 x11/nvidia-driver/Makefile.version |  2 +-
 x11/nvidia-driver/distinfo         |  6 +++---
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index b2b7ea3fc7e9..3fe7d7798371 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -128,7 +128,12 @@ LINUX_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 .endif
 
-.if ${NVVERSION} >= 545.00000 # 545.00
+
+.if ${NVVERSION} >= 550.00000 # 550.00
+LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.13
+LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/'
+.elif ${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/'
@@ -282,17 +287,27 @@ PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
 .if ${NVVERSION} >= 545.00000 # 545.00
 LINUX_LIBS+=	libnvidia-gpucomp.so.${PORTVERSION}
 LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
+.else
+PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'
 .endif # 545.00
+.if ${NVVERSION} >= 550.00000 # 550.00
+LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.1
+LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \
+		libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.1/'
+.elif ${NVVERSION} >= 525.08902 # 525.89.02
+LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.0
+LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \
+		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/'
+.endif # 550.00
 .if ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \
 		libnvidia-nvvm.so.${PORTVERSION} \
 		libnvidia-ngx.so.${PORTVERSION} \
 		libnvidia-allocator.so.${PORTVERSION} \
-		libnvidia-opticalflow.so.${PORTVERSION} \
-		libnvidia-egl-gbm.so.1.1.0
-LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \
-		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so \
-		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so.4 \
+		libnvidia-opticalflow.so.${PORTVERSION}
+LINUX_LINKS+=	libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so.4 \
 		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so \
 		libnvidia-opticalflow.so.${PORTVERSION} libnvidia-opticalflow.so.1 \
 		libnvidia-opticalflow.so.${PORTVERSION} libnvidia-opticalflow.so \
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index a5abe3935139..ae1fd6d872f3 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1702278185
-SHA256 (NVIDIA-Linux-x86_64-535.146.02.run) = 49fd1cc9e445c98b293f7c66f36becfe12ccc1de960dfff3f1dc96ba3a9cbf70
-SIZE (NVIDIA-Linux-x86_64-535.146.02.run) = 341737575
+TIMESTAMP = 1708711235
+SHA256 (NVIDIA-Linux-x86_64-550.54.14.run) = 8c497ff1cfc7c310fb875149bc30faa4fd26d2237b2cba6cd2e8b0780157cfe3
+SIZE (NVIDIA-Linux-x86_64-550.54.14.run) = 306861083
 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/linux-nvidia-libs/pkg-plist b/x11/linux-nvidia-libs/pkg-plist
index 63bbb1054769..0461c08ef9eb 100644
--- a/x11/linux-nvidia-libs/pkg-plist
+++ b/x11/linux-nvidia-libs/pkg-plist
@@ -56,6 +56,7 @@
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-gpucomp.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%
@@ -121,7 +122,7 @@
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-compiler.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so.1
-%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so.1.1.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so.X
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.X
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%%
@@ -135,6 +136,7 @@
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gpucomp.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index f7f34aa6a79d..b64f9edd03a9 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.146.02
+NVIDIA_DISTVERSION = 550.54.14
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 4260ee06a0d7..6051552a5d96 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1702277904
-SHA256 (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 96c3243d0d4979c3235bd2aa7b418a42ed264732b4a3cc7e3004de77f825ccc1
-SIZE (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 142287240
+TIMESTAMP = 1708710800
+SHA256 (NVIDIA-FreeBSD-x86_64-550.54.14.tar.xz) = 934549ee2e6cf6bc098a0794ad5c84cfa8d55c79396d1d387c37eb91c49de340
+SIZE (NVIDIA-FreeBSD-x86_64-550.54.14.tar.xz) = 143184876
 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