Page MenuHomeFreeBSD
Files F164821559

D49245.id151935.diff
No OneTemporary
Actions

D49245.id151935.diff
View Options

diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile
--- 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
--- 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
--- 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
--- 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
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ b/graphics/nvidia-drm-515-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1729926280
-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.15.160_1_GH0.tar.gz) = b48e104c3437ac6e8a58e734fe943281f43b31d9327d50457bb26d8a2106bf64
SIZE (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = 26098489
diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ b/graphics/nvidia-drm-61-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1739280782
-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_v6.1.128_0_GH0.tar.gz) = 9ced51fdf3d615c405ba4d95add778ad1f4778e9ac39caf92f80caf6008b3a69
SIZE (freebsd-drm-kmod-drm_v6.1.128_0_GH0.tar.gz) = 37105974
diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ b/graphics/nvidia-drm-66-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1739992459
-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_v6.6.25_1_GH0.tar.gz) = 9de65da6907e2b61b09e9836e923b48dc029e68e2cb4521c17df75f3529fa640
SIZE (freebsd-drm-kmod-drm_v6.6.25_1_GH0.tar.gz) = 38488410
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -46,6 +46,19 @@
# 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
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -78,6 +78,14 @@
.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 @@
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 @@
.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 @@
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
--- 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
--- 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
--- 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
--- 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

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 5, 5:16 AM (15 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35998508
Default Alt Text
D49245.id151935.diff (12 KB)

Event Timeline