Attachment 246973 Details for Bug 275569 – Patch to update to 535.146.02 and allow testing for 545 series of driver

[patch] Patch to update to 535.146.02 and allow testing for 545 series of driver

patch-nvidia-535.146.02-545.diff (text/plain), 5.14 KB, created by Tomoaki AOKI on 2023-12-11 11:17:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomoaki AOKI

Created: 2023-12-11 11:17:08 UTC

Size: 5.14 KB

patch

obsolete

>diff -u -p -N x11/nvidia-driver/Makefile.orig x11/nvidia-driver/Makefile
>--- a/x11/nvidia-driver/Makefile	2023-08-17 06:13:40.253914000 +0900
>+++ b/x11/nvidia-driver/Makefile	2023-12-05 00:06:28.747291000 +0900
>@@ -355,7 +355,7 @@ post-install: .SILENT
> .elif ${NVVERSION} < 465.01901
> 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
> .endif
>-.if ${NVVERSION} < 470.074
>+.if ${NVVERSION} < 470.074 || ${NVVERSION} >= 545.000
> 	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
> .endif
> .if ${NVVERSION} < 495.02905
>@@ -366,6 +366,10 @@ post-install: .SILENT
> 	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
> 		/nvidia-drm_gbm\.so/d' ${TMPPLIST}
> .endif
>+.if ${NVVERSION} < 545.000
>+	${REINPLACE_CMD} -e '/libnvidia-gpucomp\.so/d' ${TMPPLIST}
>+.endif
>+
> .if ${NVVERSION} < 410.057
> # Rename some libraries and install a libmap file to resolve conflict with
> # Mesa libraries.
>diff -u -p -N x11/nvidia-driver/Makefile.version.orig x11/nvidia-driver/Makefile.version
>--- a/x11/nvidia-driver/Makefile.version	2023-09-10 08:35:17.995895000 +0900
>+++ b/x11/nvidia-driver/Makefile.version	2023-12-06 21:54:15.571530000 +0900
>@@ -1,4 +1,4 @@
> # NVIDIA Distversion
> #
> # This will be included from x11/nvidia-driver and the nvidia-drm port
>-NVIDIA_DISTVERSION = 535.104.05
>+NVIDIA_DISTVERSION = 535.146.02
>diff -u -p -N x11/nvidia-driver/distinfo.orig x11/nvidia-driver/distinfo
>--- a/x11/nvidia-driver/distinfo	2023-09-10 08:35:17.995951000 +0900
>+++ b/x11/nvidia-driver/distinfo	2023-12-06 21:34:32.000000000 +0900
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1693024601
>-SHA256 (NVIDIA-FreeBSD-x86_64-535.104.05.tar.xz) = dca3fee09e57cd61d1bfb50e3b91ec5ca79fc1b3ff520c0e19ed19c8b9412afe
>-SIZE (NVIDIA-FreeBSD-x86_64-535.104.05.tar.xz) = 142454808
>+TIMESTAMP = 1702277904
>+SHA256 (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 96c3243d0d4979c3235bd2aa7b418a42ed264732b4a3cc7e3004de77f825ccc1
>+SIZE (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 142287240
> 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/nvidia-driver/pkg-plist x11/nvidia-driver/pkg-plist
>--- a/x11/nvidia-driver/pkg-plist	2023-04-22 15:46:43.513981000 +0900
>+++ b/x11/nvidia-driver/pkg-plist	2023-12-05 00:12:54.392907000 +0900
>@@ -47,6 +47,8 @@ lib/libnvidia-glvkspirv.so.1
> lib/libnvidia-glsi.so.1
> lib/libnvidia-glvkspirv.so
> lib/libnvidia-glvkspirv.so.1
>+lib/libnvidia-gpucomp.so
>+lib/libnvidia-gpucomp.so.1
> lib/libnvidia-ml.so
> lib/libnvidia-ml.so.1
> lib/libnvidia-tls.so
>@@ -87,6 +89,8 @@ lib32/libnvidia-glvkspirv.so.1
> lib32/libnvidia-glsi.so.1
> lib32/libnvidia-glvkspirv.so
> lib32/libnvidia-glvkspirv.so.1
>+lib32/libnvidia-gpucomp.so
>+lib32/libnvidia-gpucomp.so.1
> lib32/libnvidia-tls.so
> lib32/libnvidia-tls.so.1
> lib32/vdpau/libvdpau_nvidia.so.1
>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,7 +127,12 @@ LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
> LINUX_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
> LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
> .endif
>-.if ${NVVERSION} >= 535.05403 # 535.54.03
>+
>+.if ${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/'
>@@ -274,6 +279,10 @@ PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
> .else
> PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
> .endif
>+.if ${NVVERSION} >= 545.00000 # 545.00
>+LINUX_LIBS+=	libnvidia-gpucomp.so.${PORTVERSION}
>+LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
>+.endif # 545.00
> .if ${NVVERSION} >= 525.08902 # 525.89.02
> LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \
> 		libnvidia-nvvm.so.${PORTVERSION} \
>diff -u -p -N x11/linux-nvidia-libs/distinfo.orig x11/linux-nvidia-libs/distinfo
>--- a/x11/linux-nvidia-libs/distinfo	2023-09-10 08:35:17.995832000 +0900
>+++ b/x11/linux-nvidia-libs/distinfo	2023-12-06 21:46:17.000000000 +0900
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1693025243
>-SHA256 (NVIDIA-Linux-x86_64-535.104.05.run) = 2f9d609d1da770beee757636635c46e7ed8253ade887b87c7a5482e33fcbedc9
>-SIZE (NVIDIA-Linux-x86_64-535.104.05.run) = 340936244
>+TIMESTAMP = 1702278185
>+SHA256 (NVIDIA-Linux-x86_64-535.146.02.run) = 49fd1cc9e445c98b293f7c66f36becfe12ccc1de960dfff3f1dc96ba3a9cbf70
>+SIZE (NVIDIA-Linux-x86_64-535.146.02.run) = 341737575
> 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

Flags:

junchoon: maintainer-approval?

Actions: View | Diff

Attachments on bug 275569: 246820 | 246876 | 246973 | 246990