Attachment #147752 for bug #192617




# Created by: Stijn Hoop <stijn@win.tue.nl>
# $FreeBSD: head/x11/nvidia-driver/Makefile 367888 2014-09-10 20:50:31Z gerald $

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

# 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} < 3101400
OPTIONS_DEFINE+=	FREEBSD_AGP

.endif

.if ${PORT_OPTIONS:MLINUX}
.if !${PORT_OPTIONS:MOPTIMUS}
CONFLICTS=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
.endif
USE_LINUX=	yes
PLIST_SUB+=	LINUX=""
.else

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} < 1952200
# 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 and xorg-server) to ease package manager work, esp. with pkgng
.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
# 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-7 Link Here

(-)nvidia-driver/pkg-plist (-8 / +17 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	@dirrm lib/.nvidia	4	%%NONOPT%%@dirrm lib/.nvidia
		5	%%OPTIMUS%%lib/.nvidia_optimus/libGL.so
		6	%%OPTIMUS%%lib/.nvidia_optimus/libGL.so.1
		7	%%OPTIMUS%%@dirrm lib/.nvidia_optimus
5	lib/libEGL.so	8	lib/libEGL.so
6	lib/libEGL.so.1	9	lib/libEGL.so.1
7	lib/libGLESv1_CM.so	10	lib/libGLESv1_CM.so
Lines 26-43 Link Here
26	lib/vdpau/libvdpau_nvidia.so.1	29	lib/vdpau/libvdpau_nvidia.so.1
27	@dirrmtry lib/vdpau	30	@dirrmtry lib/vdpau
28	%%MODULESDIR%%/drivers/nvidia_drv.so	31	%%MODULESDIR%%/drivers/nvidia_drv.so
29	%%MODULESDIR%%/extensions/.nvidia/libglx.so	32	%%NONOPT%%%%MODULESDIR%%/extensions/.nvidia/libglx.so
30	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1	33	%%NONOPT%%%%MODULESDIR%%/extensions/.nvidia/libglx.so.1
		34	%%OPTIMUS%%%%MODULESDIR%%/extensions/.nvidia_optimus/libglx.so
		35	%%OPTIMUS%%%%MODULESDIR%%/extensions/.nvidia_optimus/libglx.so.1
31	%%MODULESDIR%%/libnvidia-wfb.so.1	36	%%MODULESDIR%%/libnvidia-wfb.so.1
32	@dirrm %%MODULESDIR%%/extensions/.nvidia	37	%%NONOPT%%@dirrm %%MODULESDIR%%/extensions/.nvidia
		38	%%OPTIMUS%%@dirrm %%MODULESDIR%%/extensions/.nvidia_optimus
33	@dirrmtry %%MODULESDIR%%/drivers	39	@dirrmtry %%MODULESDIR%%/drivers
34	@cwd /%%KMODDIR%%	40	@cwd /%%KMODDIR%%
35	nvidia.ko	41	nvidia.ko
36	%%LINUX%%@cwd %%LINUXBASE%%	42	%%LINUX%%@cwd %%LINUXBASE%%
37	%%LINUX%%usr/lib/libEGL.so.%%SHLIB_VERSION%%	43	%%LINUX%%usr/lib/libEGL.so.%%SHLIB_VERSION%%
38	%%LINUX%%usr/lib/libEGL.so.1	44	%%LINUX%%usr/lib/libEGL.so.1
39	%%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%%	45	%%LINUX%%%%NONOPT%%usr/lib/libGL.so.%%SHLIB_VERSION%%
40	%%LINUX%%usr/lib/libGL.so.1	46	%%LINUX%%%%NONOPT%%usr/lib/libGL.so.1
		47	%%LINUX%%%%OPTIMUS%%usr/lib/.nvidia_optimus/libGL.so.%%SHLIB_VERSION%%
		48	%%LINUX%%%%OPTIMUS%%usr/lib/.nvidia_optimus/libGL.so.1
		49	%%LINUX%%%%OPTIMUS%%@dirrm usr/lib/.nvidia_optimus
41	%%LINUX%%usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%	50	%%LINUX%%usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%
42	%%LINUX%%usr/lib/libGLESv1_CM.so.1	51	%%LINUX%%usr/lib/libGLESv1_CM.so.1
43	%%LINUX%%usr/lib/libGLESv2.so.%%SHLIB_VERSION%%	52	%%LINUX%%usr/lib/libGLESv2.so.%%SHLIB_VERSION%%

Return to bug 192617

Lines 1-7 Link Here

(-)nvidia-driver/Makefile (-4 / +25 lines)
1	# Created by: Stijn Hoop <stijn@win.tue.nl>	1	# Created by: Stijn Hoop <stijn@win.tue.nl>
2	# $FreeBSD: head/x11/nvidia-driver/Makefile 367888 2014-09-10 20:50:31Z gerald $	2	# $FreeBSD: head/x11/nvidia-driver/Makefile 367888 2014-09-10 20:50:31Z gerald $
3		3
4	PORTNAME= nvidia-driver	4	PORTNAME?= nvidia-driver
5	DISTVERSION?= 331.67	5	DISTVERSION?= 331.67
6	# Always try to set PORTREVISION as it can be overridden by the slave ports	6	# Always try to set PORTREVISION as it can be overridden by the slave ports
7	PORTREVISION?= 1	7	PORTREVISION?= 1
Lines 31-37 Link Here
31	# hack below to universally set NVIDIA_ROOT. Also provide X11BASE value	31	# hack below to universally set NVIDIA_ROOT. Also provide X11BASE value
32	# since it is still used by legacy drivers.	32	# since it is still used by legacy drivers.
33	MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}	33	MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
34	SUB_FILES= pkg-deinstall pkg-install pkg-message	34	SUB_FILES= pkg-message
35	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0	35	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
36	MODULESDIR= lib/xorg/modules	36	MODULESDIR= lib/xorg/modules
37	PORTDOCS= *	37	PORTDOCS= *
Lines 76-86 Link Here
76	EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-4225	76	EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-4225
77	.endif	77	.endif
78		78
79	OPTIONS_DEFINE= ACPI_PM LINUX DOCS	79	OPTIONS_DEFINE= ACPI_PM LINUX DOCS OPTIMUS
80	OPTIONS_DEFAULT= LINUX	80	OPTIONS_DEFAULT?= LINUX
81		81
82	ACPI_PM_DESC= ACPI Power Management support	82	ACPI_PM_DESC= ACPI Power Management support
83	LINUX_DESC= Linux compatibility support	83	LINUX_DESC= Linux compatibility support
		84	OPTIMUS_DESC= For use with nVIDIA Optimus
84		85
85	.if ${NVVERSION} < 3101400	86	.if ${NVVERSION} < 3101400
86	OPTIONS_DEFINE+= FREEBSD_AGP	87	OPTIONS_DEFINE+= FREEBSD_AGP
Lines 108-114 Link Here
108	.endif	109	.endif
109		110
110	.if ${PORT_OPTIONS:MLINUX}	111	.if ${PORT_OPTIONS:MLINUX}
		112	.if !${PORT_OPTIONS:MOPTIMUS}
111	CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*	113	CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
		114	.endif
112	USE_LINUX= yes	115	USE_LINUX= yes
113	PLIST_SUB+= LINUX=""	116	PLIST_SUB+= LINUX=""
114	.else	117	.else
Lines 117-122 Link Here
117	MAKE_ENV+= WITHOUT_LINUX=yes	120	MAKE_ENV+= WITHOUT_LINUX=yes
118	.endif	121	.endif
119		122
		123	.if ${PORT_OPTIONS:MOPTIMUS}
		124	PLIST_SUB+= NONOPT="@comment "
		125	PLIST_SUB+= OPTIMUS=""
		126	.else
		127	SUB_FILES+= pkg-install pkg-deinstall
		128	PLIST_SUB+= NONOPT=""
		129	PLIST_SUB+= OPTIMUS="@comment "
		130	.endif
		131
120	.if ${NVVERSION} < 1952200	132	.if ${NVVERSION} < 1952200
121	# ABI version is hardcoded inside the binary, so specify it explicitly here	133	# ABI version is hardcoded inside the binary, so specify it explicitly here
122	LIB_DEPENDS= libm.so.3:${PORTSDIR}/misc/compat5x	134	LIB_DEPENDS= libm.so.3:${PORTSDIR}/misc/compat5x
Lines 231-240 Link Here
231	.endif	243	.endif
232	# Adjust installation paths of some conflicting files (shared also between	244	# Adjust installation paths of some conflicting files (shared also between
233	# libGL and xorg-server) to ease package manager work, esp. with pkgng	245	# libGL and xorg-server) to ease package manager work, esp. with pkgng
		246	.if ${PORT_OPTIONS:MOPTIMUS}
		247	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia_optimus:' \
		248	${WRKSRC}/x11/extension/Makefile
		249	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		250	${WRKSRC}/lib/libGL/Makefile
		251	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
		252	${WRKSRC}/lib/compat/libGL/Makefile
		253	.else
234	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \	254	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
235	${WRKSRC}/x11/extension/Makefile	255	${WRKSRC}/x11/extension/Makefile
236	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \	256	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
237	${WRKSRC}/lib/libGL/Makefile	257	${WRKSRC}/lib/libGL/Makefile
		258	.endif
238	# Do not execute afterinstall target (prevent automatic module registration	259	# Do not execute afterinstall target (prevent automatic module registration
239	# and "smart" installation of conflicting files heuristics)	260	# and "smart" installation of conflicting files heuristics)
240	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile	261	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile