Related: tdf#124942 upgrade epoxy to 1.5.3
https://github.com/anholt/libepoxy/issues/180 sounds very similar and
1.5.3 apparently fixes that
Change-Id: I009f5bc82f9e8326a7028ed29d86733cce649d15
Reviewed-on: https://gerrit.libreoffice.org/71750
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index 4fb71d2..dc805c9 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export CURL_SHA256SUM := cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595
export CURL_TARBALL := curl-7.64.0.tar.gz
export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
export EPOXY_SHA256SUM := a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8
export EPOXY_TARBALL := libepoxy-1.5.2.tar.xz
export EPOXY_SHA256SUM := 002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
export EPOXY_TARBALL := libepoxy-1.5.3.tar.xz
export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export EPUBGEN_SHA256SUM := 03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk
index be435725f..12424b1 100644
--- a/external/epoxy/Library_epoxy.mk
+++ b/external/epoxy/Library_epoxy.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_set_include,epoxy,\
$$(INCLUDE) \
))
# epoxy is riddled with warnings... let's spare use
# epoxy is riddled with warnings... let's spare us
# the pointless spamming
$(eval $(call gb_Library_add_cxxflags,epoxy,\
-w \
diff --git a/external/epoxy/UnpackedTarball_epoxy.mk b/external/epoxy/UnpackedTarball_epoxy.mk
index 55d4012..8dce1ba 100644
--- a/external/epoxy/UnpackedTarball_epoxy.mk
+++ b/external/epoxy/UnpackedTarball_epoxy.mk
@@ -11,6 +11,18 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,epoxy))
$(eval $(call gb_UnpackedTarball_set_tarball,epoxy,$(EPOXY_TARBALL)))
$(call gb_UnpackedTarball_get_target,epoxy) :| $(call gb_ExternalExecutable_get_dependencies,python)
epoxy_PYTHON := $(call gb_ExternalExecutable_get_command,python)
# previous versions of epoxy bundled the output, but now it has to be generated
$(eval $(call gb_UnpackedTarball_set_pre_action,epoxy,\
$(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/gl.xml && \
$(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/glx.xml && \
$(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/egl.xml && \
$(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/wgl.xml \
))
$(eval $(call gb_UnpackedTarball_set_patchlevel,epoxy,0))
$(eval $(call gb_UnpackedTarball_add_patches,epoxy, \
diff --git a/external/epoxy/epoxy.noegl.by.default.patch b/external/epoxy/epoxy.noegl.by.default.patch
index b562af4..bf89453 100644
--- a/external/epoxy/epoxy.noegl.by.default.patch
+++ b/external/epoxy/epoxy.noegl.by.default.patch
@@ -10,9 +10,8 @@
+#define PLATFORM_HAS_GLX 0
#define PLATFORM_HAS_WGL 1
#elif defined(__APPLE__)
-#define PLATFORM_HAS_EGL ENABLE_EGL
#define PLATFORM_HAS_EGL 0
-#define PLATFORM_HAS_GLX ENABLE_GLX
+#define PLATFORM_HAS_EGL 0
+#define PLATFORM_HAS_GLX 0
#define PLATFORM_HAS_WGL 0
#elif defined(ANDROID)
diff --git a/external/epoxy/epoxy.windows.api.patch b/external/epoxy/epoxy.windows.api.patch
index 12d2afb..985f2d8 100644
--- a/external/epoxy/epoxy.windows.api.patch
+++ b/external/epoxy/epoxy.windows.api.patch
@@ -10,81 +10,3 @@
#endif
#ifndef GLAPIENTRY
--- src/egl_generated_dispatch.c
+++ src/egl_generated_dispatch.c
@@ -128,7 +128,11 @@
};
#if USING_DISPATCH_TABLE
+#if defined (_MSC_VER)
+static __inline struct dispatch_table *
+#else
static inline struct dispatch_table *
+#endif
get_dispatch_table(void);
#endif
@@ -1642,7 +1646,11 @@
uint32_t egl_tls_index;
uint32_t egl_tls_size = sizeof(struct dispatch_table);
+#if defined (_MSC_VER)
+static __inline struct dispatch_table *
+#else
static inline struct dispatch_table *
+#endif
get_dispatch_table(void)
{
return TlsGetValue(egl_tls_index);
--- src/gl_generated_dispatch.c
+++ src/gl_generated_dispatch.c
@@ -3122,7 +3122,11 @@
};
#if USING_DISPATCH_TABLE
+#if defined (_MSC_VER)
+static __inline struct dispatch_table *
+#else
static inline struct dispatch_table *
+#endif
get_dispatch_table(void);
#endif
@@ -51507,7 +51511,11 @@
uint32_t gl_tls_index;
uint32_t gl_tls_size = sizeof(struct dispatch_table);
+#if defined (_MSC_VER)
+static __inline struct dispatch_table *
+#else
static inline struct dispatch_table *
+#endif
get_dispatch_table(void)
{
return TlsGetValue(gl_tls_index);
--- src/wgl_generated_dispatch.c
+++ src/wgl_generated_dispatch.c
@@ -157,7 +157,11 @@
};
#if USING_DISPATCH_TABLE
+#if defined (_MSC_VER)
+static __inline struct dispatch_table *
+#else
static inline struct dispatch_table *
+#endif
get_dispatch_table(void);
#endif
@@ -1701,7 +1705,11 @@
uint32_t wgl_tls_index;
uint32_t wgl_tls_size = sizeof(struct dispatch_table);
+#if defined (_MSC_VER)
+static __inline struct dispatch_table *
+#else
static inline struct dispatch_table *
+#endif
get_dispatch_table(void)
{
return TlsGetValue(wgl_tls_index);
