git: 9b6b1bf17269 - main - x11/nvidia-driver, x11/linux-nvidia-libs, graphics/nvidia-drm-kmod: Update to 570.144
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 May 2025 14:02:36 UTC
The branch main has been updated by ashafer:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9b6b1bf17269ed32eb0ec415bedad5fba7ebab2e
commit 9b6b1bf17269ed32eb0ec415bedad5fba7ebab2e
Author: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
AuthorDate: 2025-05-07 13:59:06 +0000
Commit: Austin Shafer <ashafer@FreeBSD.org>
CommitDate: 2025-05-07 14:01:21 +0000
x11/nvidia-driver, x11/linux-nvidia-libs, graphics/nvidia-drm-kmod: Update to 570.144
This updates the NVIDIA ports to the latest stable production branch.
Also bump graphics/egl-wayland to the latest 1.1.19 to match with
the one in x11/linux-nvidia-libs.
PR: 286307
Approved by: ashafer, kbowling (mentor)
Differential Revision: https://reviews.freebsd.org/D49982
---
graphics/egl-wayland/Makefile | 2 +-
graphics/egl-wayland/distinfo | 6 +-
graphics/egl-wayland/pkg-plist | 2 +-
graphics/nvidia-drm-510-kmod/distinfo | 6 +-
graphics/nvidia-drm-515-kmod/Makefile | 2 +-
graphics/nvidia-drm-515-kmod/distinfo | 6 +-
graphics/nvidia-drm-61-kmod/Makefile | 2 +-
graphics/nvidia-drm-61-kmod/distinfo | 4 +-
graphics/nvidia-drm-66-kmod/Makefile | 2 +-
graphics/nvidia-drm-66-kmod/distinfo | 4 +-
graphics/nvidia-drm-kmod/Makefile.common | 16 ++-
x11/linux-nvidia-libs/Makefile | 182 +++++++++++++------------------
x11/linux-nvidia-libs/distinfo | 6 +-
x11/nvidia-driver/Makefile | 2 +-
x11/nvidia-driver/Makefile.version | 2 +-
x11/nvidia-driver/distinfo | 6 +-
16 files changed, 118 insertions(+), 132 deletions(-)
diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile
index e0c2cd158f82..65275804f343 100644
--- a/graphics/egl-wayland/Makefile
+++ b/graphics/egl-wayland/Makefile
@@ -1,5 +1,5 @@
PORTNAME= egl-wayland
-DISTVERSION= 1.1.18
+DISTVERSION= 1.1.19
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/egl-wayland/distinfo b/graphics/egl-wayland/distinfo
index de0ee40aa336..2fd8302a4285 100644
--- a/graphics/egl-wayland/distinfo
+++ b/graphics/egl-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741109035
-SHA256 (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = c561485ee65efb7ffb0dbedd6c7031f0be69c861efa63f831c8b6c3178a0f871
-SIZE (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = 75759
+TIMESTAMP = 1745359337
+SHA256 (NVIDIA-egl-wayland-1.1.19_GH0.tar.gz) = b9a63e59eb552ef925b9fda96e466457edfe4b7728dd861ee06152b064edccdf
+SIZE (NVIDIA-egl-wayland-1.1.19_GH0.tar.gz) = 76156
diff --git a/graphics/egl-wayland/pkg-plist b/graphics/egl-wayland/pkg-plist
index 3f84595de30a..dfd8b85772f4 100644
--- a/graphics/egl-wayland/pkg-plist
+++ b/graphics/egl-wayland/pkg-plist
@@ -1,6 +1,6 @@
lib/libnvidia-egl-wayland.so
lib/libnvidia-egl-wayland.so.1
-lib/libnvidia-egl-wayland.so.1.1.18
+lib/libnvidia-egl-wayland.so.1.1.19
libdata/pkgconfig/wayland-eglstream-protocols.pc
libdata/pkgconfig/wayland-eglstream.pc
share/egl/egl_external_platform.d/10_nvidia_wayland.json
diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo
index c8ed5dc3797c..636dc4e10eef 100644
--- a/graphics/nvidia-drm-510-kmod/distinfo
+++ b/graphics/nvidia-drm-510-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740840763
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+TIMESTAMP = 1745331131
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338
diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile
index 14b6e873c4e1..d5a90446b443 100644
--- a/graphics/nvidia-drm-515-kmod/Makefile
+++ b/graphics/nvidia-drm-515-kmod/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nvidia-drm-515-kmod
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= graphics
BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod
diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo
index 1a7ac208c82f..852fb8a00713 100644
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ b/graphics/nvidia-drm-515-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1741856037
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+TIMESTAMP = 1745331417
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
SHA256 (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 85914f9a39c6919d9a725a3252ea541d11394c3051a3600707fa6d865a082728
SIZE (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 26098303
diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile
index dff6b8de6435..5911897de8d5 100644
--- a/graphics/nvidia-drm-61-kmod/Makefile
+++ b/graphics/nvidia-drm-61-kmod/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nvidia-drm-61-kmod
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= graphics
BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod
diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo
index 02e09552a6e8..74832cec734b 100644
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ b/graphics/nvidia-drm-61-kmod/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1745474929
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
SHA256 (freebsd-drm-kmod-drm_v6.1.128_2_GH0.tar.gz) = fe9d37f3b7c010c781b054a55b23b19b38eb3c5673234b186e0d392be2838c4d
SIZE (freebsd-drm-kmod-drm_v6.1.128_2_GH0.tar.gz) = 37107528
diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile
index 07d0984a2fc5..8e54fc452836 100644
--- a/graphics/nvidia-drm-66-kmod/Makefile
+++ b/graphics/nvidia-drm-66-kmod/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nvidia-drm-66-kmod
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= graphics
BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-66-kmod
diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo
index 884a4673f367..5ea3aa0045ff 100644
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ b/graphics/nvidia-drm-66-kmod/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1745475021
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
SHA256 (freebsd-drm-kmod-drm_v6.6.25_3_GH0.tar.gz) = b12d5375df0aae8804e869d9d30efbcffebe5848981700144719a9c86fa48409
SIZE (freebsd-drm-kmod-drm_v6.6.25_3_GH0.tar.gz) = 38487651
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
index fa81b93fbaa2..7f87a3661b0b 100644
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -6,7 +6,7 @@ WWW= https://www.nvidia.com/object/unix.html
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${NVIDIA_DISTVERSION}:nvidia \
https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_GH_TAGNAME}?dummy=/:drm
DISTVERSION?= ${NVIDIA_DISTVERSION}
-PORTREVISION= 1
+PORTREVISION?= 0
DISTFILES= NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \
freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm
@@ -58,6 +58,20 @@ post-patch:
${WRKSRC}/nvidia-drm-freebsd-lkpi.c
${REINPLACE_CMD} -e 's:bool nv_drm_fbdev_module_param = true;:bool nv_drm_fbdev_module_param = false;:' \
${WRKSRC}/nvidia-drm-os-interface.c
+.endif
+ # Workaround for build failure on 575.51.02.
+ # --- nvidia-drm-drv.o ---
+ # nvidia-drm-drv.c:386:80: error: cast from 'const void *' to 'struct nv_drm_mst_display_info *' drops const qualifier [-Werror,-Wcast-qual]
+ # 386 | struct nv_drm_mst_display_info *l_info = (struct nv_drm_mst_display_info *)l;
+ # | ^
+ # nvidia-drm-drv.c:387:80: error: cast from 'const void *' to 'struct nv_drm_mst_display_info *' drops const qualifier [-Werror,-Wcast-qual]
+ # 387 | struct nv_drm_mst_display_info *r_info = (struct nv_drm_mst_display_info *)r;
+ # | ^
+.if ${NVVERSION} >= 575.00000
+ ${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*l_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*l_info = (const struct nv_drm_mst_display_info:' \
+ ${WRKSRC}/nvidia-drm-drv.c
+ ${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*r_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*r_info = (const struct nv_drm_mst_display_info:' \
+ ${WRKSRC}/nvidia-drm-drv.c
.endif
# We should support -CURRENT: kill the check (first #if __FreeBSD_version)
linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index c98573c2222a..3d0cba6ba83d 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -136,79 +136,36 @@ LINUX_LIBS+= libnvidia-compiler.so.${PORTVERSION}
LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION}
.endif
-.if ${NVVERSION} >= 570.12400 # 570.124
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.18
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.18 libnvidia-egl-wayland.so.1
-LINUX32_LIBS+= libnvidia-egl-wayland.so.1.1.18
-LINUX32_LINKS+= libnvidia-egl-wayland.so.1.1.18 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.18/'
-.elif ${NVVERSION} >= 565.00000 # 565.00
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.17
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.17 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.17/'
-.elif ${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/'
-.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/'
-.elif ${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/'
+
+## graphics/egl-wayland supports
+## Estimated to be upgraded often.
+.if ${NVVERSION} >= 570.14400 # 570.144
+NV_EGL_W_VERSION= 1.1.19
.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/'
-.elif ${NVVERSION} >= 460.02704 # 460.27.04
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.5
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.5 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.5/'
-.elif ${NVVERSION} >= 440.026
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.4
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.4 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.4/'
-.elif ${NVVERSION} >= 435.017
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.3
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.3 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.3/'
-.elif ${NVVERSION} >= 418.030
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.2
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
-.elif ${NVVERSION} >= 410.057
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.0
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.0 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.0/'
-.elif ${NVVERSION} >= 396.018
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.3
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.3 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.3/'
+NV_EGL_W_VERSION= 1.1.7
.elif ${NVVERSION} >= 387.012
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.2
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
-.elif ${NVVERSION} >= 378.013
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.1
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.1 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.1/'
-.elif ${NVVERSION} >= 378.009
-LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.0
-LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.0 libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.0/'
-.elif ${NVVERSION} >= 364.012
-LINUX_LIBS+= libnvidia-egl-wayland.so.${PORTVERSION}
-LINUX_LINKS+= libnvidia-egl-wayland.so.${PORTVERSION} libnvidia-egl-wayland.so.1
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
+NV_EGL_W_VERSION= 1.0.2
+.elif ${NVVERSION} >= 364.012 # Intentionally kept to indicate from which version
+ # this library is introduced.
+NV_EGL_W_VERSION= ${PORTVERSION}
+.else # Fool proof (Poka-yoke)
+NV_EGL_W_VERSION= ""
+.endif
+
+.if ${NVVERSION} >= 364.012 # Start graphics/egl-wayland support
+LINUX_LIBS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION}
+LINUX_LINKS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1
+. if ${NVVERSION} >= 570.12400 # 570.124 added 32bit version supports
+LINUX32_LIBS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION}
+LINUX32_LINKS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1
+. endif # 570.124
+PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${NV_EGL_W_VERSION}/'
.else
PLIST_RE+= '\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
-.endif
+.endif # 364.012
+# End of graphics/egl-wayland supports
+
+
.if ${NVVERSION} >= 331.013 && ${NVVERSION} < 495.02905
LINUX_LIBS+= libnvidia-ifr.so.${PORTVERSION}
LINUX_LINKS+= libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
@@ -308,49 +265,64 @@ LINUX32_LIBS+= libnvidia-gpucomp.so.${PORTVERSION}
PLIST_RE+= '\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'
.endif # 545.00
-.if ${NVVERSION} >= 570.00000 #570.00
-LINUX_LIBS+= libnvidia-egl-xcb.so.1.0.0 \
- libnvidia-egl-xlib.so.1.0.0
-LINUX_LINKS+= libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so.1 \
- libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so \
- libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so.1 \
- libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so
-LINUX32_LIBS+= libnvidia-egl-xcb.so.1.0.0 \
- libnvidia-egl-xlib.so.1.0.0
-LINUX32_LINKS+= libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so.1 \
- libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so \
- libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so.1 \
- libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-(egl-xcb|egl-xlib)\.so)\.X/\1.1.0.0/'
+
+# nvidia-egl-X11 supports (not in x11/nvidia-driver nor separate ports)
+# Estimated to be upgrated often.
+.if ${NVVERSION} >= 570.14400 # 570.144
+NV_EGL_X_VERSION= 1.0.1
+.elif ${NVVERSION} >= 570.00000 # 570.00, Intentionally kept to clarify
+ # the start of egl-x11 support.
+NV_EGL_X_VERSION= 1.0.0
+.else # Fool proof (Poka-yoke)
+NV_EGL_X_VERSION= ""
+.endif
+
+.if ${NVVERSION} >= 570.00000 # 570.00, start of egl-x11 support
+LINUX_LIBS+= libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} \
+ libnvidia-egl-xlib.so.${NV_EGL_X_VERSION}
+LINUX_LINKS+= libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so.1 \
+ libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so \
+ libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so.1 \
+ libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so
+LINUX32_LIBS+= libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} \
+ libnvidia-egl-xlib.so.${NV_EGL_X_VERSION}
+LINUX32_LINKS+= libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so.1 \
+ libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so \
+ libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so.1 \
+ libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so
+PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-(egl-xcb|egl-xlib)\.so)\.X/\1.${NV_EGL_X_VERSION}/'
.else
PLIST_RE+= '\,${LINUXBASE}.*libnvidia-(egl-xcb|egl-xlib),d'
.endif
+# End nvidia-egl-X11 supports
+
-.if ${NVVERSION} >= 570.00000 # 570.00
-LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.2
-LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
- libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
-LINUX32_LIBS+= libnvidia-egl-gbm.so.1.1.2
-LINUX32_LINKS+= libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
- libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
-.elif ${NVVERSION} >= 565.00000 # 565.00
-LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.2
-LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
- libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
-PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
+# nvidia-egl-gbm supports.
+.if ${NVVERSION} >= 565.00000 # 565.00
+NV_EGL_G_VERSION= 1.1.2
.elif ${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/'
+NV_EGL_G_VERSION= 1.1.1
+.elif ${NVVERSION} >= 525.08902 # 525.89.02, Intentionally kept to clarify
+ # the start of nvidia-egl-gbm support
+NV_EGL_G_VERSION= 1.1.0
+.else # Fool proof (Poka-yoke)
+NV_EGL_G_VERSION= ""
.endif # 565.00
+.if ${NVVERSION} >= 525.08902 # 525.89.02
+LINUX_LIBS+= libnvidia-egl-gbm.so.${NV_EGL_G_VERSION}
+LINUX_LINKS+= libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so.1 \
+ libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so
+. if ${NVVERSION} >= 570.00000 # 570.00, first LINUX32 support
+LINUX32_LIBS+= libnvidia-egl-gbm.so.${NV_EGL_G_VERSION}
+LINUX32_LINKS+= libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so.1 \
+ libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so
+. endif # 570.00
+PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.${NV_EGL_G_VERSION}/'
+.endif # 525.89.02
+# End of nvidia-egl-gbm supports
+
+
.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 17ce5e3fe053..64d1e1b7c892 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743665760
-SHA256 (NVIDIA-Linux-x86_64-570.124.04.run) = 1b786a4b7122d7c4216c58ae4007688a4f778c196c148d919163815ee10d53c4
-SIZE (NVIDIA-Linux-x86_64-570.124.04.run) = 375582187
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-570.144.run) = c0b8d7ecf2e20b83767674bab8fee4d1323dc55580274d8e934635e8955f3be6
+SIZE (NVIDIA-Linux-x86_64-570.144.run) = 375742470
SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 787e9ec80534..629e1a69a5ac 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?= 4
+PORTREVISION?= 0
CATEGORIES= x11
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index 19c00c4c29b6..7582499314be 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 = 570.124.04
+NVIDIA_DISTVERSION?= 570.144
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index c0b9220779d2..1e22644b8440 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743664922
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0