Update to libepoxy-1.3.1 (2015-07-16)

Changes:
GL API registry update
fixes for a nonconformant GL implementation
some library size reductions
support reproducible builds

4 files changed, 16 insertions, 35 deletions

diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 83b5a06a567..35934c64274 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/06/14 21:50:07 prlw1 Exp $
+# $NetBSD: Makefile,v 1.6 2015/09/13 04:44:48 tnn Exp $
 
-DISTNAME=	libepoxy-1.2
-PKGREVISION=	2
+DISTNAME=	libepoxy-1.3.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo
index 5afe931ecd8..cf6f3173b6f 100644
--- a/graphics/libepoxy/distinfo
+++ b/graphics/libepoxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/06/14 21:50:07 prlw1 Exp $
+$NetBSD: distinfo,v 1.4 2015/09/13 04:44:48 tnn Exp $
 
-SHA1 (libepoxy-1.2.tar.gz) = e700520711b9e4fa07c286aa36e431d8ad4133f5
-RMD160 (libepoxy-1.2.tar.gz) = fc5c11eacb437b437c4d6b185a79dc1d6a4467df
-Size (libepoxy-1.2.tar.gz) = 267110 bytes
-SHA1 (patch-configure.ac) = 6651693923d0384806a400e54c9dcec8553f06c4
-SHA1 (patch-src_dispatch__common.c) = 09132e4da31ff799563e2f7aae0b1af42a87701f
+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-src_dispatch__common.c) = e69b5e5b6f68a95f10ecbbdb8b1c9ab6695fe24c
 SHA1 (patch-src_dispatch__common.h) = a95512892d4f0172366b19246602f00db6c03dc6
diff --git a/graphics/libepoxy/patches/patch-configure.ac b/graphics/libepoxy/patches/patch-configure.ac
index d61cbe1d9e1..dd4ebf8b76d 100644
--- a/graphics/libepoxy/patches/patch-configure.ac
+++ b/graphics/libepoxy/patches/patch-configure.ac
@@ -1,27 +1,9 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/06/13 19:13:10 tnn Exp $
+$NetBSD: patch-configure.ac,v 1.2 2015/09/13 04:44:49 tnn Exp $
 
 Override EGL detection.
 
---- configure.ac.orig	2014-05-14 00:22:08.000000000 +0000
+--- configure.ac.orig	2015-07-15 23:46:36.000000000 +0000
 +++ configure.ac
-@@ -62,7 +62,7 @@ has_znow=yes
- 
- case $host_os in
-     mingw*)
--        build_egl=no
-+        build_egl=${PKGSRC_BUILD_EGL}
-         build_glx=no
-         build_wgl=yes
-         # On windows, the DLL has to have all of its functions
-@@ -77,7 +77,7 @@ case $host_os in
-         AC_SUBST([LOG_COMPILER], [wine])
-         ;;
-     darwin*)
--        build_egl=no
-+        build_egl=${PKGSRC_BUILD_EGL}
-         build_glx=yes
-         build_wgl=no
-         build_apple=yes
 @@ -85,7 +85,7 @@ case $host_os in
          EPOXY_LINK_LIBS=""
          ;;
diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.c b/graphics/libepoxy/patches/patch-src_dispatch__common.c
index 82002127d71..bfd090a460c 100644
--- a/graphics/libepoxy/patches/patch-src_dispatch__common.c
+++ b/graphics/libepoxy/patches/patch-src_dispatch__common.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_dispatch__common.c,v 1.1 2015/06/14 21:50:07 prlw1 Exp $
+$NetBSD: patch-src_dispatch__common.c,v 1.2 2015/09/13 04:44:49 tnn Exp $
 
 Native X has /usr/X11R7/lib/libGL.so.2.
 
---- src/dispatch_common.c.orig	2014-05-14 00:22:08.000000000 +0000
+--- src/dispatch_common.c.orig	2015-07-15 23:46:36.000000000 +0000
 +++ src/dispatch_common.c
-@@ -105,7 +105,7 @@
- #ifdef __APPLE__
- #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
+@@ -107,7 +107,7 @@
+ #elif defined(ANDROID)
+ #define GLX_LIB "libGLESv2.so"
  #else
 -#define GLX_LIB "libGL.so.1"
 +#define GLX_LIB "libGL.so"
  #endif
  
- struct api {
+ #ifdef ANDROID