svn commit: r369028 - in head/emulators: linux-c6 linux-f10

[Johannes Jost Meixner]

Author: xmj
Date: Tue Sep 23 10:50:14 2014
New Revision: 369028
URL: http://svnweb.freebsd.org/changeset/ports/369028
QAT: https://qat.redports.org/buildarchive/r369028/

Log:
  Add NVIDIA_GL option to fix conflicts with Linux DRI
  
  linux-c6/f10 metaports pull in their respective dri implementation, which
  conflicts with nvidia-driver's libGL. Resolve this by adding an option for it,
  and conditionally pull in either Linux DRI, or the NVIDIA driver.
  Note: users of nvidia-driver will have to use ports for now.
  
  PR:		193832
  Differential Revision:	https://reviews.freebsd.org/D808
  Submitted by:	Admir Mehic (admir at mehic.at)
  Approved by:	koobs (mentor)

Modified:
  head/emulators/linux-c6/Makefile
  head/emulators/linux-f10/Makefile

Modified: head/emulators/linux-c6/Makefile
==============================================================================
--- head/emulators/linux-c6/Makefile	Tue Sep 23 10:32:36 2014	(r369027)
+++ head/emulators/linux-c6/Makefile	Tue Sep 23 10:50:14 2014	(r369028)
@@ -84,7 +84,12 @@ RUN_DEPENDS+=	linux-c6-libasyncns>0:${PO
 		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
+
+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>

Modified: head/emulators/linux-f10/Makefile
==============================================================================
--- head/emulators/linux-f10/Makefile	Tue Sep 23 10:32:36 2014	(r369027)
+++ head/emulators/linux-f10/Makefile	Tue Sep 23 10:50:14 2014	(r369028)
@@ -87,7 +87,6 @@ RUN_DEPENDS+=	dns/linux-f10-libasyncns>0
 		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,10 @@ RUN_DEPENDS+=	dns/linux-f10-libasyncns>0
 		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
+
+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>