Re-enable glx on OS X.

Upstream disabled glx on OS X (in an apparent attempt to make it build
on systems without X11).  However, libepoxy without glx is defective,
and gtk3 fails with it.  So it seems like the right thing is to ensure
X11 presence for libepoxy.

This patch reverts upstream's disabling of glx (setting configure
variables/defines), making it be like libepoxy 1.2.  The resulting
libepoxy has glx, and gtk3+ builds fine against it on OS X 10.9.

(It remains TBD to sort out how we feel about X vs quartz, but that's
a separable issue.)

Reviewed by ttn@ and tron@.

4 files changed, 40 insertions, 9 deletions

diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index a74af6dd72d..0c659143226 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/09/13 11:38:32 tron Exp $
+# $NetBSD: Makefile,v 1.8 2015/09/14 14:40:37 gdt Exp $
 
 DISTNAME=	libepoxy-1.3.1
+PKGEVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -32,9 +33,14 @@ CONFIGURE_ENV+=		PKGSRC_BUILD_EGL=yes
 CONFIGURE_ENV+=		PKGSRC_BUILD_EGL=no
 .endif
 
+# This could be garbage collected, but it seems likely that there will
+# be more glx issues, so it seems easier to leave it.
 PLIST_VARS+=		glx
 .if ${OPSYS} != "Darwin"
 PLIST.glx=		yes
+.else
+# On Darwin, we patch upstream to enable this.
+PLIST.glx=		yes
 .endif
 
 .include "../../lang/python/tool.mk"
diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo
index cf6f3173b6f..0ae1625707d 100644
--- a/graphics/libepoxy/distinfo
+++ b/graphics/libepoxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/09/13 04:44:48 tnn Exp $
+$NetBSD: distinfo,v 1.5 2015/09/14 14:40:37 gdt Exp $
 
 SHA1 (libepoxy-1.3.1.tar.gz) = 94d98d83a50d2f607ee9986b622a48df00d5926c
 RMD160 (libepoxy-1.3.1.tar.gz) = 1fbdcd713b3b95d7b5fc5dd80b81c4ffcf27214f
 Size (libepoxy-1.3.1.tar.gz) = 284227 bytes
-SHA1 (patch-configure.ac) = bc1870f74ed0cab31df7d23f9673b65d21c873f6
+SHA1 (patch-configure.ac) = 0aa95317a5a3a3b110ff21b6e7754666831f2ca0
 SHA1 (patch-src_dispatch__common.c) = e69b5e5b6f68a95f10ecbbdb8b1c9ab6695fe24c
-SHA1 (patch-src_dispatch__common.h) = a95512892d4f0172366b19246602f00db6c03dc6
+SHA1 (patch-src_dispatch__common.h) = 74e00806fea01cf9de4171707441fa1f39fe5316
diff --git a/graphics/libepoxy/patches/patch-configure.ac b/graphics/libepoxy/patches/patch-configure.ac
index dd4ebf8b76d..cdb8a54eac1 100644
--- a/graphics/libepoxy/patches/patch-configure.ac
+++ b/graphics/libepoxy/patches/patch-configure.ac
@@ -1,10 +1,26 @@
-$NetBSD: patch-configure.ac,v 1.2 2015/09/13 04:44:49 tnn Exp $
+$NetBSD: patch-configure.ac,v 1.3 2015/09/14 14:40:37 gdt Exp $
 
 Override EGL detection.
 
+Revert upstream's disabling of glx on Mac.  See
+https://github.com/anholt/libepoxy/commit/e3051481cc9f5b7b36b317aff1454ee16ea9cdb9
+for context.  We require X11 anyway, and libepoxy without glx is
+defective - in particular, gtk3+ fails to build.
+Not yet reported upstream.
+
 --- configure.ac.orig	2015-07-15 23:46:36.000000000 +0000
 +++ configure.ac
-@@ -85,7 +85,7 @@ case $host_os in
+@@ -77,15 +77,16 @@ case $host_os in
+         AC_SUBST([LOG_COMPILER], [wine])
+         ;;
+     darwin*)
++        # TODO: explain why egl is forced off on Darwin
+         build_egl=no
+-        build_glx=no
++        build_glx=yes
+         build_wgl=no
+         build_apple=yes
+         has_znow=no
          EPOXY_LINK_LIBS=""
          ;;
      *)
diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.h b/graphics/libepoxy/patches/patch-src_dispatch__common.h
index 24a6d9c6bf8..2f62f480eff 100644
--- a/graphics/libepoxy/patches/patch-src_dispatch__common.h
+++ b/graphics/libepoxy/patches/patch-src_dispatch__common.h
@@ -1,10 +1,19 @@
-$NetBSD: patch-src_dispatch__common.h,v 1.1 2015/06/13 19:13:10 tnn Exp $
+$NetBSD: patch-src_dispatch__common.h,v 1.2 2015/09/14 14:40:37 gdt Exp $
 
 Override EGL detection.
 
---- src/dispatch_common.h.orig	2014-05-14 00:22:08.000000000 +0000
+--- src/dispatch_common.h.orig	2015-07-15 23:46:36.000000000 +0000
 +++ src/dispatch_common.h
-@@ -34,7 +34,12 @@
+@@ -30,7 +30,7 @@
+ #define EPOXY_IMPORTEXPORT __declspec(dllexport)
+ #elif defined(__APPLE__)
+ #define PLATFORM_HAS_EGL 0
+-#define PLATFORM_HAS_GLX 0
++#define PLATFORM_HAS_GLX 1
+ #define PLATFORM_HAS_WGL 0
+ #define EPOXY_IMPORTEXPORT
+ #elif defined(ANDROID)
+@@ -39,7 +39,12 @@
  #define PLATFORM_HAS_WGL 0
  #define EPOXY_IMPORTEXPORT
  #else