Attachment #208376 for bug #241307

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




# slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').

PORTNAME=	nvidia-driver
DISTVERSION?=	430.50
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?=	3
CATEGORIES=	x11
MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}

		libnvidia-ml.so.${PORTVERSION} \
		libnvidia-opencl.so.${PORTVERSION} \
		libnvidia-tls.so.${PORTVERSION} \
		libvdpau_nvidia.so.${PORTVERSION}
.if ${NVVERSION} < 430.050
LINUX_LIBS+=	tls/libnvidia-tls.so.${PORTVERSION}
.endif
LINUX_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
		libcuda.so.${PORTVERSION} libcuda.so \
		libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \

		libnvidia-ml.so.${PORTVERSION} \
		libnvidia-opencl.so.${PORTVERSION} \
		libnvidia-tls.so.${PORTVERSION} \
		libvdpau_nvidia.so.${PORTVERSION}
.if ${NVVERSION} < 430.050
LINUX_LIBS+=	tls/libnvidia-tls.so.${PORTVERSION}
.endif
LINUX32_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
		libcuda.so.${PORTVERSION} libcuda.so \
		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \

		'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \
		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
.endif
.if ${NVVERSION} >= 430.050
PLIST_FILES+=	lib/libGLdispatch.so.0
PLIST_FILES+=	lib/libGLX.so.0
PLIST_FILES+=	lib/libGLX_nvidia.so.0
PLIST_FILES+=	lib/libGLX_indirect.so.0
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
PLIST_RE+=	's/libglx\.so/libglxserver_nvidia.so/'
PLIST_RE+=	'/lib(64)?\/tls/d'
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.2
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
.elif ${NVVERSION} >= 387.012
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.2
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'

# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
# won't adhere to this stupidity and install nvidia-application-profiles-*
# files as part of documentation
.if ${NVVERSION} >= 430.050
	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
		${WRKSRC}/lib/libGLX_nvidia/Makefile ${WRKSRC}/doc/Makefile
.elif ${NVVERSION} >= 334.016
	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
.endif
# Do not install json files, do not hardcode DESTDIR
.if ${NVVERSION} >= 430.050
	${REINPLACE_CMD} -Ee '/^EXTRADEPS=.*json$$/d' \
		${WRKSRC}/lib/libEGL_nvidia/Makefile
	${REINPLACE_CMD} -Ee '/^EXTRADEPS=.*json$$/d' \
		${WRKSRC}/lib/libnvidia-egl-wayland/Makefile
	${REINPLACE_CMD} -Ee 's/^(AUXLINK_LINK= +)\$$\{DESTDIR\}/\1/' \
		${WRKSRC}/lib/libGLX_nvidia/Makefile
.endif
# Finally, process OPTIONS
.if ${PORT_OPTIONS:MFREEBSD_AGP}
	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \

	${INSTALL_MAN} ${LINUX_WRKSRC}/${m}.1.gz \
		${STAGEDIR}${LINUXBASE}/usr/share/man/man1
.endfor
.if ${NVVERSION} < 430.050
	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/tls
.endif
	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/vdpau
.for l in ${LINUX_LIBS}
	${INSTALL_LIB} ${LINUX_WRKSRC}/${l} \

		${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t}
.endfor
.if ${ARCH} == amd64
.if ${NVVERSION} < 430.050
	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls
.endif
	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau
.for l in ${LINUX32_LIBS}
	${INSTALL_LIB} ${LINUX_WRKSRC}/32/${l} \

Lines 1-4 Link Here

(-)distinfo (-1 / +5 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1571195460
		2	SHA256 (NVIDIA-FreeBSD-x86_64-430.50.tar.gz) = 6f797e6e513fb74acfdf2738efa382afb640df07b2858f1b29185e4612c6c301
		3	SIZE (NVIDIA-FreeBSD-x86_64-430.50.tar.gz) = 62715888
		4	SHA256 (NVIDIA-Linux-x86_64-430.50.run) = 0c683394ae47d145f989b74120b482431fa5c7730d41fb3433d8fd68324d3dc5
		5	SIZE (NVIDIA-Linux-x86_64-430.50.run) = 110545029
2	SHA256 (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 221c80982378a333f541646d5d2030c72311c491f5a0f98b93fdd95cd5be11fc	6	SHA256 (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 221c80982378a333f541646d5d2030c72311c491f5a0f98b93fdd95cd5be11fc
3	SIZE (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 63648591	7	SIZE (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 63648591
4	SHA256 (NVIDIA-Linux-x86_64-390.87.run) = 38290a0b19e86037112f22397e02be9cdd6bcd677dd926b2977bbd49119e611e	8	SHA256 (NVIDIA-Linux-x86_64-390.87.run) = 38290a0b19e86037112f22397e02be9cdd6bcd677dd926b2977bbd49119e611e

Lines 4-13 Link Here

(-)files/pkg-install.in (-2 / +8 lines)
4	#	4	#
5		5
6	PREFIX=${PKG_PREFIX-/usr/local}	6	PREFIX=${PKG_PREFIX-/usr/local}
		7	EXTPATH=${PREFIX}/lib/xorg/modules/extensions
7		8
8	case $2 in	9	case $2 in
9	POST-INSTALL)	10	POST-INSTALL)
10	/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 \	11	if [ -f ${EXTPATH}/.nvidia/libglx.so.1 ]; then
11	${PREFIX}/lib/xorg/modules/extensions/libglx.so	12	/bin/ln -f ${EXTPATH}/.nvidia/libglx.so.1 ${EXTPATH}/libglx.so
		13	fi
		14	if [ -f ${EXTPATH}/.nvidia/libglxserver_nvidia.so.1 ]; then
		15	/bin/ln -f ${EXTPATH}/.nvidia/libglxserver_nvidia.so.1 \
		16	${EXTPATH}/libglxserver_nvidia.so
		17	fi
12	;;	18	;;
13	esac	19	esac

Return to bug 241307

Lines 10-18 Link Here

(-)Makefile (-8 / +37 lines)
10	# slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').	10	# slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').
11		11
12	PORTNAME= nvidia-driver	12	PORTNAME= nvidia-driver
13	DISTVERSION?= 390.87	13	DISTVERSION?= 430.50
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?= 3
16	CATEGORIES= x11	15	CATEGORIES= x11
17	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}	16	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	17	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
Lines 117-124 LINUX_LIBS= libcuda.so.${PORTVERSION} \ Link Here
117	libnvidia-ml.so.${PORTVERSION} \	116	libnvidia-ml.so.${PORTVERSION} \
118	libnvidia-opencl.so.${PORTVERSION} \	117	libnvidia-opencl.so.${PORTVERSION} \
119	libnvidia-tls.so.${PORTVERSION} \	118	libnvidia-tls.so.${PORTVERSION} \
120	libvdpau_nvidia.so.${PORTVERSION} \	119	libvdpau_nvidia.so.${PORTVERSION}
121	tls/libnvidia-tls.so.${PORTVERSION}	120	.if ${NVVERSION} < 430.050
		121	LINUX_LIBS+= tls/libnvidia-tls.so.${PORTVERSION}
		122	.endif
122	LINUX_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \	123	LINUX_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \
123	libcuda.so.${PORTVERSION} libcuda.so \	124	libcuda.so.${PORTVERSION} libcuda.so \
124	libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \	125	libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
Lines 135-142 LINUX32_LIBS= libcuda.so.${PORTVERSION} \ Link Here
135	libnvidia-ml.so.${PORTVERSION} \	136	libnvidia-ml.so.${PORTVERSION} \
136	libnvidia-opencl.so.${PORTVERSION} \	137	libnvidia-opencl.so.${PORTVERSION} \
137	libnvidia-tls.so.${PORTVERSION} \	138	libnvidia-tls.so.${PORTVERSION} \
138	libvdpau_nvidia.so.${PORTVERSION} \	139	libvdpau_nvidia.so.${PORTVERSION}
139	tls/libnvidia-tls.so.${PORTVERSION}	140	.if ${NVVERSION} < 430.050
		141	LINUX_LIBS+= tls/libnvidia-tls.so.${PORTVERSION}
		142	.endif
140	LINUX32_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \	143	LINUX32_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \
141	libcuda.so.${PORTVERSION} libcuda.so \	144	libcuda.so.${PORTVERSION} libcuda.so \
142	libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \	145	libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
Lines 196-202 PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM\|2)_nvidi Link Here
196	'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \	199	'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \
197	'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'	200	'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
198	.endif	201	.endif
199	.if ${NVVERSION} >= 387.012	202	.if ${NVVERSION} >= 430.050
		203	PLIST_FILES+= lib/libGLdispatch.so.0
		204	PLIST_FILES+= lib/libGLX.so.0
		205	PLIST_FILES+= lib/libGLX_nvidia.so.0
		206	PLIST_FILES+= lib/libGLX_indirect.so.0
		207	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
		208	PLIST_RE+= 's/libglx\.so/libglxserver_nvidia.so/'
		209	PLIST_RE+= '/lib(64)?\/tls/d'
		210	LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.2
		211	LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
		212	.elif ${NVVERSION} >= 387.012
200	LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.2	213	LINUX_LIBS+= libnvidia-egl-wayland.so.1.0.2
201	LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1	214	LINUX_LINKS+= libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
202	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'	215	PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
Lines 483-492 post-patch: .SILENT Link Here
483	# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we	496	# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
484	# won't adhere to this stupidity and install nvidia-application-profiles-*	497	# won't adhere to this stupidity and install nvidia-application-profiles-*
485	# files as part of documentation	498	# files as part of documentation
486	.if ${NVVERSION} >= 334.016	499	.if ${NVVERSION} >= 430.050
487	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \	500	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
		501	${WRKSRC}/lib/libGLX_nvidia/Makefile ${WRKSRC}/doc/Makefile
		502	.elif ${NVVERSION} >= 334.016
		503	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
488	${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile	504	${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
489	.endif	505	.endif
		506	# Do not install json files, do not hardcode DESTDIR
		507	.if ${NVVERSION} >= 430.050
		508	${REINPLACE_CMD} -Ee '/^EXTRADEPS=.*json$$/d' \
		509	${WRKSRC}/lib/libEGL_nvidia/Makefile
		510	${REINPLACE_CMD} -Ee '/^EXTRADEPS=.*json$$/d' \
		511	${WRKSRC}/lib/libnvidia-egl-wayland/Makefile
		512	${REINPLACE_CMD} -Ee 's/^(AUXLINK_LINK= +)\$$\{DESTDIR\}/\1/' \
		513	${WRKSRC}/lib/libGLX_nvidia/Makefile
		514	.endif
490	# Finally, process OPTIONS	515	# Finally, process OPTIONS
491	.if ${PORT_OPTIONS:MFREEBSD_AGP}	516	.if ${PORT_OPTIONS:MFREEBSD_AGP}
492	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \	517	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
Lines 607-613 post-install-LINUX-on: Link Here
607	${INSTALL_MAN} ${LINUX_WRKSRC}/${m}.1.gz \	632	${INSTALL_MAN} ${LINUX_WRKSRC}/${m}.1.gz \
608	${STAGEDIR}${LINUXBASE}/usr/share/man/man1	633	${STAGEDIR}${LINUXBASE}/usr/share/man/man1
609	.endfor	634	.endfor
		635	.if ${NVVERSION} < 430.050
610	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/tls	636	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/tls
		637	.endif
611	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/vdpau	638	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/vdpau
612	.for l in ${LINUX_LIBS}	639	.for l in ${LINUX_LIBS}
613	${INSTALL_LIB} ${LINUX_WRKSRC}/${l} \	640	${INSTALL_LIB} ${LINUX_WRKSRC}/${l} \
Lines 618-624 post-install-LINUX-on: Link Here
618	${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t}	645	${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t}
619	.endfor	646	.endfor
620	.if ${ARCH} == amd64	647	.if ${ARCH} == amd64
		648	.if ${NVVERSION} < 430.050
621	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls	649	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls
		650	.endif
622	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau	651	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau
623	.for l in ${LINUX32_LIBS}	652	.for l in ${LINUX32_LIBS}
624	${INSTALL_LIB} ${LINUX_WRKSRC}/32/${l} \	653	${INSTALL_LIB} ${LINUX_WRKSRC}/32/${l} \