bin/oss-fuzz-setup.sh | 2 +-
download.lst | 4 ++--
external/epoxy/UnpackedTarball_epoxy.mk | 4 +++-
external/epoxy/epoxy.android.patch | 14 ++++++++++++++
external/epoxy/epoxy.pyresource-leak.patch | 13 -------------
5 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 754ab4b0653534347f647a667c8865a1ef4677a9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 20 10:27:24 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 20 13:27:35 2021 +0200
upgrade libepoxy to 1.5.9
removed epoxy.pyresource-leak.patch in favor of upstream
https://github.com/anholt/libepoxy/pull/243/commits/d0b319e27b874a13f6b41f4759c272b08d74cb8a
Change-Id: I9d3545b1dcf9dbdd5e28a54e13477a027636c444
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123882
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index 7055ef8b06dd..e43aa6bad992 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -63,7 +63,7 @@ curl --no-progress-meter -S \
-C - -O https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2 \
-C - -O https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz \
- -C - -O https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz \
+ -C - -O https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz
diff --git a/download.lst b/download.lst
index b1f7d6558302..434ba4740a8a 100644
--- a/download.lst
+++ b/download.lst
@@ -41,8 +41,8 @@ export CURL_SHA256SUM :=
0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7
export CURL_TARBALL := curl-7.79.1.tar.xz
export EBOOK_SHA256SUM :=
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
-export EPOXY_SHA256SUM :=
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
-export EPOXY_TARBALL := libepoxy-1.5.3.tar.xz
+export EPOXY_SHA256SUM :=
d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4
+export EPOXY_TARBALL := libepoxy-1.5.9.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 2de800ec1ca0..4cbc41f5d4c9 100644
--- a/external/epoxy/UnpackedTarball_epoxy.mk
+++ b/external/epoxy/UnpackedTarball_epoxy.mk
@@ -25,12 +25,14 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,epoxy,\
$(eval $(call gb_UnpackedTarball_set_patchlevel,epoxy,0))
+# * external/external/epoxy/epoxy.android.patch upstream at
+# <https://github.com/anholt/libepoxy/pull/263> "fix error: use of
undeclared identifier 'OPENGL_LIB'":
$(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.pyresource-leak.patch \
+ external/epoxy/epoxy.android.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/epoxy/epoxy.android.patch
b/external/epoxy/epoxy.android.patch
new file mode 100644
index 000000000000..c8f672a9718d
--- /dev/null
+++ b/external/epoxy/epoxy.android.patch
@@ -0,0 +1,14 @@
+--- 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();
+ }
+
diff --git a/external/epoxy/epoxy.pyresource-leak.patch
b/external/epoxy/epoxy.pyresource-leak.patch
deleted file mode 100644
index d9fc684254aa..000000000000
--- a/external/epoxy/epoxy.pyresource-leak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gen_dispatch.py.orig 2020-09-30 06:33:23.765680489 +0200
-+++ src/gen_dispatch.py 2020-09-30 06:37:07.719152050 +0200
-@@ -182,6 +182,10 @@
- # provided the name of the symbol to be requested.
- self.provider_loader = {}
-
-+ def __del__(self):
-+ if self.out_file is not None:
-+ close(self.out_file)
-+
- def all_text_until_element_name(self, element, element_name):
- text = ''
-
