Page MenuHomeFreeBSD
Differential D22521 Diff 87327 x11/nvidia-driver/Makefile

Changeset View

Standalone View

View Options

x11/nvidia-driver/Makefile

Context not available.
# slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340', # slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340',
# or `x11/nvidia-driver-304'). # or `x11/nvidia-driver-304').
PORTNAME= nvidia-driver PORTNAME?= nvidia-driver
DISTVERSION?= 460.67 DISTVERSION?= 460.67
pete_nomadlogic.orgUnsubmitted
Not Done
Inline Actions

DISTVERSION upstream has been bumped to 460.80 so the patch needs to be updated or resync'd to ensure the portname change gets picked up.

pete_nomadlogic.org: DISTVERSION upstream has been bumped to 460.80 so the patch needs to be updated or resync'd to…
# Always try to set PORTREVISION as it can be overridden by the slave ports # Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?= 0 PORTREVISION?= 0
Context not available.
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= danfe@FreeBSD.org MAINTAINER?= danfe@FreeBSD.org
COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering COMMENT?= NVidia graphics card binary drivers for hardware OpenGL rendering
LICENSE_FILE= ${WRKSRC}/doc/license.txt LICENSE_FILE= ${WRKSRC}/doc/license.txt
.include "${.CURDIR}/../nvidia-driver/Makefile.common" .include "${.CURDIR}/../nvidia-driver/Makefile.common"
Context not available.
MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \ MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \
EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \ EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}
SUB_FILES= pkg-message nvidia.conf SUB_FILES= pkg-message
.if !defined(LIBGLDIR)
SUB_FILES+= nvidia.conf
.endif
.if ${NVVERSION} < 410.057 .if ${NVVERSION} < 410.057
SUB_FILES+= pkg-deinstall pkg-install SUB_FILES+= pkg-deinstall pkg-install
.endif .endif
Context not available.
extra-patch-src-nvidia_pci.c extra-patch-src-nvidia_pci.c
DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
MODULESDIR= lib/xorg/modules MODULESDIR= lib/xorg/modules
EXTENSIONSDIR?= ${MODULESDIR}/extensions/.nvidia
PORTDOCS= * PORTDOCS= *
.if ${NVVERSION} >= 331.013 .if ${NVVERSION} >= 331.013
danfeUnsubmitted
Done
Inline Actions

Why hiding the directory?

danfe: Why hiding the directory?
theron.tarigo_gmail.comAuthorUnsubmitted
Done
Inline Actions

This is the existing implementation, both x11/nvidia-driver and x11-servers/xorg-server's install script know about this directory. I merely refactored it to its own variable so nvidia-secondary-driver may override it.
It is moot for the 4xx drivers since 410.057, but still needed for -390 legacy drivers.

theron.tarigo_gmail.com: This is the existing implementation, both x11/nvidia-driver and x11-servers/xorg-server's…
Context not available.
.endif .endif
PLIST_SUB+= MODULESDIR=${MODULESDIR} PLIST_SUB+= MODULESDIR=${MODULESDIR}
.if ${NVVERSION} < 410.057
PLIST_SUB+= EXTENSIONSDIR=${EXTENSIONSDIR}
.else
PLIST_SUB+= EXTENSIONSDIR="@comment "
.endif
.if defined(LIBGLDIR)
PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
danfeUnsubmitted
Done
Inline Actions

In ports, it should be spelled as .if defined(LIBGLDIR).

danfe: In ports, it should be spelled as `.if defined(LIBGLDIR)`.
.else
PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP=""
.endif
.if ${PORTNAME} != nvidia-secondary-driver
CONFLICTS_INSTALL+= nvidia-secondary-driver
danfeUnsubmitted
Done
Inline Actions

Separate NO_LIBMAP thingy looks redundant as it's always aligned LIBGLDIR, no?

danfe: Separate `NO_LIBMAP` thingy looks redundant as it's always aligned `LIBGLDIR`, no?
.endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
Context not available.
${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so ${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
.endif .endif
# Configuration of Nvidia as secondary GPU requires preserving Mesa libraries
danfeUnsubmitted
Done
Inline Actions

Ditto.

danfe: Ditto.
# as default implementation; a libmap must not override in this case.
.if !defined(LIBGLDIR)
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
${INSTALL_DATA} ${WRKDIR}/nvidia.conf \ ${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
${STAGEDIR}${PREFIX}/etc/libmap.d/ ${STAGEDIR}${PREFIX}/etc/libmap.d/
.else
danfeUnsubmitted
Done
Inline Actions

Ditto.

danfe: Ditto.
# libgl proxies require a library path containing unrenamed lib*GL*.so
${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
.endif
# Configuration of Nvidia as secondary GPU requires preserving xorg-server's
# libglx.so and moving Nvidia's glx to where it can be found by a secondary
# Xorg instance.
# Not needed since 410.057: Nvidia driver finds libglxserver_nvidia.so instead.
.if ${NVVERSION} < 410.057
.if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
${MKDIR} ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}
${MV} ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions/.nvidia/* \
${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}/
danfeUnsubmitted
Done
Inline Actions

Superfluous blank line.

danfe: Superfluous blank line.
.endif
.endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>
Context not available.