Attachment 198212 Details for Bug 232323 – v1

[patch] v1

glfw.wayland.diff (text/plain), 1.26 KB, created by Jan Beich on 2018-10-16 14:13:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-10-16 14:13:15 UTC

Size: 1.26 KB

patch

obsolete

>From 58b89f3f53a615a7657cf3e09a9da78a9f56b528 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 16 Oct 2018 13:40:21 +0000
>Subject: [PATCH] graphics/glfw: prevent enabling WAYLAND without disabling X11
>
>PR:		232322
>Approved by:	Neel Chauhan (maintainer)
>---
> graphics/glfw/Makefile | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile
>index cadc2abc675e..8acb17c219b9 100644
>--- a/graphics/glfw/Makefile
>+++ b/graphics/glfw/Makefile
>@@ -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/wayland \
> 			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

Actions: View | Diff

Attachments on bug 232323: 198212