[Libreoffice-commits] core.git: download.lst external/epoxy

[Libreoffice Gerrit user]

 download.lst                                   |    4 +--
 external/epoxy/UnpackedTarball_epoxy.mk        |    2 -
 external/epoxy/epoxy.noegl.by.default.patch    |   30 ++++++++++++++++++++-----
 external/epoxy/epoxy.noglx_means_noglx.patch.1 |   28 -----------------------
 external/epoxy/epoxy.visibility.patch          |    5 ++++
 5 files changed, 32 insertions(+), 37 deletions(-)

New commits:
commit 7d0d1b198e8f87b9a59a584abf71800874f6a431
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 27 17:01:15 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 28 16:32:57 2018 +0200

    upgrade epoxy to 1.5.2
    
    Change-Id: Ic3093d3c12c33cbcc09903409daec6277428ecd6
    Reviewed-on: https://gerrit.libreoffice.org/59664
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/download.lst b/download.lst
index 9ecd5896b95c..1ed75b36f3b3 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export CURL_SHA256SUM := e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f
 export CURL_TARBALL := curl-7.60.0.tar.gz
 export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
-export EPOXY_SHA256SUM := 1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
-export EPOXY_TARBALL := libepoxy-1.3.1.tar.bz2
+export EPOXY_SHA256SUM := a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8
+export EPOXY_TARBALL := libepoxy-1.5.2.tar.xz
 export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
diff --git a/external/epoxy/UnpackedTarball_epoxy.mk b/external/epoxy/UnpackedTarball_epoxy.mk
index d72a9b9feab6..55d4012ef642 100644
--- a/external/epoxy/UnpackedTarball_epoxy.mk
+++ b/external/epoxy/UnpackedTarball_epoxy.mk
@@ -14,10 +14,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,epoxy,$(EPOXY_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,epoxy,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,epoxy, \
+    external/epoxy/epoxy.visibility.patch \
     external/epoxy/epoxy.windows.api.patch \
     external/epoxy/epoxy.noegl.by.default.patch \
     external/epoxy/clang-cl.patch \
-    external/epoxy/epoxy.noglx_means_noglx.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/epoxy/epoxy.noegl.by.default.patch b/external/epoxy/epoxy.noegl.by.default.patch
index d80a3b99f15c..b562af433198 100644
--- a/external/epoxy/epoxy.noegl.by.default.patch
+++ b/external/epoxy/epoxy.noegl.by.default.patch
@@ -1,11 +1,29 @@
 --- src/dispatch_common.h
 +++ src/dispatch_common.h
-@@ -39,7 +39,7 @@
+@@ -24,20 +24,19 @@
+ #include "config.h"
+ 
+ #ifdef _WIN32
+-#define PLATFORM_HAS_EGL ENABLE_EGL
+-#define PLATFORM_HAS_GLX ENABLE_GLX
++#define PLATFORM_HAS_EGL 0
++#define PLATFORM_HAS_GLX 0
+ #define PLATFORM_HAS_WGL 1
+ #elif defined(__APPLE__)
+-#define PLATFORM_HAS_EGL ENABLE_EGL
+-#define PLATFORM_HAS_GLX ENABLE_GLX
++#define PLATFORM_HAS_EGL 0
++#define PLATFORM_HAS_GLX 0
+ #define PLATFORM_HAS_WGL 0
+ #elif defined(ANDROID)
+-#define PLATFORM_HAS_EGL ENABLE_EGL
++#define PLATFORM_HAS_EGL 1
+ #define PLATFORM_HAS_GLX 0
  #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
  #else
--#define PLATFORM_HAS_EGL 1
-+
- #define PLATFORM_HAS_GLX 1
+-#define PLATFORM_HAS_EGL ENABLE_EGL
+-#define PLATFORM_HAS_GLX ENABLE_GLX
++#define PLATFORM_HAS_GLX 1
  #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
+ #endif
+ 
diff --git a/external/epoxy/epoxy.noglx_means_noglx.patch.1 b/external/epoxy/epoxy.noglx_means_noglx.patch.1
deleted file mode 100644
index 6a5c7eb3f472..000000000000
--- a/external/epoxy/epoxy.noglx_means_noglx.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur epoxy.org/src/dispatch_common.c epoxy/src/dispatch_common.c
---- epoxy.org/src/dispatch_common.c	2017-09-15 14:59:07.458635939 +0200
-+++ epoxy/src/dispatch_common.c	2017-09-15 15:03:16.978088807 +0200
-@@ -660,10 +660,13 @@
- #elif defined(__APPLE__)
-     return epoxy_gl_dlsym(name);
- #else
-+#if PLATFORM_HAS_GLX
-     if (epoxy_current_context_is_glx()) {
-         return glXGetProcAddressARB((const GLubyte *)name);
--    } else {
-+    } else
-+#endif
- #if PLATFORM_HAS_EGL
-+    {
-         GLenum egl_api = epoxy_egl_get_current_gl_context_api();
- 
-         switch (egl_api) {
-@@ -673,8 +676,8 @@
-         case EGL_NONE:
-             break;
-         }
--#endif
-     }
-+#endif
-     errx(1, "Couldn't find current GLX or EGL context.\n");
- #endif
- }
diff --git a/external/epoxy/epoxy.visibility.patch b/external/epoxy/epoxy.visibility.patch
new file mode 100644
index 000000000000..12297b5e291c
--- /dev/null
+++ b/external/epoxy/epoxy.visibility.patch
@@ -0,0 +1,5 @@
+--- src/config.h	2018-08-28 13:19:40.699141662 +0100
++++ src/config.h	2018-08-28 13:21:51.942139881 +0100
+@@ -0,0 +1,2 @@
++#include <sal/types.h>
++#define EPOXY_PUBLIC SAL_DLLPUBLIC_EXPORT extern