Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Oct 2018 21:39:09 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482624 - head/graphics/glfw
Message-ID:  <201810202139.w9KLd9SM040216@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Oct 20 21:39:08 2018
New Revision: 482624
URL: https://svnweb.freebsd.org/changeset/ports/482624

Log:
  graphics/glfw: prevent enabling WAYLAND without disabling X11
  
  PR:		232323
  Reviewed by:	tobik
  Approved by:	portmgr blanket

Modified:
  head/graphics/glfw/Makefile   (contents, props changed)

Modified: head/graphics/glfw/Makefile
==============================================================================
--- head/graphics/glfw/Makefile	Sat Oct 20 21:38:50 2018	(r482623)
+++ head/graphics/glfw/Makefile	Sat Oct 20 21:39:08 2018	(r482624)
@@ -21,7 +21,11 @@ CMAKE_ON=	BUILD_SHARED_LIBS
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES WAYLAND
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFAULT=X11
+PLATFORM_DESC=	Window creation platform
+OPTIONS_SINGLE=	PLATFORM
+OPTIONS_SINGLE_PLATFORM=	WAYLAND X11
 OPTIONS_EXCLUDE_FreeBSD_10=	WAYLAND # needs dev/evdev/input.h
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
@@ -30,7 +34,8 @@ WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/waylan
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		kde:5 pkgconfig
 WAYLAND_USE=		KDE=ecm
-WAYLAND_USE_OFF=	XORG=x11,xcursor,xinerama,xrandr,xxf86vm
+
+X11_USE=		XORG=x11,xcursor,xinerama,xrandr,xxf86vm
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/html/search



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810202139.w9KLd9SM040216>