Attachment #224760 for bug #192617

Lines 9-15 Link Here

(-)b/x11/nvidia-driver/Makefile (-4 / +46 lines)
9	# slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340',	9	# slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340',
10	# or `x11/nvidia-driver-304').	10	# or `x11/nvidia-driver-304').
11		11
12	PORTNAME= nvidia-driver	12	PORTNAME?= nvidia-driver
13	DISTVERSION?= 460.67	13	DISTVERSION?= 460.67
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?= 0	15	PORTREVISION?= 0
Lines 18-25 Link Here
18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
19	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	19	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
20		20
21	MAINTAINER= danfe@FreeBSD.org	21	MAINTAINER?= danfe@FreeBSD.org
22	COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering	22	COMMENT?= NVidia graphics card binary drivers for hardware OpenGL rendering
23		23
24	LICENSE_FILE= ${WRKSRC}/doc/license.txt	24	LICENSE_FILE= ${WRKSRC}/doc/license.txt
25	.include "${.CURDIR}/../nvidia-driver/Makefile.common"	25	.include "${.CURDIR}/../nvidia-driver/Makefile.common"
Lines 39-45 Link Here
39	MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \	39	MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \
40	EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \	40	EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
41	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}	41	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}
42	SUB_FILES= pkg-message nvidia.conf	42	SUB_FILES= pkg-message
		43	.if !defined(LIBGLDIR)
		44	SUB_FILES+= nvidia.conf
		45	.endif
43	.if ${NVVERSION} < 410.057	46	.if ${NVVERSION} < 410.057
44	SUB_FILES+= pkg-deinstall pkg-install	47	SUB_FILES+= pkg-deinstall pkg-install
45	.endif	48	.endif
Lines 50-55 Link Here
50	extra-patch-src-nvidia_pci.c	53	extra-patch-src-nvidia_pci.c
51	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0	54	DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
52	MODULESDIR= lib/xorg/modules	55	MODULESDIR= lib/xorg/modules
		56	EXTENSIONSDIR?= ${MODULESDIR}/extensions/.nvidia
53	PORTDOCS= *	57	PORTDOCS= *
54		58
55	.if ${NVVERSION} >= 331.013	59	.if ${NVVERSION} >= 331.013
Lines 92-97 Link Here
92	.endif	96	.endif
93		97
94	PLIST_SUB+= MODULESDIR=${MODULESDIR}	98	PLIST_SUB+= MODULESDIR=${MODULESDIR}
		99	.if ${NVVERSION} < 410.057
		100	PLIST_SUB+= EXTENSIONSDIR=${EXTENSIONSDIR}
		101	.else
		102	PLIST_SUB+= EXTENSIONSDIR="@comment "
		103	.endif
		104	.if defined(LIBGLDIR)
		105	PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
		106	.else
		107	PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP=""
		108	.endif
		109
		110	.if ${PORTNAME} != nvidia-secondary-driver
		111	CONFLICTS_INSTALL+= nvidia-secondary-driver
		112	.endif
95		113
96	.include <bsd.port.pre.mk>	114	.include <bsd.port.pre.mk>
97		115
Lines 278-285 Link Here
278	${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2	296	${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
279	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so	297	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
280	.endif	298	.endif
		299	# Configuration of Nvidia as secondary GPU requires preserving Mesa libraries
		300	# as default implementation; a libmap must not override in this case.
		301	.if !defined(LIBGLDIR)
281	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/	302	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
282	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \	303	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
283	${STAGEDIR}${PREFIX}/etc/libmap.d/	304	${STAGEDIR}${PREFIX}/etc/libmap.d/
		305	.else
		306	# libgl proxies require a library path containing unrenamed libGL.so
		307	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
		308	${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
		309	${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
		310	${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
		311	${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
		312	${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
		313	${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
		314	.endif
		315	# Configuration of Nvidia as secondary GPU requires preserving xorg-server's
		316	# libglx.so and moving Nvidia's glx to where it can be found by a secondary
		317	# Xorg instance.
		318	# Not needed since 410.057: Nvidia driver finds libglxserver_nvidia.so instead.
		319	.if ${NVVERSION} < 410.057
		320	.if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
		321	${MKDIR} ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}
		322	${MV} ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions/.nvidia/* \
		323	${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}/
		324	.endif
		325	.endif
284		326
285	.include <bsd.port.post.mk>	327	.include <bsd.port.post.mk>

Lines 1-7 Link Here

(-)b/x11/nvidia-driver/pkg-plist (-3 / +6 lines)
1	bin/nvidia-bug-report.sh	1	bin/nvidia-bug-report.sh
2	bin/nvidia-debugdump	2	bin/nvidia-debugdump
3	bin/nvidia-smi	3	bin/nvidia-smi
4	etc/libmap.d/nvidia.conf	4	%%LIBGLMAP%%etc/libmap.d/nvidia.conf
		5	%%LIBGLDIR%%/libGL.so.1
		6	%%LIBGLDIR%%/libEGL.so.1
		7	%%LIBGLDIR%%/libGLESv2.so.2
5	lib/libEGL-NVIDIA.so	8	lib/libEGL-NVIDIA.so
6	lib/libEGL-NVIDIA.so.1	9	lib/libEGL-NVIDIA.so.1
7	lib/libEGL_nvidia.so	10	lib/libEGL_nvidia.so
Lines 84-91 Link Here
84	share/vulkan/icd.d/nvidia_icd.json	87	share/vulkan/icd.d/nvidia_icd.json
85	share/vulkan/implicit_layer.d/nvidia_layers.json	88	share/vulkan/implicit_layer.d/nvidia_layers.json
86	%%MODULESDIR%%/drivers/nvidia_drv.so	89	%%MODULESDIR%%/drivers/nvidia_drv.so
87	%%MODULESDIR%%/extensions/.nvidia/libglx.so	90	%%EXTENSIONSDIR%%/libglx.so
88	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1	91	%%EXTENSIONSDIR%%/libglx.so.1
89	%%MODULESDIR%%/extensions/libglxserver_nvidia.so	92	%%MODULESDIR%%/extensions/libglxserver_nvidia.so
90	%%MODULESDIR%%/extensions/libglxserver_nvidia.so.1	93	%%MODULESDIR%%/extensions/libglxserver_nvidia.so.1
91	/%%KMODDIR%%/nvidia.ko	94	/%%KMODDIR%%/nvidia.ko




# Created by: Theron Tarigo <theron.tarigo@gmail.com>

PORTNAME=	nvidia-hybrid-graphics
PORTVERSION=	0.5
CATEGORIES=	x11
MASTER_SITES=	# none
DISTFILES=	# none

MAINTAINER=	theron.tarigo@gmail.com
COMMENT=	NVIDIA secondary GPU configuration - Optimus Technology support

LICENSE=	BSD2CLAUSE

RUN_DEPENDS=	nvidia-xconfig:x11/nvidia-xconfig \
		${LOCALBASE}/bin/Xorg:x11-servers/xorg-server

FLAVORS=	default 390

NO_ARCH=	yes
NO_BUILD=	yes
WRKSRC=		${WRKDIR}/src

default_RUN_DEPENDS=	\
	nvidia-secondary-driver>=440.64:x11/nvidia-secondary-driver
390_RUN_DEPENDS=	\
	nvidia-secondary-driver-390>=390.87:x11/nvidia-secondary-driver-390

VIRTUALGL_RUN_DEPENDS=	${LOCALBASE}/VirtualGL/bin/vglrun:x11/virtualgl

390_PKGNAMESUFFIX=	-390

OPTIONS_DEFINE=		VIRTUALGL OPTIRUN
OPTIONS_DEFAULT=	VIRTUALGL OPTIRUN
OPTIONS_SUB=		OPTIRUN
VIRTUALGL_DESC=		Use VirtualGL for OpenGL redirection support
OPTIRUN_DESC=		Install "optirun" alias for nvrun-vgl
OPTIRUN_IMPLIES=	VIRTUALGL

scripts=	\
	bin/Xorg-nvidia-headless \
	bin/nvidia-headless-xconfig \
	bin/nvrun \
	bin/nvrun-vgl \
	libexec/nvidia-headless-utils/readconf \
	libexec/nvidia-settings-hybrid
configs=	\
	etc/X11/xorg-nvidia-headless-template.conf \
	etc/nvidia-headless.conf \
	etc/nvidia-hybrid.conf \

SUB_FILES=	pkg-message ${scripts:%=src/%} ${configs:%=src/%}
SUB_LIST+=	VGLRUN=${LOCALBASE}/VirtualGL/bin/vglrun

USE_RC_SUBR=	nvidia_xorg

do-extract:
.for f in ${SUB_FILES}
	${MKDIR} ${WRKDIR}/${f:H}
.endfor

do-install:
.for f in ${scripts}
	@${MKDIR} ${STAGEDIR}${PREFIX}/${f:H}
	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${f}
.endfor
.for f in ${configs}
	@${MKDIR} ${STAGEDIR}${PREFIX}/${f:H}
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${f}.sample
.endfor

post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg-nvidia-headless.conf.d

post-install-OPTIRUN-on:
	@${RLN} ${STAGEDIR}${PREFIX}/bin/nvrun-vgl \
		${STAGEDIR}${PREFIX}/bin/optirun

.include <bsd.port.mk>




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: nvidia_xorg
# REQUIRE: LOGIN
# KEYWORD: shutdown

. /etc/rc.subr

name=nvidia_xorg
rcvar=nvidia_xorg_enable
desc="Nvidia GPU Dedicated Xorg"

load_rc_config $name

: ${nvidia_xorg_enable:=NO}
: ${nvidia_modeset:=NO}
: ${nvidia_manage_kld:=YES}

command=/usr/sbin/daemon
pidfile=/var/run/${name}.pid
procname="%%LOCALBASE%%/bin/Xorg"
command_args="-p ${pidfile} -f %%PREFIX%%/bin/Xorg-nvidia-headless"
start_precmd="${name}_prestart"
stop_postcmd="${name}_poststop"

if checkyesno nvidia_modeset; then
	kmod=nvidia-modeset
else
	kmod=nvidia
fi

nvidia_xorg_prestart()
{
	if checkyesno nvidia_manage_kld; then
		kldload -n ${kmod} || return 1
	fi
}

nvidia_xorg_poststop()
{
	if checkyesno nvidia_manage_kld; then
		kldunload -f ${kmod} || return 1
	fi
}

run_rc_command "$1"




Running Xorg-nvidia-headless at startup is recommended especially on mobile
systems since leaving Nvidia GPU powered on with no Xorg may consume
significantly more power.

# sysrc nvidia_xorg_enable=YES
# service nvidia_xorg start

The Xorg instance uses separate configuration files from the defaults for Xorg:

    %%PREFIX%%/etc/X11/xorg-nvidia-headless.conf.d/

    %%PREFIX%%/etc/X11/xorg-nvidia-headless-template.conf
        Only used if xorg-nvidia-headless.conf does not exist.
	This file is passed through nvidia-xconfig, which does not preserve
	all options.

    %%PREFIX%%/etc/X11/xorg-nvidia-headless.conf
        Created by manually invoking %%PREFIX%%/bin/nvidia-headless-xconfig.
        Once created, this configuration is not passed through nvidia-xconfig.

Configuration is not normally needed for typical OpenGL acceleration usage.

A properly configured xorg-nvidia-headless.conf will allow Xorg-nvidia-headless
to be started by non-superuser if Xorg has been installed setuid.




#!/bin/sh
conf=%%PREFIX%%/etc/nvidia-headless.conf
. %%PREFIX%%/libexec/nvidia-headless-utils/readconf
if [ -z "$NVDISPLAY" ]; then printf %s\\n "NVDISPLAY required in environment or in $conf" >&2 ; exit 1; fi
xconfig=%%LOCALBASE%%/etc/X11/xorg-nvidia-headless.conf
xconfarg=xorg-nvidia-headless.conf
if [ ! -e "$xconfig" ]; then
if [ "$(id -u)" != 0 ]; then
printf %s\\n "nvidia-headless must be configured by superuser" >&2
exit 1
fi
xconfig=/var/cache/nvidia-headless/xorg.conf
mkdir -p /var/cache/nvidia-headless
xconfarg="$xconfig"
%%PREFIX%%/bin/nvidia-headless-xconfig -o "$xconfig"
fi
exec %%LOCALBASE%%/bin/Xorg -sharevts -novtswitch -noreset -config "$xconfarg" -configdir "xorg-nvidia-headless.conf.d" "$NVDISPLAY" "$@"

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/bin/nvidia-headless-xconfig.in (+9 lines)
1	#!/bin/sh
2	exec %%LOCALBASE%%/bin/nvidia-xconfig \
3	--enable-all-gpus \
4	--preserve-busid \
5	--allow-empty-initial-configuration \
6	--connected-monitor=DFP \
7	--no-use-edid \
8	-c %%PREFIX%%/etc/X11/xorg-nvidia-headless-template.conf \
9	-o %%LOCALBASE%%/etc/X11/xorg-nvidia-headless.conf "$@"

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/bin/nvrun-vgl.in (+8 lines)
1	#!/bin/sh
2	conf=%%PREFIX%%/etc/nvidia-headless.conf
3	. %%PREFIX%%/libexec/nvidia-headless-utils/readconf
4	conf=%%PREFIX%%/etc/nvidia-hybrid.conf
5	. %%PREFIX%%/libexec/nvidia-headless-utils/readconf
6	if [ -z "$NVDISPLAY" ]; then printf %s\\n "NVDISPLAY required in environment or in $conf" >&2 ; exit 1; fi
7	if [ -z "$VGLRUN" ]; then printf %s\\n "VGLRUN required in environment or in $conf" >&2 ; exit 1; fi
8	exec "$VGLRUN" -ld "%%LOCALBASE%%/lib/libGL-NVIDIA" -d "$NVDISPLAY" "$@"

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/bin/nvrun.in (+7 lines)
1	#!/bin/sh
2	conf=%%PREFIX%%/etc/nvidia-headless.conf
3	. %%PREFIX%%/libexec/nvidia-headless-utils/readconf
4	if [ -z "$NVDISPLAY" ]; then printf %s\\n "NVDISPLAY required in environment or in $conf" >&2 ; exit 1; fi
5	export DISPLAY="$NVDISPLAY"
6	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:%%LOCALBASE%%/lib/libGL-NVIDIA"
7	exec "$@"





Section "ServerLayout"
    Identifier     "nvidia"
    Screen      0  "Screen0"
    InputDevice    "fake" "CorePointer" "CoreKeyboard"
    Option         "AutoAddDevices" "false"
EndSection

Section "Files"
    ModulePath      "%%LOCALBASE%%/lib/xorg/modules-NVIDIA"
    ModulePath      "%%LOCALBASE%%/lib/xorg/modules"
EndSection

Section "Module"
    Load           "dri3"
    Load           "glx"
    Disable        "efifb"
EndSection

Section "InputDevice"
    Identifier     "fake"
    Driver         ""
EndSection

Section "Monitor"
    Identifier     "Monitor0"
EndSection

Section "Device"
    Identifier     "Device0"
    Driver         "nvidia"
EndSection

Section "Screen"
    Identifier     "Screen0"
    Device         "Device0"
    Monitor        "Monitor0"
EndSection


Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/etc/nvidia-headless.conf.in (+1 lines)
1	NVDISPLAY=:8

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/etc/nvidia-hybrid.conf.in (+1 lines)
1	VGLRUN=%%VGLRUN%%

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/libexec/nvidia-headless-utils/readconf.in (+5 lines)
1	while IFS== read -r _var _val ; do
2	expr "$_var" : '[a-zA-Z][a-zA-Z0-9_]*$' >&- && \
3	eval [ -z \${$_var+UNSET} ] '&&' $_var="\$_val" '\|\|' true \|\| \
4	printf %s\\n "$conf: $_var: bad variable name" >&2
5	done < "$conf" ; unset _var _val

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/libexec/nvidia-settings-hybrid.in (+4 lines)
1	#!/bin/sh
2	conf=%%PREFIX%%/etc/nvidia-headless.conf
3	. %%PREFIX%%/libexec/nvidia-headless-utils/readconf
4	exec nvrun-vgl %%LOCALBASE%%/libexec/nvidia-settings -c "$NVDISPLAY" "$@"

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/pkg-descr (+8 lines)
1	This port integrates the Nvidia graphics driver and supporting utilities with
2	VirtualGL, enabling use of Nvidia acceleration on a system with hybrid graphics
3	hardware configuration, aka "Optimus".
4
5	Applications to be run with Nvidia acceleration should be started using
6	`nvrun-vgl`.
7
8	WWW: https://github.com/therontarigo/freebsd-gpu-headless

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/pkg-plist (+11 lines)
1	bin/Xorg-nvidia-headless
2	bin/nvidia-headless-xconfig
3	bin/nvrun
4	libexec/nvidia-headless-utils/readconf
5	%%VIRTUALGL%%bin/nvrun-vgl
6	%%OPTIRUN%%bin/optirun
7	libexec/nvidia-settings-hybrid
8	@sample etc/X11/xorg-nvidia-headless-template.conf.sample
9	@sample etc/nvidia-headless.conf.sample
10	@sample etc/nvidia-hybrid.conf.sample
11	@dir etc/X11/xorg-nvidia-headless.conf.d

Added Link Here

(-)b/x11/nvidia-secondary-driver-390/Makefile (+6 lines)
1	# Created by: Theron Tarigo <theron.tarigo@gmail.com>
2
3	MASTERDIR= ${.CURDIR}/../nvidia-driver-390
4	NVSDR_MASTERDIR= ${.CURDIR}/../nvidia-secondary-driver
5
6	.include "${NVSDR_MASTERDIR}/Makefile"




# Created by: Theron Tarigo <theron.tarigo@gmail.com>

PORTNAME=	nvidia-secondary-driver
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION=	0

MASTERDIR?=	${.CURDIR}/../nvidia-driver

MAINTAINER=     theron.tarigo@gmail.com
COMMENT=        NVidia graphics card binary drivers for hardware OpenGL rendering on secondary device

CONFLICTS_INSTALL=	nvidia-driver

EXTENSIONSDIR=	lib/xorg/modules-NVIDIA/extensions

LIBGLDIR=	lib/libGL-NVIDIA

SUB_FILES=	pkg-message

.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/x11/nvidia-secondary-driver/pkg-message (+4 lines)
1	Utilization of this driver for GLX acceleration requires special configuration
2	of an Xorg server instance.
3
4	x11/nvidia-hybrid-graphics is provided to handle this configuration.

Lines 27-37 Link Here

(-)b/x11/nvidia-settings/Makefile (+7 lines)
27	GH_ACCOUNT= NVIDIA	27	GH_ACCOUNT= NVIDIA
28		28
29	PLIST_FILES= bin/nvidia-settings \	29	PLIST_FILES= bin/nvidia-settings \
		30	libexec/nvidia-settings \
30	man/man1/nvidia-settings.1.gz \	31	man/man1/nvidia-settings.1.gz \
31	lib/libnvidia-gtk2.so.${PORTVERSION} \	32	lib/libnvidia-gtk2.so.${PORTVERSION} \
32	share/applications/nvidia-settings.desktop \	33	share/applications/nvidia-settings.desktop \
33	share/pixmaps/nvidia-settings.png	34	share/pixmaps/nvidia-settings.png
34		35
		36	SUB_FILES= nvidia-settings
		37
35	LDFLAGS+= -pthread	38	LDFLAGS+= -pthread
36	LLD_UNSAFE= yes	39	LLD_UNSAFE= yes
37	MAKE_ENV= NV_USE_BUNDLED_LIBJANSSON=0 \	40	MAKE_ENV= NV_USE_BUNDLED_LIBJANSSON=0 \
Lines 56-60 Link Here
56	${STAGEDIR}/${DESKTOPDIR}	59	${STAGEDIR}/${DESKTOPDIR}
57	${INSTALL_DATA} ${WRKSRC}/doc/nvidia-settings.png \	60	${INSTALL_DATA} ${WRKSRC}/doc/nvidia-settings.png \
58	${STAGEDIR}/${PREFIX}/share/pixmaps	61	${STAGEDIR}/${PREFIX}/share/pixmaps
		62	${MV} ${STAGEDIR}${PREFIX}/bin/nvidia-settings \
		63	${STAGEDIR}${PREFIX}/libexec/nvidia-settings
		64	${INSTALL} ${WRKDIR}/nvidia-settings \
		65	${STAGEDIR}${PREFIX}/bin/nvidia-settings
59		66
60	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Added Link Here

(-)b/x11/nvidia-settings/files/nvidia-settings.in (+3 lines)
1	#!/bin/sh
2	[ -e "%%LOCALBASE%%/libexec/nvidia-settings-hybrid" ] && exec %%LOCALBASE%%/libexec/nvidia-settings-hybrid "$@"
3	exec %%PREFIX%%/libexec/nvidia-settings "$@"

Return to bug 192617

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/Makefile (+78 lines)
1	# Created by: Theron Tarigo <theron.tarigo@gmail.com>
2
3	PORTNAME= nvidia-hybrid-graphics
4	PORTVERSION= 0.5
5	CATEGORIES= x11
6	MASTER_SITES= # none
7	DISTFILES= # none
8
9	MAINTAINER= theron.tarigo@gmail.com
10	COMMENT= NVIDIA secondary GPU configuration - Optimus Technology support
11
12	LICENSE= BSD2CLAUSE
13
14	RUN_DEPENDS= nvidia-xconfig:x11/nvidia-xconfig \
15	${LOCALBASE}/bin/Xorg:x11-servers/xorg-server
16
17	FLAVORS= default 390
18
19	NO_ARCH= yes
20	NO_BUILD= yes
21	WRKSRC= ${WRKDIR}/src
22
23	default_RUN_DEPENDS= \
24	nvidia-secondary-driver>=440.64:x11/nvidia-secondary-driver
25	390_RUN_DEPENDS= \
26	nvidia-secondary-driver-390>=390.87:x11/nvidia-secondary-driver-390
27
28	VIRTUALGL_RUN_DEPENDS= ${LOCALBASE}/VirtualGL/bin/vglrun:x11/virtualgl
29
30	390_PKGNAMESUFFIX= -390
31
32	OPTIONS_DEFINE= VIRTUALGL OPTIRUN
33	OPTIONS_DEFAULT= VIRTUALGL OPTIRUN
34	OPTIONS_SUB= OPTIRUN
35	VIRTUALGL_DESC= Use VirtualGL for OpenGL redirection support
36	OPTIRUN_DESC= Install "optirun" alias for nvrun-vgl
37	OPTIRUN_IMPLIES= VIRTUALGL
38
39	scripts= \
40	bin/Xorg-nvidia-headless \
41	bin/nvidia-headless-xconfig \
42	bin/nvrun \
43	bin/nvrun-vgl \
44	libexec/nvidia-headless-utils/readconf \
45	libexec/nvidia-settings-hybrid
46	configs= \
47	etc/X11/xorg-nvidia-headless-template.conf \
48	etc/nvidia-headless.conf \
49	etc/nvidia-hybrid.conf \
50
51	SUB_FILES= pkg-message ${scripts:%=src/%} ${configs:%=src/%}
52	SUB_LIST+= VGLRUN=${LOCALBASE}/VirtualGL/bin/vglrun
53
54	USE_RC_SUBR= nvidia_xorg
55
56	do-extract:
57	.for f in ${SUB_FILES}
58	${MKDIR} ${WRKDIR}/${f:H}
59	.endfor
60
61	do-install:
62	.for f in ${scripts}
63	@${MKDIR} ${STAGEDIR}${PREFIX}/${f:H}
64	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${f}
65	.endfor
66	.for f in ${configs}
67	@${MKDIR} ${STAGEDIR}${PREFIX}/${f:H}
68	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${f}.sample
69	.endfor
70
71	post-install:
72	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg-nvidia-headless.conf.d
73
74	post-install-OPTIRUN-on:
75	@${RLN} ${STAGEDIR}${PREFIX}/bin/nvrun-vgl \
76	${STAGEDIR}${PREFIX}/bin/optirun
77
78	.include <bsd.port.mk>

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/nvidia_xorg.in (+48 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: nvidia_xorg
6	# REQUIRE: LOGIN
7	# KEYWORD: shutdown
8
9	. /etc/rc.subr
10
11	name=nvidia_xorg
12	rcvar=nvidia_xorg_enable
13	desc="Nvidia GPU Dedicated Xorg"
14
15	load_rc_config $name
16
17	: ${nvidia_xorg_enable:=NO}
18	: ${nvidia_modeset:=NO}
19	: ${nvidia_manage_kld:=YES}
20
21	command=/usr/sbin/daemon
22	pidfile=/var/run/${name}.pid
23	procname="%%LOCALBASE%%/bin/Xorg"
24	command_args="-p ${pidfile} -f %%PREFIX%%/bin/Xorg-nvidia-headless"
25	start_precmd="${name}_prestart"
26	stop_postcmd="${name}_poststop"
27
28	if checkyesno nvidia_modeset; then
29	kmod=nvidia-modeset
30	else
31	kmod=nvidia
32	fi
33
34	nvidia_xorg_prestart()
35	{
36	if checkyesno nvidia_manage_kld; then
37	kldload -n ${kmod} \|\| return 1
38	fi
39	}
40
41	nvidia_xorg_poststop()
42	{
43	if checkyesno nvidia_manage_kld; then
44	kldunload -f ${kmod} \|\| return 1
45	fi
46	}
47
48	run_rc_command "$1"

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/pkg-message.in (+24 lines)
1	Running Xorg-nvidia-headless at startup is recommended especially on mobile
2	systems since leaving Nvidia GPU powered on with no Xorg may consume
3	significantly more power.
4
5	# sysrc nvidia_xorg_enable=YES
6	# service nvidia_xorg start
7
8	The Xorg instance uses separate configuration files from the defaults for Xorg:
9
10	%%PREFIX%%/etc/X11/xorg-nvidia-headless.conf.d/
11
12	%%PREFIX%%/etc/X11/xorg-nvidia-headless-template.conf
13	Only used if xorg-nvidia-headless.conf does not exist.
14	This file is passed through nvidia-xconfig, which does not preserve
15	all options.
16
17	%%PREFIX%%/etc/X11/xorg-nvidia-headless.conf
18	Created by manually invoking %%PREFIX%%/bin/nvidia-headless-xconfig.
19	Once created, this configuration is not passed through nvidia-xconfig.
20
21	Configuration is not normally needed for typical OpenGL acceleration usage.
22
23	A properly configured xorg-nvidia-headless.conf will allow Xorg-nvidia-headless
24	to be started by non-superuser if Xorg has been installed setuid.

Added Link Here

(-)b/x11/nvidia-hybrid-graphics/files/src/etc/X11/xorg-nvidia-headless-template.conf.in (+39 lines)
1
2	Section "ServerLayout"
3	Identifier "nvidia"
4	Screen 0 "Screen0"
5	InputDevice "fake" "CorePointer" "CoreKeyboard"
6	Option "AutoAddDevices" "false"
7	EndSection
8
9	Section "Files"
10	ModulePath "%%LOCALBASE%%/lib/xorg/modules-NVIDIA"
11	ModulePath "%%LOCALBASE%%/lib/xorg/modules"
12	EndSection
13
14	Section "Module"
15	Load "dri3"
16	Load "glx"
17	Disable "efifb"
18	EndSection
19
20	Section "InputDevice"
21	Identifier "fake"
22	Driver ""
23	EndSection
24
25	Section "Monitor"
26	Identifier "Monitor0"
27	EndSection
28
29	Section "Device"
30	Identifier "Device0"
31	Driver "nvidia"
32	EndSection
33
34	Section "Screen"
35	Identifier "Screen0"
36	Device "Device0"
37	Monitor "Monitor0"
38	EndSection
39

Added Link Here

(-)b/x11/nvidia-secondary-driver/Makefile (+20 lines)
1	# Created by: Theron Tarigo <theron.tarigo@gmail.com>
2
3	PORTNAME= nvidia-secondary-driver
4	# Explicitly set PORTREVISION as it can be overridden by the master port
5	PORTREVISION= 0
6
7	MASTERDIR?= ${.CURDIR}/../nvidia-driver
8
9	MAINTAINER= theron.tarigo@gmail.com
10	COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering on secondary device
11
12	CONFLICTS_INSTALL= nvidia-driver
13
14	EXTENSIONSDIR= lib/xorg/modules-NVIDIA/extensions
15
16	LIBGLDIR= lib/libGL-NVIDIA
17
18	SUB_FILES= pkg-message
19
20	.include "${MASTERDIR}/Makefile"