Attachment #246973 for bug #275569

Lines 355-361 post-install: .SILENT Link Here

(-)b/x11/nvidia-driver/Makefile (-1 / +5 lines)
355	.elif ${NVVERSION} < 465.01901	355	.elif ${NVVERSION} < 465.01901
356	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}	356	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
357	.endif	357	.endif
358	.if ${NVVERSION} < 470.074	358	.if ${NVVERSION} < 470.074 \|\| ${NVVERSION} >= 545.000
359	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}	359	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
360	.endif	360	.endif
361	.if ${NVVERSION} < 495.02905	361	.if ${NVVERSION} < 495.02905
Lines 366-371 post-install: .SILENT Link Here
366	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \	366	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
367	/nvidia-drm_gbm\.so/d' ${TMPPLIST}	367	/nvidia-drm_gbm\.so/d' ${TMPPLIST}
368	.endif	368	.endif
		369	.if ${NVVERSION} < 545.000
		370	${REINPLACE_CMD} -e '/libnvidia-gpucomp\.so/d' ${TMPPLIST}
		371	.endif
		372
369	.if ${NVVERSION} < 410.057	373	.if ${NVVERSION} < 410.057
370	# Rename some libraries and install a libmap file to resolve conflict with	374	# Rename some libraries and install a libmap file to resolve conflict with
371	# Mesa libraries.	375	# Mesa libraries.

Lines 1-4 Link Here

(-)b/x11/nvidia-driver/Makefile.version (-1 / +1 lines)
1	# NVIDIA Distversion	1	# NVIDIA Distversion
2	#	2	#
3	# This will be included from x11/nvidia-driver and the nvidia-drm port	3	# This will be included from x11/nvidia-driver and the nvidia-drm port
4	NVIDIA_DISTVERSION = 535.104.05	4	NVIDIA_DISTVERSION = 535.146.02

Lines 1-6 Link Here

(-)b/x11/nvidia-driver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1693024601	1	TIMESTAMP = 1702277904
2	SHA256 (NVIDIA-FreeBSD-x86_64-535.104.05.tar.xz) = dca3fee09e57cd61d1bfb50e3b91ec5ca79fc1b3ff520c0e19ed19c8b9412afe	2	SHA256 (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 96c3243d0d4979c3235bd2aa7b418a42ed264732b4a3cc7e3004de77f825ccc1
3	SIZE (NVIDIA-FreeBSD-x86_64-535.104.05.tar.xz) = 142454808	3	SIZE (NVIDIA-FreeBSD-x86_64-535.146.02.tar.xz) = 142287240
4	SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607	4	SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607
5	SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576	5	SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576
6	SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84	6	SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84

Lines 47-52 lib/libnvidia-glvkspirv.so.1 Link Here

(-)b/x11/nvidia-driver/pkg-plist (+4 lines)
47	lib/libnvidia-glsi.so.1	47	lib/libnvidia-glsi.so.1
48	lib/libnvidia-glvkspirv.so	48	lib/libnvidia-glvkspirv.so
49	lib/libnvidia-glvkspirv.so.1	49	lib/libnvidia-glvkspirv.so.1
		50	lib/libnvidia-gpucomp.so
		51	lib/libnvidia-gpucomp.so.1
50	lib/libnvidia-ml.so	52	lib/libnvidia-ml.so
51	lib/libnvidia-ml.so.1	53	lib/libnvidia-ml.so.1
52	lib/libnvidia-tls.so	54	lib/libnvidia-tls.so
Lines 87-92 lib32/libnvidia-glvkspirv.so.1 Link Here
87	lib32/libnvidia-glsi.so.1	89	lib32/libnvidia-glsi.so.1
88	lib32/libnvidia-glvkspirv.so	90	lib32/libnvidia-glvkspirv.so
89	lib32/libnvidia-glvkspirv.so.1	91	lib32/libnvidia-glvkspirv.so.1
		92	lib32/libnvidia-gpucomp.so
		93	lib32/libnvidia-gpucomp.so.1
90	lib32/libnvidia-tls.so	94	lib32/libnvidia-tls.so
91	lib32/libnvidia-tls.so.1	95	lib32/libnvidia-tls.so.1
92	lib32/vdpau/libvdpau_nvidia.so.1	96	lib32/vdpau/libvdpau_nvidia.so.1

Lines 127-133 LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION} Link Here

(-)b/x11/linux-nvidia-libs/Makefile (-1 / +10 lines)
127	LINUX_LIBS+= libnvidia-compiler.so.${PORTVERSION}	127	LINUX_LIBS+= libnvidia-compiler.so.${PORTVERSION}
128	LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION}	128	LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION}
129	.endif	129	.endif
130	.if ${NVVERSION} >= 535.05403 # 535.54.03	130
		131	.if ${NVVERSION} >= 545.00000 # 545.00
		132	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.12
		133	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.12 libnvidia-egl-wayland.so.1
		134	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.12/'
		135	.elif ${NVVERSION} >= 535.05403 # 535.54.03
131	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.11	136	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.11
132	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1	137	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1
133	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/'	138	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/'
Lines 274-279 PLIST_RE+= '\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d' Link Here
274	.else	279	.else
275	PLIST_RE+= '\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'	280	PLIST_RE+= '\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
276	.endif	281	.endif
		282	.if ${NVVERSION} >= 545.00000 # 545.00
		283	LINUX_LIBS+= libnvidia-gpucomp.so.${PORTVERSION}
		284	LINUX32_LIBS+= libnvidia-gpucomp.so.${PORTVERSION}
		285	.endif # 545.00
277	.if ${NVVERSION} >= 525.08902 # 525.89.02	286	.if ${NVVERSION} >= 525.08902 # 525.89.02
278	LINUX_LIBS+= libnvoptix.so.${PORTVERSION} \	287	LINUX_LIBS+= libnvoptix.so.${PORTVERSION} \
279	libnvidia-nvvm.so.${PORTVERSION} \	288	libnvidia-nvvm.so.${PORTVERSION} \

Lines 1-6 Link Here

(-)b/x11/linux-nvidia-libs/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1693025243	1	TIMESTAMP = 1702278185
2	SHA256 (NVIDIA-Linux-x86_64-535.104.05.run) = 2f9d609d1da770beee757636635c46e7ed8253ade887b87c7a5482e33fcbedc9	2	SHA256 (NVIDIA-Linux-x86_64-535.146.02.run) = 49fd1cc9e445c98b293f7c66f36becfe12ccc1de960dfff3f1dc96ba3a9cbf70
3	SIZE (NVIDIA-Linux-x86_64-535.104.05.run) = 340936244	3	SIZE (NVIDIA-Linux-x86_64-535.146.02.run) = 341737575
4	SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640	4	SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
5	SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700	5	SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700
6	SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c	6	SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c

Return to bug 275569