Attachment #226115 for bug #253285

View | Details | Raw Unified | Return to bug 253285
Collapse All | Expand All

Lines 41-49 USE_LDCONFIG= yes Link Here

(-)b/x11/nvidia-driver/Makefile (-3 / +6 lines)
41		41
42	GLVND_JSON_PATH= ${PREFIX}/share/glvnd/egl_vendor.d	42	GLVND_JSON_PATH= ${PREFIX}/share/glvnd/egl_vendor.d
43	WAYLAND_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d	43	WAYLAND_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d
		44	VKICD_PATH= ${PREFIX}/share/vulkan/icd.d
		45	VKLAYERS_PATH= ${PREFIX}/share/vulkan/implicit_layer.d
44	MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \	46	MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \
45	EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \	47	EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
46	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}	48	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} \
		49	VKICD_PATH=${STAGEDIR}${VKICD_PATH} \
		50	VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH}
47	SUB_FILES= pkg-message	51	SUB_FILES= pkg-message
48	.if !defined(LIBGLDIR)	52	.if !defined(LIBGLDIR)
49	SUB_FILES+= nvidia.conf	53	SUB_FILES+= nvidia.conf
Lines 80-87 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebs Link Here
80	SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \	84	SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \
81	extra-patch-src-nvidia_linux.c	85	extra-patch-src-nvidia_linux.c
82	.else	86	.else
83	EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \	87	EXTRA_PATCHES+= ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
84	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
85	${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \	88	${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
86	${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c	89	${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
87	.endif	90	.endif




--- 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 253285

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: