diff -u -p -N x11/nvidia-driver/Makefile.version.orig x11/nvidia-driver/Makefile.version --- a/x11/nvidia-driver/Makefile.version 2023-12-05 00:46:50.253711000 +0900 +++ b/x11/nvidia-driver/Makefile.version 2024-02-12 21:31:50.898249000 +0900 @@ -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 -u -p -N x11/nvidia-driver/distinfo.orig x11/nvidia-driver/distinfo --- a/x11/nvidia-driver/distinfo 2023-12-05 00:46:50.253711000 +0900 +++ b/x11/nvidia-driver/distinfo 2024-02-12 21:31:50.898249000 +0900 @@ -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 diff -u -p -N x11/linux-nvidia-libs/Makefile.orig x11/linux-nvidia-libs/Makefile --- a/x11/linux-nvidia-libs/Makefile 2023-08-17 06:13:40.253711000 +0900 +++ b/x11/linux-nvidia-libs/Makefile 2023-12-05 00:46:50.898249000 +0900 @@ -127,8 +127,13 @@ LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION} 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/' @@ -283,16 +288,24 @@ LINUX_LIBS+= libnvidia-gpucomp.so.${PORTVERSION} LINUX32_LIBS+= libnvidia-gpucomp.so.${PORTVERSION} .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-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 \ +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 -u -p -N x11/nvidia-driver/distinfo.orig x11/nvidia-driver/distinfo --- a/x11/linux-nvidia-libs/distinfo 2023-12-05 00:46:50.253711000 +0900 +++ b/x11/linux-nvidia-libs/distinfo 2024-02-12 21:31:50.898249000 +0900 @@ -1,6 +1,6 @@ LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION} -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 -u -p -N x11/linux-nvidia-libs/pkg-plist.orig x11/linux-nvidia-libs/pkg-plist --- a/x11/linux-nvidia-libs/pkg-plist 2023-08-17 06:13:40.253711000 +0900 +++ b/x11/linux-nvidia-libs/pkg-plist 2023-12-05 00:46:50.898249000 +0900 @@ -121,7 +121,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%% --- a/x11/nvidia-driver/Makefile 2023-12-05 00:46:50.253711000 +0900 +++ b/x11/nvidia-driver/Makefile 2024-02-23 21:10:50.898249000 +0900 @@ -74,6 +74,9 @@ .if ${NVVERSION} < 530.03002 SUB_PATCHES+= extra-patch-src-nvidia_subr.c .endif +.if ${NVVERSION} > 352.008 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvml-man-Makefile +.endif DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules diff -u -p -N x11/nvidia-driver/pkg-plist.orig x11/nvidia-driver/pkg-plist --- a/x11/nvidia-driver/pkg-plist 2023-12-05 00:46:50.253711000 +0900 +++ b/x11/nvidia-driver/pkg-plist 2024-02-23 21:10:50.898249000 +0900 @@ -94,7 +94,7 @@ lib32/libnvidia-tls.so lib32/libnvidia-tls.so.1 lib32/vdpau/libvdpau_nvidia.so.1 -man/man1/nvidia-smi.1.gz +share/man/man1/nvidia-smi.1.gz @comment share/egl/egl_external_platform.d/10_nvidia_wayland.json share/egl/egl_external_platform.d/15_nvidia_gbm.json share/glvnd/egl_vendor.d/10_nvidia.json diff -u -p -N /dev/null x11/nvidia-driver/files/extra-patch-nvml-man-Makefile --- /dev/null +++ b/x11/nvidia-driver/files/extra-patch-nvml-man-Makefile 2024-02-23 21:10:50.898249000 +0900 @@ -0,0 +1,11 @@ +--- nvml/man/Makefile.orig ++++ nvml/man/Makefile +@@ -4,7 +4,7 @@ + LOCALBASE= /usr/local + .endif + +-MANDIR= ${LOCALBASE}/man/man1 ++MANDIR= ${LOCALBASE}/share/man/man1 + + all: # dummy rule + clean: # dummy rule