From 812d97d68fb3ed68f6e5852dbfb041f79fe712e0 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 6 Oct 2018 21:20:14 +0300
Subject: [PATCH] libepoxy: update to 1.5.3

---
 x11-packages/libepoxy/build.sh                |  5 ++--
 .../libepoxy/libepoxy-1.5.2_epoxy.pc.in.patch |  9 -------
 ...libepoxy-1.5.2_src_dispatch_common.c.patch | 12 ---------
 .../libepoxy/libepoxy-1.5.3_epoxy.pc.in.patch |  9 +++++++
 .../libepoxy/libepoxy-1.5.3_meson.build.patch | 20 +++++++++++++++
 .../libepoxy-1.5.3_meson_options.txt.patch    | 25 +++++++++++++++++++
 ...libepoxy-1.5.3_src_dispatch_common.c.patch | 15 +++++++++++
 7 files changed, 71 insertions(+), 24 deletions(-)
 delete mode 100644 x11-packages/libepoxy/libepoxy-1.5.2_epoxy.pc.in.patch
 delete mode 100644 x11-packages/libepoxy/libepoxy-1.5.2_src_dispatch_common.c.patch
 create mode 100644 x11-packages/libepoxy/libepoxy-1.5.3_epoxy.pc.in.patch
 create mode 100644 x11-packages/libepoxy/libepoxy-1.5.3_meson.build.patch
 create mode 100644 x11-packages/libepoxy/libepoxy-1.5.3_meson_options.txt.patch
 create mode 100644 x11-packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch

diff --git a/x11-packages/libepoxy/build.sh b/x11-packages/libepoxy/build.sh
index 5f4ac483a..72c156053 100644
--- a/x11-packages/libepoxy/build.sh
+++ b/x11-packages/libepoxy/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 
 TERMUX_PKG_HOMEPAGE=https://github.com/anholt/libepoxy
 TERMUX_PKG_DESCRIPTION="Library handling OpenGL function pointer management"
-TERMUX_PKG_VERSION=1.5.2
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_VERSION=1.5.3
 TERMUX_PKG_SRCURL=https://github.com/anholt/libepoxy/releases/download/${TERMUX_PKG_VERSION}/libepoxy-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8
+TERMUX_PKG_SHA256=002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
 TERMUX_PKG_DEPENDS="mesa"
 
 termux_step_pre_configure () {
diff --git a/x11-packages/libepoxy/libepoxy-1.5.2_epoxy.pc.in.patch b/x11-packages/libepoxy/libepoxy-1.5.2_epoxy.pc.in.patch
deleted file mode 100644
index d83430458..000000000
--- a/x11-packages/libepoxy/libepoxy-1.5.2_epoxy.pc.in.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr libepoxy-1.5.2/epoxy.pc.in libepoxy-1.5.2.mod/epoxy.pc.in
---- libepoxy-1.5.2/epoxy.pc.in	2018-02-23 18:05:50.000000000 +0200
-+++ libepoxy-1.5.2.mod/epoxy.pc.in	2018-06-22 19:48:58.384419880 +0300
-@@ -13,4 +13,4 @@
- Cflags: -I${includedir}
- Libs: -L${libdir} -lepoxy
- Libs.private: @DLOPEN_LIBS@
--Requires.private: @GL_REQS@
-+Requires.private: gl
diff --git a/x11-packages/libepoxy/libepoxy-1.5.2_src_dispatch_common.c.patch b/x11-packages/libepoxy/libepoxy-1.5.2_src_dispatch_common.c.patch
deleted file mode 100644
index eb91742ab..000000000
--- a/x11-packages/libepoxy/libepoxy-1.5.2_src_dispatch_common.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr libepoxy-1.5.2/src/dispatch_common.c libepoxy-1.5.2.mod/src/dispatch_common.c
---- libepoxy-1.5.2/src/dispatch_common.c	2018-05-14 14:49:17.000000000 +0300
-+++ libepoxy-1.5.2.mod/src/dispatch_common.c	2018-06-22 19:50:14.587757143 +0300
-@@ -177,7 +177,7 @@
- #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
- #define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
- #elif defined(__ANDROID__)
--#define GLX_LIB "libGLESv2.so"
-+#define GLX_LIB "libGL.so"
- #else
- #define GLVND_GLX_LIB "libGLX.so.1"
- #define GLX_LIB "libGL.so.1"
diff --git a/x11-packages/libepoxy/libepoxy-1.5.3_epoxy.pc.in.patch b/x11-packages/libepoxy/libepoxy-1.5.3_epoxy.pc.in.patch
new file mode 100644
index 000000000..82766c92f
--- /dev/null
+++ b/x11-packages/libepoxy/libepoxy-1.5.3_epoxy.pc.in.patch
@@ -0,0 +1,9 @@
+diff -uNr libepoxy-1.5.3/epoxy.pc.in libepoxy-1.5.3.mod/epoxy.pc.in
+--- libepoxy-1.5.3/epoxy.pc.in	2018-10-05 02:40:48.000000000 +0300
++++ libepoxy-1.5.3.mod/epoxy.pc.in	2018-10-06 21:07:20.967823671 +0300
+@@ -13,4 +13,4 @@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lepoxy
+ Libs.private: @DLOPEN_LIBS@
+-Requires.private: @GL_REQS@
++Requires.private: gl
diff --git a/x11-packages/libepoxy/libepoxy-1.5.3_meson.build.patch b/x11-packages/libepoxy/libepoxy-1.5.3_meson.build.patch
new file mode 100644
index 000000000..2fdae464f
--- /dev/null
+++ b/x11-packages/libepoxy/libepoxy-1.5.3_meson.build.patch
@@ -0,0 +1,20 @@
+diff -uNr libepoxy-1.5.3/meson.build libepoxy-1.5.3.mod/meson.build
+--- libepoxy-1.5.3/meson.build	2018-10-05 02:40:48.000000000 +0300
++++ libepoxy-1.5.3.mod/meson.build	2018-10-06 21:13:18.854247131 +0300
+@@ -36,7 +36,7 @@
+ # support on Linux and Unix
+ enable_glx = get_option('glx')
+ if enable_glx == 'auto'
+-  build_glx = not ['windows', 'darwin', 'android', 'haiku'].contains(host_system)
++  build_glx = not ['windows', 'darwin', 'haiku'].contains(host_system)
+ else
+   build_glx = enable_glx == 'yes'
+ endif
+@@ -211,6 +211,7 @@
+ wgl_registry = files('registry/wgl.xml')
+ 
+ libepoxy_inc = [
++  include_directories('@TERMUX_PREFIX@/include'),
+   include_directories('include'),
+   include_directories('src'),
+ ]
diff --git a/x11-packages/libepoxy/libepoxy-1.5.3_meson_options.txt.patch b/x11-packages/libepoxy/libepoxy-1.5.3_meson_options.txt.patch
new file mode 100644
index 000000000..feb1c0ef7
--- /dev/null
+++ b/x11-packages/libepoxy/libepoxy-1.5.3_meson_options.txt.patch
@@ -0,0 +1,25 @@
+diff -uNr libepoxy-1.5.3/meson_options.txt libepoxy-1.5.3.mod/meson_options.txt
+--- libepoxy-1.5.3/meson_options.txt	2018-10-05 02:40:48.000000000 +0300
++++ libepoxy-1.5.3.mod/meson_options.txt	2018-10-06 21:10:32.422811017 +0300
+@@ -4,12 +4,12 @@
+ option('glx',
+        type: 'combo',
+        choices: [ 'auto', 'yes', 'no' ],
+-       value: 'auto',
++       value: 'yes',
+        description: 'Enable GLX support')
+ option('egl',
+        type: 'combo',
+        choices: [ 'auto', 'yes', 'no' ],
+-       value: 'auto',
++       value: 'no',
+        description: 'Enable EGL support')
+ option('x11',
+        type: 'boolean',
+@@ -17,5 +17,5 @@
+        description: 'Enable X11 support (GLX or EGL-X11)')
+ option('tests',
+        type: 'boolean',
+-       value: true,
++       value: false,
+        description: 'Build the test suite')
diff --git a/x11-packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch b/x11-packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch
new file mode 100644
index 000000000..f56fd78dd
--- /dev/null
+++ b/x11-packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch
@@ -0,0 +1,15 @@
+diff -uNr libepoxy-1.5.3/src/dispatch_common.c libepoxy-1.5.3.mod/src/dispatch_common.c
+--- libepoxy-1.5.3/src/dispatch_common.c	2018-10-05 02:40:48.000000000 +0300
++++ libepoxy-1.5.3.mod/src/dispatch_common.c	2018-10-06 21:07:20.971157033 +0300
+@@ -178,11 +178,6 @@
+ #define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
+ #define GLES1_LIB "libGLESv1_CM.so"
+ #define GLES2_LIB "libGLESv2.so"
+-#elif defined(__ANDROID__)
+-#define GLX_LIB "libGLESv2.so"
+-#define EGL_LIB "libEGL.so"
+-#define GLES1_LIB "libGLESv1_CM.so"
+-#define GLES2_LIB "libGLESv2.so"
+ #elif defined(_WIN32)
+ #define EGL_LIB "libEGL.dll"
+ #define GLES1_LIB "libGLES_CM.dll"