Attachment #226784 for bug #257456

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.84	2	DISTVERSION?= 470.57.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 / +3 lines)
1	TIMESTAMP = 1620395714	1	TIMESTAMP = 1627571308
2	SHA256 (NVIDIA-Linux-x86_64-460.84.run) = a10d2171d6b2c55f63791f58264f9e92829ee4b2779b9b1d011274e63b46b960	2	SHA256 (NVIDIA-Linux-x86_64-470.57.02.run) = 55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
3	SIZE (NVIDIA-Linux-x86_64-460.84.run) = 177840337	3	SIZE (NVIDIA-Linux-x86_64-470.57.02.run) = 273219658
4	SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74	4	SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
5	SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417	5	SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417
6	SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30	6	SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30

Lines 14-20 Link Here

(-)b/x11/nvidia-driver/Makefile (-4 / +7 lines)
14	# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.	14	# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
15		15
16	PORTNAME?= nvidia-driver	16	PORTNAME?= nvidia-driver
17	DISTVERSION?= 460.84	17	DISTVERSION?= 470.57.02
18	# Always try to set PORTREVISION as it can be overridden by the slave ports	18	# Always try to set PORTREVISION as it can be overridden by the slave ports
19	PORTREVISION?= 0	19	PORTREVISION?= 0
20	CATEGORIES= x11	20	CATEGORIES= x11
Lines 44-52 USE_LDCONFIG= yes Link Here
44		44
45	GLVND_JSON_PATH= ${PREFIX}/share/glvnd/egl_vendor.d	45	GLVND_JSON_PATH= ${PREFIX}/share/glvnd/egl_vendor.d
46	WAYLAND_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d	46	WAYLAND_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d
		47	VKICD_PATH= ${PREFIX}/share/vulkan/icd.d
		48	VKLAYERS_PATH= ${PREFIX}/share/vulkan/implicit_layer.d
47	MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \	49	MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \
48	EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \	50	EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
49	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}	51	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} \
		52	VKICD_PATH=${STAGEDIR}${VKICD_PATH} \
		53	VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH}
50	SUB_FILES= pkg-message	54	SUB_FILES= pkg-message
51	.if !defined(LIBGLDIR)	55	.if !defined(LIBGLDIR)
52	SUB_FILES+= nvidia.conf	56	SUB_FILES+= nvidia.conf
Lines 82-89 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebs Link Here
82	SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \	86	SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \
83	extra-patch-src-nvidia_linux.c	87	extra-patch-src-nvidia_linux.c
84	.else	88	.else
85	EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \	89	EXTRA_PATCHES+= ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
86	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
87	${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \	90	${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
88	${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c	91	${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
89	.endif	92	.endif

Lines 1-6 Link Here

(-)b/x11/nvidia-driver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620395718	1	TIMESTAMP = 1627570406
2	SHA256 (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 920cca0df1bf3eedcc2dbe8fca1711b3ab0e09b7864e0bbc990dfd7d35bde0e8	2	SHA256 (NVIDIA-FreeBSD-x86_64-470.57.02.tar.xz) = 1803b39ed3a9f185c6a4528181917af4a56610acfedccc98df0d60d2e498e8f2
3	SIZE (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 108291070	3	SIZE (NVIDIA-FreeBSD-x86_64-470.57.02.tar.xz) = 99335120
4	SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd	4	SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd
5	SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942	5	SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942
6	SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b	6	SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b




--- lib/libGLX_nvidia/Makefile.orig
+++ lib/libGLX_nvidia/Makefile
@@ -16,18 +16,18 @@ EXTRADEPS=	nvidia-application-profiles-rc nvidia_icd.j
 # look for this file.
 
 nvidia_icd.json:
-	@mkdir -p ${VKICD_PATH}
+	@mkdir -p ${DESTDIR}${VKICD_PATH}
 	@${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		${NVIDIA_ROOT}/nvidia_icd.json \
-		${VKICD_PATH}
-	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKICD_PATH}/nvidia_icd.json
+		${DESTDIR}${VKICD_PATH}
+	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKICD_PATH}/nvidia_icd.json
 
 nvidia_layers.json:
-	@mkdir -p ${VKLAYERS_PATH}
+	@mkdir -p ${DESTDIR}${VKLAYERS_PATH}
 	@${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		${NVIDIA_ROOT}/nvidia_layers.json \
-		${VKLAYERS_PATH}
-	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKLAYERS_PATH}/nvidia_layers.json
+		${DESTDIR}${VKLAYERS_PATH}
+	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKLAYERS_PATH}/nvidia_layers.json
 
 
 nvidia-application-profiles-rc:

Return to bug 257456

Removed Link Here

(-)a/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile (-27 lines)
1	--- lib/libGLX_nvidia/Makefile.orig
2	+++ lib/libGLX_nvidia/Makefile
3	@@ -16,18 +16,18 @@ EXTRADEPS= nvidia-application-profiles-rc nvidia_icd.j
4	# look for this file.
5
6	nvidia_icd.json:
7	- @mkdir -p ${VKICD_PATH}
8	+ @mkdir -p ${DESTDIR}${VKICD_PATH}
9	@${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
10	${NVIDIA_ROOT}/nvidia_icd.json \
11	- ${VKICD_PATH}
12	- @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKICD_PATH}/nvidia_icd.json
13	+ ${DESTDIR}${VKICD_PATH}
14	+ @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKICD_PATH}/nvidia_icd.json
15
16	nvidia_layers.json:
17	- @mkdir -p ${VKLAYERS_PATH}
18	+ @mkdir -p ${DESTDIR}${VKLAYERS_PATH}
19	@${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
20	${NVIDIA_ROOT}/nvidia_layers.json \
21	- ${VKLAYERS_PATH}
22	- @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKLAYERS_PATH}/nvidia_layers.json
23	+ ${DESTDIR}${VKLAYERS_PATH}
24	+ @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKLAYERS_PATH}/nvidia_layers.json
25
26
27	nvidia-application-profiles-rc: