Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Jun 2020 13:56:58 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538741 - head/graphics/libepoxy
Message-ID:  <202006141356.05EDuwtB074519@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Sun Jun 14 13:56:57 2020
New Revision: 538741
URL: https://svnweb.freebsd.org/changeset/ports/538741

Log:
  graphics/libepoxy: Make x11 support an option
  
  Make X11 support in graphics/libepoxy an option, default to on.  This makes
  it possible to build libepoxy with only wayland support.
  
  PR:		245510
  Submitted by:	Greg V (with minor changes)
  Reviewed by:	jbiech

Modified:
  head/graphics/libepoxy/Makefile
  head/graphics/libepoxy/pkg-plist

Modified: head/graphics/libepoxy/Makefile
==============================================================================
--- head/graphics/libepoxy/Makefile	Sun Jun 14 13:56:55 2020	(r538740)
+++ head/graphics/libepoxy/Makefile	Sun Jun 14 13:56:57 2020	(r538741)
@@ -10,11 +10,20 @@ COMMENT=	Library to handle OpenGL function pointer man
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gl localbase meson pkgconfig python:3.3+,build xorg
+USES=		gl localbase meson pkgconfig python:3.3+,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	anholt
-USE_XORG=	x11
-USE_GL=		gl glesv2 egl
+USE_GL=		glesv2 egl
 USE_LDCONFIG=	yes
+
+OPTIONS_DEFINE=		X11
+OPTIONS_DEFAULT=	X11
+OPTIONS_SUB=		yes
+
+X11_USES=		xorg
+X11_USE=		GL=gl XORG=x11
+X11_MESON_YES=		glx
+X11_MESON_TRUE=		x11
+X11_CFLAGS_OFF=		-DEGL_NO_X11
 
 .include <bsd.port.mk>

Modified: head/graphics/libepoxy/pkg-plist
==============================================================================
--- head/graphics/libepoxy/pkg-plist	Sun Jun 14 13:56:55 2020	(r538740)
+++ head/graphics/libepoxy/pkg-plist	Sun Jun 14 13:56:57 2020	(r538741)
@@ -3,8 +3,8 @@ include/epoxy/egl.h
 include/epoxy/egl_generated.h
 include/epoxy/gl.h
 include/epoxy/gl_generated.h
-include/epoxy/glx.h
-include/epoxy/glx_generated.h
+%%X11%%include/epoxy/glx.h
+%%X11%%include/epoxy/glx_generated.h
 lib/libepoxy.so
 lib/libepoxy.so.0
 lib/libepoxy.so.0.0.0



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