mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Add NVIDIA_GL description to Mk/bsd.options.desc.mk

Browse Source 
- Add NVIDIA_GL description to Mk/bsd.options.desc.mk
- Remove NVIDIA_GL_DESC from all concerned ports
- Use options helpers where adequate.

Differential Revision:	https://reviews.freebsd.org/D1759
Approved by: koobs (mentor)
Approved by: portmgr (bapt)
This commit is contained in:
Johannes Jost Meixner 2015-04-05 07:23:49 +00:00
parent 026a6226b8
commit abb03c2e25
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=383259
11 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mk/bsd.options.desc.mk
View File

@ -349,6 +349,7 @@ NOTIFY_DESC?= Desktop notification support
NSS_DESC?= SSL/TLS support via NSS
NTLM_DESC?= NTLM authentication support
NUMPY_DESC?= NumPy mathematical computing support
NVIDIA_GL_DESC?= libGL support via nvidia-driver
OBJC_DESC?= Objective-C language support
ODBC_DESC?= ODBC database backend
ODF_DESC?= Open Document Format (ODF) file support

1
emulators/linux-c6/Makefile
View File

@ -85,7 +85,6 @@ RUN_DEPENDS+= linux-c6-libasyncns>0:${PORTSDIR}/dns/linux-c6-libasyncns \
linux-c6-cairo>0:${PORTSDIR}/graphics/linux-c6-cairo
OPTIONS_DEFINE= NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU

1
emulators/linux-f10/Makefile
View File

@ -91,7 +91,6 @@ RUN_DEPENDS+= linux-f10-libasyncns>0:${PORTSDIR}/dns/linux-f10-libasyncns \
# don't pull in graphics/linux-f10-libGLU -- conflicts with graphics/linux-f10-dri
OPTIONS_DEFINE= NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
NVIDIA_GL_RUN_DEPENDS_OFF= linux-f10-dri>0:${PORTSDIR}/graphics/linux-f10-dri

9
games/linux-doom3-demo/Makefile
View File

@ -29,15 +29,10 @@ SUB_FILES= doom3-demo
SUB_LIST= DOOMDIR="${DOOMDIR}"
OPTIONS_DEFINE= DOCS NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
.include <bsd.port.options.mk>
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
NVIDIA_GL_USE_OFF= linux_apps=dri
.if ${PORT_OPTIONS:MNVIDIA_GL}
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
.else
USE_LINUX_APPS+=dri
.endif
do-extract:
@${MKDIR} ${WRKSRC}

12
games/linux-enemyterritory/Makefile
View File

@ -23,15 +23,9 @@ ETDIR= ${PREFIX}/lib/${PORTNAME}
PATCH_260B_DIR= Enemy Territory 2.60b
OPTIONS_DEFINE= DOCS NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNVIDIA_GL}
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
.else
USE_LINUX_APPS+= dri
.endif
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
NVIDIA_GL_USE_OFF= linux_apps=dri
do-extract:
@${MKDIR} ${WRKSRC}
@ -60,6 +54,8 @@ do-install:
${MKDIR} ${STAGEDIR}${ETDIR}/${DIR}
.endfor
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
${RMDIR} ${WRKSRC}/Docs/Help/_private

1
games/linux-rtcw/Makefile
View File

@ -27,7 +27,6 @@ PORTSCOUT= skipv:1.41-3
PORTDOCS= *
OPTIONS_DEFINE= DOCS NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
.include <bsd.port.options.mk>

1
games/linux-ut2003-demo/Makefile
View File

@ -35,7 +35,6 @@ LIBDIRS= Animations Benchmark ForceFeedback KarmaData Maps Music \
Sounds StaticMeshes System Textures Web
OPTIONS_DEFINE= DOCS NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver

11
graphics/linux-c6-glx-utils/Makefile
View File

@ -18,8 +18,9 @@ BRANDELF_DIRS= usr/bin
USE_LDCONFIG= yes
OPTIONS_DEFINE= NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
NVIDIA_GL_USE_OFF= linux_apps=dri
PLIST_FILES= usr/bin/glxgears usr/bin/glxinfo \
usr/bin/xdriinfo usr/share/man/man1/xdriinfo.1.gz
@ -28,10 +29,4 @@ PLIST_FILES= usr/bin/glxgears usr/bin/glxinfo \
SRC_DISTFILES= mesa-10.1.2-2.el6.src.rpm
.endif
.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MNVIDIA_GL}
USE_LINUX_APPS+= dri
.endif
.include <bsd.port.mk>

7
net-im/skype-devel/Makefile
View File

@ -14,11 +14,10 @@ COMMENT= P2P VoIP software, development version
CONFLICTS= skype-[0-9]*
OPTIONS_DEFINE= VIDEO NVIDIA_GL
VIDEO_DESC= [broken] Video support
NVIDIA_GL_DESC= libGL provided by NVidia binary drivers
OPTIONS_DEFINE= NVIDIA_GL VIDEO
OPTIONS_DEFAULT= VIDEO
VIDEO_DESC= [broken] Video support
CONFLICTS= skype-1* skype-2.0* skype-2.1*

4
net-im/skype/Makefile
View File

@ -14,9 +14,7 @@ COMMENT= P2P VoIP software
CONFLICTS= skype-devel-[0-9]*
OPTIONS_DEFINE= VIDEO NVIDIA_GL
NVIDIA_GL_DESC= libGL provided by NVidia binary drivers
OPTIONS_DEFINE= NVIDIA_GL VIDEO
OPTIONS_DEFAULT= VIDEO
NO_BUILD= yes

13
x11-toolkits/linux-c6-qt47-x11/Makefile
View File

@ -20,21 +20,16 @@ USE_LDCONFIG= yes
LINUX_DIST_VER= 5
OPTIONS_DEFINE= NVIDIA_GL
NVIDIA_GL_DESC= Use GL driver from nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
NVIDIA_GL_USE_OFF= linux_apps=dri
USE_LINUX_APPS= fontconfig png xorglibs png alsalib jpeg tiff qt47
USE_LINUX_RPM= yes
RPMVERSION= 1_18.el5
LINUX_RPM_ARCH= i386
.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MNVIDIA_GL}
USE_LINUX_APPS+= dri
.endif
DESCR= ${.CURDIR}/../../devel/qt4/pkg-descr
post-patch: