Attachment #224125 for bug #254668

Lines 195-200 Link Here

(-)b/x11/Makefile (+2 lines)
195	SUBDIR += linux-nvidia-libs-304	195	SUBDIR += linux-nvidia-libs-304
196	SUBDIR += linux-nvidia-libs-340	196	SUBDIR += linux-nvidia-libs-340
197	SUBDIR += linux-nvidia-libs-390	197	SUBDIR += linux-nvidia-libs-390
		198	SUBDIR += linux-nvidia-libs-460
198	SUBDIR += listres	199	SUBDIR += listres
199	SUBDIR += lsw	200	SUBDIR += lsw
200	SUBDIR += luit	201	SUBDIR += luit
Lines 239-244 Link Here
239	SUBDIR += nvidia-driver-304	240	SUBDIR += nvidia-driver-304
240	SUBDIR += nvidia-driver-340	241	SUBDIR += nvidia-driver-340
241	SUBDIR += nvidia-driver-390	242	SUBDIR += nvidia-driver-390
		243	SUBDIR += nvidia-driver-460
242	SUBDIR += nvidia-settings	244	SUBDIR += nvidia-settings
243	SUBDIR += nvidia-xconfig	245	SUBDIR += nvidia-xconfig
244	SUBDIR += nwg-launchers	246	SUBDIR += nwg-launchers

Added Link Here

(-)b/x11/linux-nvidia-libs-460/Makefile (+8 lines)
1	DISTVERSION= 460.73.01
2	# Explicitly set PORTREVISION as it can be overridden by the master port
3	PORTREVISION= 0
4
5	MASTERDIR= ${.CURDIR}/../linux-nvidia-libs
6	PKGNAMESUFFIX= -460
7
8	.include "${MASTERDIR}/Makefile"

Lines 1-5 Link Here

(-)b/x11/linux-nvidia-libs/Makefile (-1 / +1 lines)
1	PORTNAME= nvidia-libs	1	PORTNAME= nvidia-libs
2	DISTVERSION?= 460.67	2	DISTVERSION?= 465.24.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 1-6 Link Here

(-)b/x11/linux-nvidia-libs/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1618461153
2	SHA256 (NVIDIA-Linux-x86_64-460.67.run) = 2f6711c92570ee681848ddb998957e6f8b8e7874dd8cb1af14f124c32160b5e7	2	SHA256 (NVIDIA-Linux-x86_64-465.24.02.run) = 8d5e7021a159ac194e691afbeead19fd3a300fc4ffdb2f7dc3694b36f384ac38
3	SIZE (NVIDIA-Linux-x86_64-460.67.run) = 177691692	3	SIZE (NVIDIA-Linux-x86_64-465.24.02.run) = 235706017
		4	SHA256 (NVIDIA-Linux-x86_64-460.73.01.run) = 11b1c918de26799e9ee3dc5db13d8630922b6aa602b9af3fbbd11a9a8aab1e88
		5	SIZE (NVIDIA-Linux-x86_64-460.73.01.run) = 177241975
4	SHA256 (NVIDIA-Linux-x86_64-390.141.run) = 4b389a374412c80b2eda356c0fb9e8bef5768831d2cb77c8c9f906f6172c3f7e	6	SHA256 (NVIDIA-Linux-x86_64-390.141.run) = 4b389a374412c80b2eda356c0fb9e8bef5768831d2cb77c8c9f906f6172c3f7e
5	SIZE (NVIDIA-Linux-x86_64-390.141.run) = 85330901	7	SIZE (NVIDIA-Linux-x86_64-390.141.run) = 85330901
6	SHA256 (NVIDIA-Linux-x86-390.141.run) = 8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43	8	SHA256 (NVIDIA-Linux-x86-390.141.run) = 8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43




%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%

%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so

Added Link Here

(-)b/x11/nvidia-driver-460/Makefile (+8 lines)
1	DISTVERSION= 460.73.01
2	# Explicitly set PORTREVISION as it can be overridden by the master port
3	PORTREVISION= 0
4
5	MASTERDIR= ${.CURDIR}/../nvidia-driver
6	PKGNAMESUFFIX= -460
7
8	.include "${MASTERDIR}/Makefile"

Lines 10-16 Link Here

(-)b/x11/nvidia-driver/Makefile (-1 / +3 lines)
10	# or `x11/nvidia-driver-304').	10	# or `x11/nvidia-driver-304').
11		11
12	PORTNAME= nvidia-driver	12	PORTNAME= nvidia-driver
13	DISTVERSION?= 460.67	13	DISTVERSION?= 465.24.02
14	# Always try to set PORTREVISION as it can be overridden by the slave ports	14	# Always try to set PORTREVISION as it can be overridden by the slave ports
15	PORTREVISION?= 0	15	PORTREVISION?= 0
16	CATEGORIES= x11	16	CATEGORIES= x11
Lines 256-261 post-install: .SILENT Link Here
256	.endif	256	.endif
257	.if ${NVVERSION} < 440.036	257	.if ${NVVERSION} < 440.036
258	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}	258	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
		259	.elif ${NVVERSION} < 465.01901
		260	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
259	.endif	261	.endif
260	# Rename some libraries and install a libmap file to resolve conflict with	262	# Rename some libraries and install a libmap file to resolve conflict with
261	# Mesa libraries.	263	# Mesa libraries.

Lines 1-6 Link Here

(-)b/x11/nvidia-driver/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1618461216
2	SHA256 (NVIDIA-FreeBSD-x86_64-460.67.tar.gz) = 48e059d0e94b657930b466d124fee8c1eb06556723ce0d82e6e69a8861c4fcaf	2	SHA256 (NVIDIA-FreeBSD-x86_64-465.24.02.tar.gz) = 9330d0ed058b3751a67ae5e7ca3f42cfdd0a41d8e5d9718b5151eca82ac4cf78
3	SIZE (NVIDIA-FreeBSD-x86_64-460.67.tar.gz) = 108272738	3	SIZE (NVIDIA-FreeBSD-x86_64-465.24.02.tar.gz) = 123401253
		4	SHA256 (NVIDIA-FreeBSD-x86_64-460.73.01.tar.gz) = a425273fcccc3a9f17afe0bb228c433d2342152e384bb163ffabb78de1502289
		5	SIZE (NVIDIA-FreeBSD-x86_64-460.73.01.tar.gz) = 108263492
4	SHA256 (NVIDIA-FreeBSD-x86_64-390.141.tar.gz) = d51fb464a52773c285ba075628f4a513a3ece5bba8e500be8b65fd0c122f78a4	6	SHA256 (NVIDIA-FreeBSD-x86_64-390.141.tar.gz) = d51fb464a52773c285ba075628f4a513a3ece5bba8e500be8b65fd0c122f78a4
5	SIZE (NVIDIA-FreeBSD-x86_64-390.141.tar.gz) = 65303462	7	SIZE (NVIDIA-FreeBSD-x86_64-390.141.tar.gz) = 65303462
6	SHA256 (NVIDIA-FreeBSD-x86-390.141.tar.gz) = c0e2abc13ec350ba7d34bf68225261cf1bfa0f5b07e30c71dd090c83c0542f7d	8	SHA256 (NVIDIA-FreeBSD-x86-390.141.tar.gz) = c0e2abc13ec350ba7d34bf68225261cf1bfa0f5b07e30c71dd090c83c0542f7d

Lines 75-80 lib32/libnvidia-glcore.so Link Here

(-)b/x11/nvidia-driver/pkg-plist (+2 lines)
75	lib32/libnvidia-glcore.so.1	75	lib32/libnvidia-glcore.so.1
76	lib32/libnvidia-glsi.so	76	lib32/libnvidia-glsi.so
77	lib32/libnvidia-glsi.so.1	77	lib32/libnvidia-glsi.so.1
		78	lib32/libnvidia-glvkspirv.so
		79	lib32/libnvidia-glvkspirv.so.1
78	lib32/libnvidia-tls.so	80	lib32/libnvidia-tls.so
79	lib32/libnvidia-tls.so.1	81	lib32/libnvidia-tls.so.1
80	lib32/vdpau/libvdpau_nvidia.so.1	82	lib32/vdpau/libvdpau_nvidia.so.1

Lines 1-7 Link Here

(-)b/x11/nvidia-settings/Makefile (-1 / +1 lines)
1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>	1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
2		2
3	PORTNAME= nvidia-settings	3	PORTNAME= nvidia-settings
4	PORTVERSION= 460.67	4	PORTVERSION= 465.24.02
5	CATEGORIES= x11	5	CATEGORIES= x11
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org

Lines 1-3 Link Here

(-)b/x11/nvidia-settings/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1616102007	1	TIMESTAMP = 1618461321
2	SHA256 (NVIDIA-nvidia-settings-460.67_GH0.tar.gz) = 53a42b8037898ced3a5cc37ac11ac6bdb0a8c99a0356a3bce976eae59a508e56	2	SHA256 (NVIDIA-nvidia-settings-465.24.02_GH0.tar.gz) = 133dc7c616de0e27b6e81bfe1ed33072570af73b8e329d4cde649f85d8f4d736
3	SIZE (NVIDIA-nvidia-settings-460.67_GH0.tar.gz) = 1233189	3	SIZE (NVIDIA-nvidia-settings-465.24.02_GH0.tar.gz) = 1233945

Lines 1-7 Link Here

(-)b/x11/nvidia-xconfig/Makefile (-1 / +1 lines)
1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>	1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
2		2
3	PORTNAME= nvidia-xconfig	3	PORTNAME= nvidia-xconfig
4	PORTVERSION= 460.67	4	PORTVERSION= 465.24.02
5	CATEGORIES= x11	5	CATEGORIES= x11
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org

Lines 1-3 Link Here

(-)b/x11/nvidia-xconfig/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1616102207	1	TIMESTAMP = 1618461370
2	SHA256 (NVIDIA-nvidia-xconfig-460.67_GH0.tar.gz) = 808781ed704ac62ee6a9b8468baa8dc9f93957e0349eeb0bd1cc834603f00cd4	2	SHA256 (NVIDIA-nvidia-xconfig-465.24.02_GH0.tar.gz) = cfe77f106fd8c708690e24d8c571cc25948b794ec904a3dada125411b06d9ddf
3	SIZE (NVIDIA-nvidia-xconfig-460.67_GH0.tar.gz) = 142323	3	SIZE (NVIDIA-nvidia-xconfig-465.24.02_GH0.tar.gz) = 142550

Return to bug 254668

Lines 53-60 Link Here

(-)b/x11/linux-nvidia-libs/pkg-plist (-2 / +2 lines)
53	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1	53	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
54	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%	54	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
55	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%	55	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
56	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
57	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%	56	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
		57	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
58	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so	58	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
59	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1	59	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
60	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%	60	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%
Lines 124-131 Link Here
124	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1	124	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
125	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%	125	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
126	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%	126	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
127	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
128	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%	127	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
		128	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
129	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%	129	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
130	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%	130	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
131	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so	131	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so