Index: Mk/bsd.options.mk =================================================================== --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -124,6 +124,13 @@ # Option enabled -D${content}=false # Option disabled -D${content}=true # +# ${opt}_MESON_YES Will add to MESON_ARGS: +# Option enabled -D${content}=yes +# Option disabled -D${content}=no +# ${opt}_MESON_NO Will add to MESON_ARGS: +# Option enabled -D${content}=no +# Option disabled -D${content}=yes +# # ${opt}_IMPLIES When opt is enabled, options named in IMPLIES will # get enabled too. # ${opt}_PREVENTS When opt is enabled, if any options in PREVENTS are @@ -539,6 +546,12 @@ . if defined(${opt}_MESON_FALSE) MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} . endif +. if defined(${opt}_MESON_YES) +MESON_ARGS+= ${${opt}_MESON_YES:C/.*/-D&=yes/} +. endif +. if defined(${opt}_MESON_NO) +MESON_ARGS+= ${${opt}_MESON_NO:C/.*/-D&=no/} +. endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_ON) ${configure}_ARGS+= ${${opt}_${configure}_ON} @@ -594,6 +607,12 @@ . endif . if defined(${opt}_MESON_FALSE) MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=true/} +. endif +. if defined(${opt}_MESON_YES) +MESON_ARGS+= ${${opt}_MESON_YES:C/.*/-D&=no/} +. endif +. if defined(${opt}_MESON_NO) +MESON_ARGS+= ${${opt}_MESON_NO:C/.*/-D&=yes/} . endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_OFF) Index: graphics/libepoxy/Makefile =================================================================== --- graphics/libepoxy/Makefile +++ graphics/libepoxy/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= libepoxy -PORTVERSION= 1.3.1 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 1.4.3 CATEGORIES= graphics +MASTER_SITES= https://github.com/anholt/libepoxy/releases/download/${PORTVERSION}/ MAINTAINER= x11@FreeBSD.org COMMENT= Library to handle OpenGL function pointer management @@ -12,13 +11,23 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USE_GITHUB= yes -GH_ACCOUNT= anholt +USES= localbase meson python:3.3+,build tar:xz +USE_XORG= x11 +USE_GL= gl glesv2 +USE_LDCONFIG= yes -USES= autoreconf libtool pathfix pkgconfig python:build -USE_XORG= xorg-macros x11 -USE_GL= egl glesv2 -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +OPTIONS_SUB= yes +OPTIONS_DEFINE= EGL +OPTIONS_DEFAULT=EGL + +OPTIONS_EXCLUDE_sparc64= EGL +OPTIONS_EXCLUDE_mips= EGL + +EGL_DESC= Build EGL support +EGL_USE= GL=egl +EGL_MESON_YES= enable-egl + +#EGL_MESON_ON= -Denable-egl=yes +#EGL_MESON_OFF= -Denable-egl=no .include Index: graphics/libepoxy/distinfo =================================================================== --- graphics/libepoxy/distinfo +++ graphics/libepoxy/distinfo @@ -1,2 +1,3 @@ -SHA256 (anholt-libepoxy-v1.3.1_GH0.tar.gz) = 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4 -SIZE (anholt-libepoxy-v1.3.1_GH0.tar.gz) = 284227 +TIMESTAMP = 1496777736 +SHA256 (libepoxy-1.4.3.tar.xz) = 0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6 +SIZE (libepoxy-1.4.3.tar.xz) = 783624 Index: graphics/libepoxy/files/patch-test_dlwrap.c =================================================================== --- /dev/null +++ graphics/libepoxy/files/patch-test_dlwrap.c @@ -0,0 +1,11 @@ +--- test/dlwrap.c.orig 2017-03-28 08:56:46 UTC ++++ test/dlwrap.c +@@ -34,6 +34,8 @@ + + /* dladdr is a glibc extension */ + #define _GNU_SOURCE ++/* FreeBSD needs this to make asprintf() and dlvsym() visible */ ++#define __BSD_VISIBLE 1 + #include + + #include Index: graphics/libepoxy/pkg-plist =================================================================== --- graphics/libepoxy/pkg-plist +++ graphics/libepoxy/pkg-plist @@ -1,5 +1,6 @@ -include/epoxy/egl.h -include/epoxy/egl_generated.h +include/epoxy/common.h +%%EGL%%include/epoxy/egl.h +%%EGL%%include/epoxy/egl_generated.h include/epoxy/gl.h include/epoxy/gl_generated.h include/epoxy/glx.h