Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F140826400
D808.id1713.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D808.id1713.diff
View Options
Index: emulators/linux-c6/Makefile
===================================================================
--- emulators/linux-c6/Makefile
+++ emulators/linux-c6/Makefile
@@ -84,7 +84,14 @@
linux-c6-png>0:${PORTSDIR}/graphics/linux-c6-png \
linux-c6-tiff>0:${PORTSDIR}/graphics/linux-c6-tiff \
linux-c6-jpeg>0:${PORTSDIR}/graphics/linux-c6-jpeg \
- linux-c6-cairo>0:${PORTSDIR}/graphics/linux-c6-cairo \
- linux-c6-dri>0:${PORTSDIR}/graphics/linux-c6-dri
+ linux-c6-cairo>0:${PORTSDIR}/graphics/linux-c6-cairo
+
+OPTIONS_DEFINE= 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_RUN_DEPENDS_OFF= linux-c6-dri>0:${PORTSDIR}/graphics/linux-c6-dri
.include <bsd.port.mk>
Index: emulators/linux-f10/Makefile
===================================================================
--- emulators/linux-f10/Makefile
+++ emulators/linux-f10/Makefile
@@ -87,7 +87,6 @@
graphics/linux-f10-sdl_ttf>0:${PORTSDIR}/graphics/linux-f10-sdl_ttf \
graphics/linux-f10-jpeg>0:${PORTSDIR}/graphics/linux-f10-jpeg \
graphics/linux-f10-tiff>0:${PORTSDIR}/graphics/linux-f10-tiff \
- graphics/linux-f10-dri>0:${PORTSDIR}/graphics/linux-f10-dri \
graphics/linux-f10-imlib>0:${PORTSDIR}/graphics/linux-f10-imlib \
graphics/linux-f10-ungif>0:${PORTSDIR}/graphics/linux-f10-ungif \
graphics/linux-f10-libmng>0:${PORTSDIR}/graphics/linux-f10-libmng \
@@ -96,4 +95,12 @@
graphics/linux-f10-cairo>0:${PORTSDIR}/graphics/linux-f10-cairo
# 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
+
+.include <bsd.port.options.mk>
+
+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
+
.include <bsd.port.mk>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Dec 29, 12:53 PM (8 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27360142
Default Alt Text
D808.id1713.diff (1 KB)
Attached To
Mode
D808: Make linux metaports conditionally depend on x11/nvidia-driver
Attached
Detach File
Event Timeline
Log In to Comment