Updated libepoxy to 1.4.

This is a new stable release.

Major changes for 1.4 are:

    Epoxy can now build with MSVC versions prior to 2013; we still recommend using a recent, C99-compatible compiler, like MSVC 2015 [Chun-wei Fan]
    When used under X11, Epoxy now attempts to handle the cases where the GLX extension is not built or not available [Yaron Cohen-Tal]
    GLX can now be enabled and disabled at configuration time; this allows building Epoxy with GLX on macOS, and allows building Epoxy without GLX on embedded platforms
    Epoxy now exposes API that lets dependent projects safely check if platform API like GLX and EGL is available at run time
    EGL support has been improved on Windows, and made more resilient on other platforms [Yaron Cohen-Tal, Adam Jackson]
    Epoxy supports building with the Meson build system, which has Ninja, Visual Studio, and XCode backends
    Epoxy can generate its API reference using Doxygen (currently only available on Meson builds)
    The GL registry has been updated with the latest version of the API references provided by Khronos; Epoxy now supports the API introduced by OpenGL 4.5

6 files changed, 25 insertions, 81 deletions

diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 9597afaad3b..11e9e7bcff0 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: Makefile,v 1.17 2017/02/17 15:17:08 wiz Exp $
 
-DISTNAME=	libepoxy-1.3.1
-PKGREVISION=	3
+DISTNAME=	libepoxy-1.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/graphics/libepoxy/PLIST b/graphics/libepoxy/PLIST
index 7019635645e..e59b64b2015 100644
--- a/graphics/libepoxy/PLIST
+++ b/graphics/libepoxy/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/13 11:38:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/02/17 15:17:09 wiz Exp $
+include/epoxy/common.h
 ${PLIST.egl}include/epoxy/egl.h
 ${PLIST.egl}include/epoxy/egl_generated.h
 include/epoxy/gl.h
diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo
index db99020740a..49af2398987 100644
--- a/graphics/libepoxy/distinfo
+++ b/graphics/libepoxy/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2015/11/19 11:46:33 adam Exp $
+$NetBSD: distinfo,v 1.10 2017/02/17 15:17:09 wiz Exp $
 
-SHA1 (libepoxy-1.3.1.tar.gz) = 94d98d83a50d2f607ee9986b622a48df00d5926c
-RMD160 (libepoxy-1.3.1.tar.gz) = 1fbdcd713b3b95d7b5fc5dd80b81c4ffcf27214f
-SHA512 (libepoxy-1.3.1.tar.gz) = 7d83f01bbc6d2387e4e2ec8a94b05d6e7aa6d0513821a794d60544381a18874fa75ec1dfd2585824076708e2848ff8d5dc20e184af65a7cb602e7dfd010aaf53
-Size (libepoxy-1.3.1.tar.gz) = 284227 bytes
-SHA1 (patch-configure.ac) = 9fe6d733c8dc7d7cabbd33d9d030f8e47f804aae
-SHA1 (patch-src_dispatch__common.c) = 1d4bc732dc7ac558726b404d52caca237185880d
-SHA1 (patch-src_dispatch__common.h) = d05bfdb4993dd454ec08df251aee9684310458d1
+SHA1 (libepoxy-1.4.tar.gz) = 55b26174f4b202bfce3cd07d0546efa60cf0c943
+RMD160 (libepoxy-1.4.tar.gz) = 172501a9019a85658e97e25028157b5aa7a97597
+SHA512 (libepoxy-1.4.tar.gz) = b354d64c9d3192a32ba1715a1ac89066315a4b4580acfbbeb7c097864bd68698421a7dd0f6fcef00a852df09c4a9e504d70e9b949f0e45e0ad9f1b195c7bb7fe
+Size (libepoxy-1.4.tar.gz) = 307969 bytes
+SHA1 (patch-configure.ac) = 80ade0c4d7ab7f350d5b4c48c2edba017e712330
+SHA1 (patch-src_dispatch__common.c) = 8ab5351f3ef67cc36aacfc43e7f61e6a7bcc179a
diff --git a/graphics/libepoxy/patches/patch-configure.ac b/graphics/libepoxy/patches/patch-configure.ac
index 6aab9fbd8d3..6c30b4801b0 100644
--- a/graphics/libepoxy/patches/patch-configure.ac
+++ b/graphics/libepoxy/patches/patch-configure.ac
@@ -1,24 +1,16 @@
-$NetBSD: patch-configure.ac,v 1.4 2015/11/19 11:46:33 adam Exp $
+$NetBSD: patch-configure.ac,v 1.5 2017/02/17 15:17:09 wiz Exp $
 
 Override EGL detection.
 On Darwin, build GLX only for X11 configuration.
 
---- configure.ac.orig	2015-07-15 23:46:36.000000000 +0000
+--- configure.ac.orig	2017-02-06 16:00:20.000000000 +0000
 +++ configure.ac
-@@ -78,14 +78,14 @@ case $host_os in
-         ;;
-     darwin*)
-         build_egl=no
--        build_glx=no
-+        build_glx=@BUILD_GLX@
-         build_wgl=no
-         build_apple=yes
-         has_znow=no
-         EPOXY_LINK_LIBS=""
-         ;;
-     *)
--        build_egl=yes
-+        build_egl=@BUILD_EGL@
-         build_glx=yes
-         build_wgl=no
-         # On platforms with dlopen, we load everything dynamically and
+@@ -71,7 +71,7 @@ AS_CASE([$enable_glx],
+   [auto], [
+     AS_CASE([$host_os],
+             [mingw*], [build_glx=no],
+-            [darwin*], [build_glx=no],
++            [darwin*], [build_glx=yes],
+             [android*], [build_glx=no],
+             [build_glx=yes])
+   ],
diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.c b/graphics/libepoxy/patches/patch-src_dispatch__common.c
index 46fe41367b2..c96577832ce 100644
--- a/graphics/libepoxy/patches/patch-src_dispatch__common.c
+++ b/graphics/libepoxy/patches/patch-src_dispatch__common.c
@@ -1,11 +1,10 @@
-$NetBSD: patch-src_dispatch__common.c,v 1.4 2015/10/01 13:50:05 tnn Exp $
+$NetBSD: patch-src_dispatch__common.c,v 1.5 2017/02/17 15:17:09 wiz Exp $
 
 Deal with hardcoded libGL locations and versions.
-Function must return a value if errx not declared with attr noreturn.
 
---- src/dispatch_common.c.orig	2015-07-15 23:46:36.000000000 +0000
+--- src/dispatch_common.c.orig	2017-02-06 16:00:20.000000000 +0000
 +++ src/dispatch_common.c
-@@ -103,11 +103,13 @@
+@@ -174,11 +174,13 @@
  #include "dispatch_common.h"
  
  #ifdef __APPLE__
@@ -20,11 +19,3 @@ Function must return a value if errx not declared with attr noreturn.
  #endif
  
  #ifdef ANDROID
-@@ -672,6 +674,7 @@ epoxy_get_proc_address(const char *name)
- #endif
-     }
-     errx(1, "Couldn't find current GLX or EGL context.\n");
-+    return NULL;
- #endif
- }
- 
diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.h b/graphics/libepoxy/patches/patch-src_dispatch__common.h
deleted file mode 100644
index 99b21bb0235..00000000000
--- a/graphics/libepoxy/patches/patch-src_dispatch__common.h
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_dispatch__common.h,v 1.3 2015/11/19 11:46:33 adam Exp $
-
-Override EGL and GLX detection.
-
---- src/dispatch_common.h.orig	2015-07-15 23:46:36.000000000 +0000
-+++ src/dispatch_common.h
-@@ -22,6 +22,7 @@
-  */
- 
- #include <stdbool.h>
-+#include "config.h"
- 
- #ifdef _WIN32
- #define PLATFORM_HAS_EGL 0
-@@ -30,7 +31,11 @@
- #define EPOXY_IMPORTEXPORT __declspec(dllexport)
- #elif defined(__APPLE__)
- #define PLATFORM_HAS_EGL 0
-+#ifdef BUILD_GLX
-+#define PLATFORM_HAS_GLX 1
-+#else
- #define PLATFORM_HAS_GLX 0
-+#endif
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #elif defined(ANDROID)
-@@ -39,7 +44,11 @@
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #else
-+#ifdef BUILD_EGL
- #define PLATFORM_HAS_EGL 1
-+#else
-+#define PLATFORM_HAS_EGL 0
-+#endif
- #define PLATFORM_HAS_GLX 1
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT