Attachment #240811 for bug #270060

Lines 1-5 Link Here

(-)b/x11/linux-nvidia-libs/Makefile (-2 / +6 lines)
1	PORTNAME= nvidia-libs	1	PORTNAME= nvidia-libs
2	DISTVERSION?= 515.86.01	2	DISTVERSION?= 525.89.02
3	# Always try to set PORTREVISION as it can be overridden by the slave ports	3	# Always try to set PORTREVISION as it can be overridden by the slave ports
4	PORTREVISION?= 0	4	PORTREVISION?= 0
5	CATEGORIES= x11 linux	5	CATEGORIES= x11 linux
Lines 122-128 PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM\|2)_nvidia\.so,d' \ Link Here
122	'\,${LINUXBASE}.*libGLX_(nvidia\|indirect)\.so,d' \	122	'\,${LINUXBASE}.*libGLX_(nvidia\|indirect)\.so,d' \
123	'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'	123	'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
124	.endif	124	.endif
125	.if ${NVVERSION} >= 495.02905 # 495.29.05	125	.if ${NVVERSION} >= 525.08902 # 525.89.02
		126	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.10
		127	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.10 libnvidia-egl-wayland.so.1
		128	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.10/'
		129	.elif ${NVVERSION} >= 495.02905 # 495.29.05
126	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.9	130	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.9
127	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1	131	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
128	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'	132	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'

Lines 1-6 Link Here

(-)b/x11/linux-nvidia-libs/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1677612334	1	TIMESTAMP = 1678276890
2	SHA256 (NVIDIA-Linux-x86_64-515.86.01.run) = 141777e1ca2f11e97d8d33260213f1be327eb73922ae22f4ddab404bb2ef4664	2	SHA256 (NVIDIA-Linux-x86_64-525.89.02.run) = 0e412c88c5bd98f842a839a6f64614f20e4c0950ef7cffb12b158a71633593e9
3	SIZE (NVIDIA-Linux-x86_64-515.86.01.run) = 363743089	3	SIZE (NVIDIA-Linux-x86_64-525.89.02.run) = 414116295
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

Lines 12-20 Link Here

(-)b/x11/nvidia-driver/Makefile (-3 / +16 lines)
12	# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.	12	# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
13		13
14	PORTNAME?= nvidia-driver	14	PORTNAME?= nvidia-driver
15	DISTVERSION?= 515.86.01	15	DISTVERSION?= 525.89.02
16	# Always try to set PORTREVISION as it can be overridden by the slave ports	16	# Always try to set PORTREVISION as it can be overridden by the slave ports
17	PORTREVISION?= 1	17	PORTREVISION?= 0
18	CATEGORIES= x11	18	CATEGORIES= x11
19	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}	19	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
20	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	20	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
Lines 34-39 PATCH_DEPENDS= gsed:textproc/gsed Link Here
34	BUILD_DEPENDS= pkg-config:devel/pkgconf	34	BUILD_DEPENDS= pkg-config:devel/pkgconf
35	LIB_DEPENDS= libOpenGL.so:graphics/libglvnd	35	LIB_DEPENDS= libOpenGL.so:graphics/libglvnd
36	.endif	36	.endif
		37	.if ${NVVERSION} >= 415.013
		38	LIB_DEPENDS+= libnvidia-egl-wayland.so:graphics/egl-wayland
		39	.endif
37		40
38	USES= kmod uidfix xorg	41	USES= kmod uidfix xorg
39	.if ${NVVERSION} >= 470.04201	42	.if ${NVVERSION} >= 470.04201
Lines 136-142 PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment " Link Here
136	PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP=""	139	PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP=""
137	.endif	140	.endif
138		141
139	.if ${NVVERSION} >= 515.8601	142	.if ${NVVERSION} >= 515.08601
140	PLIST_FILES+= lib/libnvidia-wayland-client.so.${DISTVERSION}	143	PLIST_FILES+= lib/libnvidia-wayland-client.so.${DISTVERSION}
141	.endif	144	.endif
142		145
Lines 243-248 post-patch: .SILENT Link Here
243	${REINPLACE_CMD} -e '/void nvidia_dev_dtor/,+8s,.status.,,' \	246	${REINPLACE_CMD} -e '/void nvidia_dev_dtor/,+8s,.status.,,' \
244	${WRKSRC}/src/${NVSRC}/nvidia_dev.c	247	${WRKSRC}/src/${NVSRC}/nvidia_dev.c
245	.endif	248	.endif
		249	# Move symlinks under PREFIX
		250	.if ${NVVERSION} >= 525.08902
		251	${REINPLACE_CMD} -e '/ln/s/$${LOCALBASE}\/lib/../' \
		252	-e '/LIBDIR/!s/$${LOCALBASE}/$${DESTDIR}$${PREFIX}/' \
		253	${WRKSRC}/lib/libnvidia-allocator/Makefile
		254	.endif
246	# After src 2a99dd30dfaa, DRIVER_MODULE should not include nvidia_devclass	255	# After src 2a99dd30dfaa, DRIVER_MODULE should not include nvidia_devclass
247	.if ${OSVERSION} >= 1400058	256	.if ${OSVERSION} >= 1400058
248	${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \	257	${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \
Lines 342-347 post-install: .SILENT Link Here
342	${REINPLACE_CMD} -e '/libnvidia-egl-gbm\.so/d ; \	351	${REINPLACE_CMD} -e '/libnvidia-egl-gbm\.so/d ; \
343	/15_nvidia_gbm\.json/d' ${TMPPLIST}	352	/15_nvidia_gbm\.json/d' ${TMPPLIST}
344	.endif	353	.endif
		354	.if ${NVVERSION} < 525.08902
		355	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
		356	/nvidia-drm_gbm\.so/d' ${TMPPLIST}
		357	.endif
345	.if ${NVVERSION} < 410.057	358	.if ${NVVERSION} < 410.057
346	# Rename some libraries and install a libmap file to resolve conflict with	359	# Rename some libraries and install a libmap file to resolve conflict with
347	# Mesa libraries.	360	# Mesa libraries.

Lines 1-6 Link Here

(-)b/x11/nvidia-driver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1677612209	1	TIMESTAMP = 1678263830
2	SHA256 (NVIDIA-FreeBSD-x86_64-515.86.01.tar.xz) = 5807c76dd6680754d68d33876ffbd8ab076398f28428ae0c85d67c89e13c589f	2	SHA256 (NVIDIA-FreeBSD-x86_64-525.89.02.tar.xz) = 2d032b8c0b311af0adb90e2f16d6345939d38de7eae9fbb7836038844d58f2f7
3	SIZE (NVIDIA-FreeBSD-x86_64-515.86.01.tar.xz) = 112400260	3	SIZE (NVIDIA-FreeBSD-x86_64-525.89.02.tar.xz) = 136622256
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 32-41 lib/libXvMCNVIDIA.so.1 Link Here

(-)b/x11/nvidia-driver/pkg-plist (-3 / +6 lines)
32	lib/libXvMCNVIDIA_dynamic.so.1	32	lib/libXvMCNVIDIA_dynamic.so.1
33	lib/libnvidia-cfg.so	33	lib/libnvidia-cfg.so
34	lib/libnvidia-cfg.so.1	34	lib/libnvidia-cfg.so.1
35	@comment lib/libnvidia-egl-gbm.so	35	lib/libnvidia-egl-gbm.so
36	@comment lib/libnvidia-egl-gbm.so.1	36	lib/libnvidia-egl-gbm.so.1
37	@comment lib/libnvidia-egl-wayland.so	37	@comment lib/libnvidia-egl-wayland.so
38	@comment lib/libnvidia-egl-wayland.so.1	38	@comment lib/libnvidia-egl-wayland.so.1
		39	lib/libnvidia-allocator.so
		40	lib/libnvidia-allocator.so.1
		41	lib/gbm/nvidia-drm_gbm.so
39	lib/libnvidia-eglcore.so	42	lib/libnvidia-eglcore.so
40	lib/libnvidia-eglcore.so.1	43	lib/libnvidia-eglcore.so.1
41	lib/libnvidia-glcore.so	44	lib/libnvidia-glcore.so
Lines 89-95 lib32/libnvidia-tls.so.1 Link Here
89	lib32/vdpau/libvdpau_nvidia.so.1	92	lib32/vdpau/libvdpau_nvidia.so.1
90	man/man1/nvidia-smi.1.gz	93	man/man1/nvidia-smi.1.gz
91	@comment share/egl/egl_external_platform.d/10_nvidia_wayland.json	94	@comment share/egl/egl_external_platform.d/10_nvidia_wayland.json
92	@comment share/egl/egl_external_platform.d/15_nvidia_gbm.json	95	share/egl/egl_external_platform.d/15_nvidia_gbm.json
93	share/glvnd/egl_vendor.d/10_nvidia.json	96	share/glvnd/egl_vendor.d/10_nvidia.json
94	share/vulkan/icd.d/nvidia_icd.json	97	share/vulkan/icd.d/nvidia_icd.json
95	share/vulkan/implicit_layer.d/nvidia_layers.json	98	share/vulkan/implicit_layer.d/nvidia_layers.json

Return to bug 270060