download.lst | 4 ++--
external/epoxy/UnpackedTarball_epoxy.mk | 1 -
external/epoxy/clang-cl.patch | 2 +-
external/epoxy/epoxy.android.patch | 14 --------------
4 files changed, 3 insertions(+), 18 deletions(-)
New commits:
commit 15076c214bb77f36271b9d428a9c151e8f3e0e29
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 22 01:16:36 2022 +0900
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 23 09:55:50 2022 +0200
upgrade libepoxy to 1.5.10
removed epoxy.android.patch: fixed upstream
(https://github.com/anholt/libepoxy/pull/263/commits/063c1df27974f58b0f3c0a57417732da068923cf)
Change-Id: If0c6c438014121bc480efeaeb1018b6b74e51fcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 2329128fa16a4e08a5f8fee0a83dd8b4d5c9c279)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140383
diff --git a/download.lst b/download.lst
index 13f7134d24de..53e2ba48e592 100644
--- a/download.lst
+++ b/download.lst
@@ -37,8 +37,8 @@ export CURL_SHA256SUM :=
2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396de
export CURL_TARBALL := curl-7.83.1.tar.xz
export EBOOK_SHA256SUM :=
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
-export EPOXY_SHA256SUM :=
d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4
-export EPOXY_TARBALL := libepoxy-1.5.9.tar.xz
+export EPOXY_SHA256SUM :=
a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
+export EPOXY_TARBALL := libepoxy-1.5.10.tar.gz
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 4cbc41f5d4c9..b8508c6b94e6 100644
--- a/external/epoxy/UnpackedTarball_epoxy.mk
+++ b/external/epoxy/UnpackedTarball_epoxy.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,epoxy, \
external/epoxy/epoxy.windows.api.patch \
external/epoxy/epoxy.noegl.by.default.patch \
external/epoxy/clang-cl.patch \
- external/epoxy/epoxy.android.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/epoxy/clang-cl.patch b/external/epoxy/clang-cl.patch
index 80b49127104b..0e0232cea68c 100644
--- a/external/epoxy/clang-cl.patch
+++ b/external/epoxy/clang-cl.patch
@@ -1,6 +1,6 @@
--- src/dispatch_common.c
+++ src/dispatch_common.c
-@@ -190,7 +190,11 @@
+@@ -272,7 +272,11 @@
#endif
};
diff --git a/external/epoxy/epoxy.android.patch
b/external/epoxy/epoxy.android.patch
deleted file mode 100644
index c8f672a9718d..000000000000
--- a/external/epoxy/epoxy.android.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/dispatch_common.c 2021-10-20 10:51:59.808554323 +0100
-+++ src/dispatch_common.c 2021-10-20 10:52:41.319645618 +0100
-@@ -687,7 +687,11 @@
- #endif
-
- if (!api.gl_handle) {
-+#if defined(OPENGL_LIB)
- fprintf(stderr, "Couldn't open %s or %s\n", GLX_LIB, OPENGL_LIB);
-+#else
-+ fprintf(stderr, "Couldn't open %s\n", GLX_LIB);
-+#endif
- abort();
- }
-
