Page MenuHomeFreeBSD
Files F168143426

D1759.id3643.diff
No OneTemporary
Actions

D1759.id3643.diff
View Options

Index: Mk/bsd.options.desc.mk
===================================================================
--- Mk/bsd.options.desc.mk
+++ Mk/bsd.options.desc.mk
@@ -345,6 +345,7 @@
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
Index: emulators/linux-c6/Makefile
===================================================================
--- emulators/linux-c6/Makefile
+++ emulators/linux-c6/Makefile
@@ -91,7 +91,6 @@
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
Index: emulators/linux-f10/Makefile
===================================================================
--- emulators/linux-f10/Makefile
+++ emulators/linux-f10/Makefile
@@ -96,7 +96,6 @@
# 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
Index: games/linux-doom3-demo/Makefile
===================================================================
--- games/linux-doom3-demo/Makefile
+++ games/linux-doom3-demo/Makefile
@@ -29,15 +29,11 @@
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}
Index: games/linux-enemyterritory/Makefile
===================================================================
--- games/linux-enemyterritory/Makefile
+++ games/linux-enemyterritory/Makefile
@@ -23,15 +23,9 @@
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 @@
${MKDIR} ${STAGEDIR}${ETDIR}/${DIR}
.endfor
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
${RMDIR} ${WRKSRC}/Docs/Help/_private
Index: games/linux-rtcw/Makefile
===================================================================
--- games/linux-rtcw/Makefile
+++ games/linux-rtcw/Makefile
@@ -27,7 +27,6 @@
PORTDOCS= *
OPTIONS_DEFINE= DOCS NVIDIA_GL
-NVIDIA_GL_DESC= Use GL driver from nvidia-driver
.include <bsd.port.options.mk>
Index: games/linux-ut2003-demo/Makefile
===================================================================
--- games/linux-ut2003-demo/Makefile
+++ games/linux-ut2003-demo/Makefile
@@ -36,7 +36,6 @@
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
Index: graphics/linux-c6-glx-utils/Makefile
===================================================================
--- graphics/linux-c6-glx-utils/Makefile
+++ graphics/linux-c6-glx-utils/Makefile
@@ -18,8 +18,9 @@
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 @@
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>
Index: net-im/skype-devel/Makefile
===================================================================
--- net-im/skype-devel/Makefile
+++ net-im/skype-devel/Makefile
@@ -14,11 +14,10 @@
CONFLICTS= skype-[0-9]*
-OPTIONS_DEFINE= VIDEO NVIDIA_GL
+OPTIONS_DEFINE= NVIDIA_GL VIDEO
+OPTIONS_DEFAULT= VIDEO
VIDEO_DESC= [broken] Video support
-NVIDIA_GL_DESC= libGL provided by NVidia binary drivers
-OPTIONS_DEFAULT= VIDEO
CONFLICTS= skype-1* skype-2.0* skype-2.1*
Index: net-im/skype/Makefile
===================================================================
--- net-im/skype/Makefile
+++ net-im/skype/Makefile
@@ -14,9 +14,7 @@
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
Index: x11-toolkits/linux-c6-qt47-x11/Makefile
===================================================================
--- x11-toolkits/linux-c6-qt47-x11/Makefile
+++ x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -20,21 +20,16 @@
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:

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 2:07 PM (5 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37391672
Default Alt Text
D1759.id3643.diff (6 KB)

Event Timeline