Attachment #153729 for bug #192617




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

PORTNAME?=	nvidia-driver
DISTVERSION?=	346.35
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?=	0

# hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
# since it is still used by legacy drivers.
MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
SUB_FILES=	pkg-message
DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
MODULESDIR=	lib/xorg/modules
PORTDOCS=	*

EXTRA_PATCHES+=	${FILESDIR}/security-patch-CVE-2012-4225
.endif

OPTIONS_DEFINE=	ACPI_PM LINUX DOCS OPTIMUS
OPTIONS_DEFAULT?=	LINUX

ACPI_PM_DESC=		ACPI Power Management support
LINUX_DESC=		Linux compatibility support
OPTIMUS_DESC=		For use with nVIDIA Optimus

.if ${NVVERSION} < 310.014
OPTIONS_DEFINE+=	FREEBSD_AGP

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLINUX}
.if !${PORT_OPTIONS:MOPTIMUS}
CONFLICTS_INSTALL=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
USE_LINUX=	yes
PLIST_SUB+=	LINUX=""
.endif
.else
PLIST_SUB+=	LINUX="@comment "
# Propagate WITHOUT_LINUX variable down to inner Makefiles
MAKE_ENV+=	WITHOUT_LINUX=yes
.endif

.if ${PORT_OPTIONS:MOPTIMUS}
PLIST_SUB+=	NONOPT="@comment "
PLIST_SUB+=	OPTIMUS=""
.else
SUB_FILES+=	 pkg-install pkg-deinstall
PLIST_SUB+=	NONOPT=""
PLIST_SUB+=	OPTIMUS="@comment "
.endif

.if ${NVVERSION} < 195.022
# ABI version is hardcoded inside the binary, so specify it explicitly here
LIB_DEPENDS=	libm.so.3:${PORTSDIR}/misc/compat5x

.endif
# Adjust installation paths of some conflicting files (shared also between
# libGL, libEGL, libglesv2 and xorg-server) to ease package manager work.
.if ${PORT_OPTIONS:MOPTIMUS}
	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia_optimus:' \
		${WRKSRC}/x11/extension/Makefile
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		${WRKSRC}/lib/libGL/Makefile
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		${WRKSRC}/lib/compat/libGL/Makefile
.else
 	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
 		${WRKSRC}/x11/extension/Makefile
 	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
 		${WRKSRC}/lib/libGL/Makefile
.endif

.if ${NVVERSION} >= 331.013
.if ${PORT_OPTIONS:MOPTIMUS}
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		${WRKSRC}/lib/libEGL/Makefile
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		${WRKSRC}/lib/libGLESv2/Makefile
.else
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
		${WRKSRC}/lib/libEGL/Makefile
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
		${WRKSRC}/lib/libGLESv2/Makefile
.endif
.endif
# Do not execute afterinstall target (prevent automatic module registration
# and "smart" installation of conflicting files heuristics)
	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile

Lines 1-12 Link Here

(-)nvidia-driver/pkg-plist (-8 / +16 lines)
1	bin/nvidia-bug-report.sh	1	bin/nvidia-bug-report.sh
2	lib/.nvidia/libGL.so	2	%%NONOPT%%lib/.nvidia/libGL.so
3	lib/.nvidia/libGL.so.1	3	%%NONOPT%%lib/.nvidia/libGL.so.1
4	lib/.nvidia/libEGL.so	4	%%NONOPT%%lib/.nvidia/libEGL.so
5	lib/.nvidia/libEGL.so.1	5	%%NONOPT%%lib/.nvidia/libEGL.so.1
		6	%%OPTIMUS%%lib/.nvidia_optimus/libGL.so
		7	%%OPTIMUS%%lib/.nvidia_optimus/libGL.so.1
		8	%%OPTIMUS%%lib/.nvidia_optimus/libEGL.so
		9	%%OPTIMUS%%lib/.nvidia_optimus/libEGL.so.1
6	lib/libGLESv1_CM.so	10	lib/libGLESv1_CM.so
7	lib/libGLESv1_CM.so.1	11	lib/libGLESv1_CM.so.1
8	lib/.nvidia/libGLESv2.so	12	%%NONOPT%%lib/.nvidia/libGLESv2.so
9	lib/.nvidia/libGLESv2.so.2	13	%%NONOPT%%lib/.nvidia/libGLESv2.so.2
		14	%%OPTIMUS%%lib/.nvidia_optimus/libGLESv2.so
		15	%%OPTIMUS%%lib/.nvidia_optimus/libGLESv2.so.2
10	lib/libGLcore.so	16	lib/libGLcore.so
11	lib/libGLcore.so.1	17	lib/libGLcore.so.1
12	lib/libXvMCNVIDIA.a	18	lib/libXvMCNVIDIA.a
Lines 24-31 Link Here
24	lib/libvdpau_nvidia.so	30	lib/libvdpau_nvidia.so
25	lib/vdpau/libvdpau_nvidia.so.1	31	lib/vdpau/libvdpau_nvidia.so.1
26	%%MODULESDIR%%/drivers/nvidia_drv.so	32	%%MODULESDIR%%/drivers/nvidia_drv.so
27	%%MODULESDIR%%/extensions/.nvidia/libglx.so	33	%%NONOPT%%%%MODULESDIR%%/extensions/.nvidia/libglx.so
28	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1	34	%%NONOPT%%%%MODULESDIR%%/extensions/.nvidia/libglx.so.1
		35	%%OPTIMUS%%%%MODULESDIR%%/extensions/.nvidia_optimus/libglx.so
		36	%%OPTIMUS%%%%MODULESDIR%%/extensions/.nvidia_optimus/libglx.so.1
29	%%MODULESDIR%%/libnvidia-wfb.so.1	37	%%MODULESDIR%%/libnvidia-wfb.so.1
30	/%%KMODDIR%%/nvidia.ko	38	/%%KMODDIR%%/nvidia.ko
31	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%	39	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%

Return to bug 192617

Lines 10-16 Link Here

(-)nvidia-driver/Makefile (-6 / +35 lines)
10	# slave ports instead (`x11/nvidia-driver-173', `x11/nvidia-driver-304',	10	# slave ports instead (`x11/nvidia-driver-173', `x11/nvidia-driver-304',
11	# or `x11/nvidia-driver-340').	11	# or `x11/nvidia-driver-340').
12		12
13	PORTNAME= nvidia-driver	13	PORTNAME?= nvidia-driver
14	DISTVERSION?= 346.35	14	DISTVERSION?= 346.35
15	# Always try to set PORTREVISION as it can be overridden by the slave ports	15	# Always try to set PORTREVISION as it can be overridden by the slave ports
16	PORTREVISION?= 0	16	PORTREVISION?= 0
Lines 40-46 Link Here
40	# hack below to universally set NVIDIA_ROOT. Also provide X11BASE value	40	# hack below to universally set NVIDIA_ROOT. Also provide X11BASE value
41	# since it is still used by legacy drivers.	41	# since it is still used by legacy drivers.
42	MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}	42	MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
43	SUB_FILES= pkg-deinstall pkg-install pkg-message	43	SUB_FILES= pkg-message
44	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0	44	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
45	MODULESDIR= lib/xorg/modules	45	MODULESDIR= lib/xorg/modules
46	PORTDOCS= *	46	PORTDOCS= *
Lines 91-101 Link Here
91	EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-4225	91	EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-4225
92	.endif	92	.endif
93		93
94	OPTIONS_DEFINE= ACPI_PM LINUX DOCS	94	OPTIONS_DEFINE= ACPI_PM LINUX DOCS OPTIMUS
95	OPTIONS_DEFAULT= LINUX	95	OPTIONS_DEFAULT?= LINUX
96		96
97	ACPI_PM_DESC= ACPI Power Management support	97	ACPI_PM_DESC= ACPI Power Management support
98	LINUX_DESC= Linux compatibility support	98	LINUX_DESC= Linux compatibility support
		99	OPTIMUS_DESC= For use with nVIDIA Optimus
99		100
100	.if ${NVVERSION} < 310.014	101	.if ${NVVERSION} < 310.014
101	OPTIONS_DEFINE+= FREEBSD_AGP	102	OPTIONS_DEFINE+= FREEBSD_AGP
Lines 118-132 Link Here
118	.include <bsd.port.options.mk>	119	.include <bsd.port.options.mk>
119		120
120	.if ${PORT_OPTIONS:MLINUX}	121	.if ${PORT_OPTIONS:MLINUX}
		122	.if !${PORT_OPTIONS:MOPTIMUS}
121	CONFLICTS_INSTALL= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*	123	CONFLICTS_INSTALL= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
122	USE_LINUX= yes	124	USE_LINUX= yes
123	PLIST_SUB+= LINUX=""	125	PLIST_SUB+= LINUX=""
		126	.endif
124	.else	127	.else
125	PLIST_SUB+= LINUX="@comment "	128	PLIST_SUB+= LINUX="@comment "
126	# Propagate WITHOUT_LINUX variable down to inner Makefiles	129	# Propagate WITHOUT_LINUX variable down to inner Makefiles
127	MAKE_ENV+= WITHOUT_LINUX=yes	130	MAKE_ENV+= WITHOUT_LINUX=yes
128	.endif	131	.endif
129		132
		133	.if ${PORT_OPTIONS:MOPTIMUS}
		134	PLIST_SUB+= NONOPT="@comment "
		135	PLIST_SUB+= OPTIMUS=""
		136	.else
		137	SUB_FILES+= pkg-install pkg-deinstall
		138	PLIST_SUB+= NONOPT=""
		139	PLIST_SUB+= OPTIMUS="@comment "
		140	.endif
		141
130	.if ${NVVERSION} < 195.022	142	.if ${NVVERSION} < 195.022
131	# ABI version is hardcoded inside the binary, so specify it explicitly here	143	# ABI version is hardcoded inside the binary, so specify it explicitly here
132	LIB_DEPENDS= libm.so.3:${PORTSDIR}/misc/compat5x	144	LIB_DEPENDS= libm.so.3:${PORTSDIR}/misc/compat5x
Lines 245-260 Link Here
245	.endif	257	.endif
246	# Adjust installation paths of some conflicting files (shared also between	258	# Adjust installation paths of some conflicting files (shared also between
247	# libGL, libEGL, libglesv2 and xorg-server) to ease package manager work.	259	# libGL, libEGL, libglesv2 and xorg-server) to ease package manager work.
248	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \	260	.if ${PORT_OPTIONS:MOPTIMUS}
		261	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia_optimus:' \
249	${WRKSRC}/x11/extension/Makefile	262	${WRKSRC}/x11/extension/Makefile
250	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \	263	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
251	${WRKSRC}/lib/libGL/Makefile	264	${WRKSRC}/lib/libGL/Makefile
		265	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		266	${WRKSRC}/lib/compat/libGL/Makefile
		267	.else
		268	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
		269	${WRKSRC}/x11/extension/Makefile
		270	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
		271	${WRKSRC}/lib/libGL/Makefile
		272	.endif
		273
252	.if ${NVVERSION} >= 331.013	274	.if ${NVVERSION} >= 331.013
		275	.if ${PORT_OPTIONS:MOPTIMUS}
		276	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		277	${WRKSRC}/lib/libEGL/Makefile
		278	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		279	${WRKSRC}/lib/libGLESv2/Makefile
		280	.else
253	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \	281	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
254	${WRKSRC}/lib/libEGL/Makefile	282	${WRKSRC}/lib/libEGL/Makefile
255	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \	283	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
256	${WRKSRC}/lib/libGLESv2/Makefile	284	${WRKSRC}/lib/libGLESv2/Makefile
257	.endif	285	.endif
		286	.endif
258	# Do not execute afterinstall target (prevent automatic module registration	287	# Do not execute afterinstall target (prevent automatic module registration
259	# and "smart" installation of conflicting files heuristics)	288	# and "smart" installation of conflicting files heuristics)
260	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile	289	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile