git: 0de17c4dce28 - main - x11/nvidia-driver, x11/linux-nvidia-libs, graphics/nvidia-drm-kmod: update to 570.124.04
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 17 Mar 2025 21:51:44 UTC
The branch main has been updated by ashafer: URL: https://cgit.FreeBSD.org/ports/commit/?id=0de17c4dce28156a28cb89db200db0b804ebff65 commit 0de17c4dce28156a28cb89db200db0b804ebff65 Author: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> AuthorDate: 2025-03-17 21:32:22 +0000 Commit: Austin Shafer <ashafer@FreeBSD.org> CommitDate: 2025-03-17 21:49:50 +0000 x11/nvidia-driver, x11/linux-nvidia-libs, graphics/nvidia-drm-kmod: update to 570.124.04 This updates the NVIDIA ports to the latest stable production branch. Also bump egl-wayland to the latest 1.1.18. Submitted by: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> Reviewed by: ashafer Approved by: kbowling(mentor), maintainer timeout (danfe, x11) Differential Revision: https://reviews.freebsd.org/D49245 --- 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/distinfo | 4 +-- graphics/nvidia-drm-61-kmod/distinfo | 4 +-- graphics/nvidia-drm-66-kmod/distinfo | 4 +-- graphics/nvidia-drm-kmod/Makefile.common | 13 +++++++++ x11/linux-nvidia-libs/Makefile | 47 ++++++++++++++++++++++++++++++-- x11/linux-nvidia-libs/distinfo | 6 ++-- x11/linux-nvidia-libs/pkg-plist | 17 ++++++++++++ x11/nvidia-driver/Makefile.version | 2 +- x11/nvidia-driver/distinfo | 6 ++-- 13 files changed, 95 insertions(+), 24 deletions(-) diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile index 7162b9c88cb5..e0c2cd158f82 100644 --- a/graphics/egl-wayland/Makefile +++ b/graphics/egl-wayland/Makefile @@ -1,5 +1,5 @@ PORTNAME= egl-wayland -DISTVERSION= 1.1.13 +DISTVERSION= 1.1.18 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/graphics/egl-wayland/distinfo b/graphics/egl-wayland/distinfo index 4261366ee1e9..de0ee40aa336 100644 --- a/graphics/egl-wayland/distinfo +++ b/graphics/egl-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697652018 -SHA256 (NVIDIA-egl-wayland-1.1.13_GH0.tar.gz) = 667561d794561d55d85b1273b2fe4def3f360e0ad27833d099e4f100f2244e48 -SIZE (NVIDIA-egl-wayland-1.1.13_GH0.tar.gz) = 68153 +TIMESTAMP = 1741109035 +SHA256 (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = c561485ee65efb7ffb0dbedd6c7031f0be69c861efa63f831c8b6c3178a0f871 +SIZE (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = 75759 diff --git a/graphics/egl-wayland/pkg-plist b/graphics/egl-wayland/pkg-plist index e22aa7f11108..3f84595de30a 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.13 +lib/libnvidia-egl-wayland.so.1.1.18 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 acb84ed393aa..c8ed5dc3797c 100644 --- a/graphics/nvidia-drm-510-kmod/distinfo +++ b/graphics/nvidia-drm-510-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1729779540 -SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 -SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 +TIMESTAMP = 1740840763 +SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 +SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 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/distinfo b/graphics/nvidia-drm-515-kmod/distinfo index 3c26b66875b2..1a7ac208c82f 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-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 -SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 +SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 +SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 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/distinfo b/graphics/nvidia-drm-61-kmod/distinfo index e6e029f31a0d..3a7b3344ba50 100644 --- a/graphics/nvidia-drm-61-kmod/distinfo +++ b/graphics/nvidia-drm-61-kmod/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1741856116 -SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 -SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 +SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 +SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 SHA256 (freebsd-drm-kmod-drm_v6.1.128_1_GH0.tar.gz) = 01febb64aa2c173baef262dc9f2bed6b6fcc6272e4cb6a42fc4914521009c6aa SIZE (freebsd-drm-kmod-drm_v6.1.128_1_GH0.tar.gz) = 37107699 diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo index 1639ab5889c8..fa7c8b3812ef 100644 --- a/graphics/nvidia-drm-66-kmod/distinfo +++ b/graphics/nvidia-drm-66-kmod/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1741869175 -SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 -SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 +SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 +SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 SHA256 (freebsd-drm-kmod-drm_v6.6.25_2_GH0.tar.gz) = b0b019849f2191a75512e1a5a266281b3e2835071faa366322f464c80cfa2cb0 SIZE (freebsd-drm-kmod-drm_v6.6.25_2_GH0.tar.gz) = 38488394 diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common index 1194e9b396dc..99fe9d8d2e67 100644 --- a/graphics/nvidia-drm-kmod/Makefile.common +++ b/graphics/nvidia-drm-kmod/Makefile.common @@ -46,6 +46,19 @@ post-patch: # Workaround for LLVM/Clang19 ${REINPLACE_CMD} -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' \ ${WRKSRC}/Makefile + + # Workaround for the issue that X11 cannot acquire modesetting + # permission by disabling hw.nvidiadrm.fbdev tunable which is + # enabled on 570 series and later of the driver. + # This is due to the issue lacking proper support for fbdev + # (would be simpledrm) in graphics/drm-*-kmod and/or LinuxKPI. + # Would be reverted once the issues are sorted and fixed. +.if ${NVVERSION} >= 570.00000 + ${REINPLACE_CMD} -e 's:\&nv_drm_fbdev_module_param\, 1\,:\&nv_drm_fbdev_module_param\, 0\,:' \ + ${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 # We should support -CURRENT: kill the check (first #if __FreeBSD_version) linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ ${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \ diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile index a20dcac257e7..c98573c2222a 100644 --- a/x11/linux-nvidia-libs/Makefile +++ b/x11/linux-nvidia-libs/Makefile @@ -78,6 +78,14 @@ LINUX_DATA+= 10_nvidia_wayland.json /usr/share/egl/egl_external_platform.d .else PLIST_RE+= '\,${LINUXBASE}/usr/share/egl,d' .endif +.if ${NVVERSION} >= 570.00000 +LINUX_DATA+= 20_nvidia_xcb.json /usr/share/egl/egl_external_platform.d \ + 20_nvidia_xlib.json /usr/share/egl/egl_external_platform.d +.else +PLIST_RE+= '\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json,d'\ + '\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/20_nvidia_xlib.json,d' +.endif + .if ${NVVERSION} >= 361.016 LINUX_LIBS+= libEGL_nvidia.so.${PORTVERSION} LINUX_LINKS+= libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0 @@ -128,8 +136,13 @@ LINUX_LIBS+= libnvidia-compiler.so.${PORTVERSION} LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION} .endif - -.if ${NVVERSION} >= 565.00000 # 565.00 +.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/' @@ -294,7 +307,34 @@ LINUX32_LIBS+= libnvidia-gpucomp.so.${PORTVERSION} .else PLIST_RE+= '\,${LINUXBASE}.*libnvidia-gpucomp\.so,d' .endif # 545.00 -.if ${NVVERSION} >= 565.00000 # 565.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/' +.else +PLIST_RE+= '\,${LINUXBASE}.*libnvidia-(egl-xcb|egl-xlib),d' +.endif + +.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 @@ -310,6 +350,7 @@ 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 # 565.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 6141edfc2152..57b7fbdf509b 100644 --- a/x11/linux-nvidia-libs/distinfo +++ b/x11/linux-nvidia-libs/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1729779155 -SHA256 (NVIDIA-Linux-x86_64-550.127.05.run) = d384f34f5d2a896bd7536d3deb6a6d973d8094a3ad485a1c2ee3bf5192086ae9 -SIZE (NVIDIA-Linux-x86_64-550.127.05.run) = 307139930 +TIMESTAMP = 1740842371 +SHA256 (NVIDIA-Linux-x86_64-570.124.04.run) = 1b786a4b7122d7c4216c58ae4007688a4f778c196c148d919163815ee10d53c4 +SIZE (NVIDIA-Linux-x86_64-570.124.04.run) = 375582187 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 0461c08ef9eb..f1c15947850f 100644 --- a/x11/linux-nvidia-libs/pkg-plist +++ b/x11/linux-nvidia-libs/pkg-plist @@ -45,6 +45,15 @@ %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-allocator.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-compiler.so.%%SHLIB_VERSION%% +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so.1 +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so.X +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so.1 +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so.X +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xlib.so +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xlib.so.1 +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xlib.so.X %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1 @@ -125,6 +134,12 @@ %%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-egl-xcb.so +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xcb.so.1 +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xcb.so.X +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xlib.so +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xlib.so.1 +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xlib.so.X %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1 @@ -166,6 +181,8 @@ %%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau/libvdpau_nvidia.so.1 %%LINUXBASE%%/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json +%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json +%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/20_nvidia_xlib.json %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d/10_nvidia.json %%LINUXBASE%%/usr/share/man/man1/nvidia-cuda-mps-control.1.gz %%LINUXBASE%%/usr/share/man/man1/nvidia-persistenced.1.gz diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version index 03d4d5525224..19c00c4c29b6 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 = 550.127.05 +NVIDIA_DISTVERSION = 570.124.04 diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index 8243d14c80f8..c83dc8161d75 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1729779540 -SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 -SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 +TIMESTAMP = 1740840763 +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-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