summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-10-20 10:27:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-10-20 13:27:35 +0200
commit754ab4b0653534347f647a667c8865a1ef4677a9 (patch)
treea7f045e41a6dc2753252476359615ce2faf4c2cd /external
parenta08d1dc4ee904428ef6f78208cc2508d3fc3717b (diff)
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 <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/epoxy/UnpackedTarball_epoxy.mk4
-rw-r--r--external/epoxy/epoxy.android.patch14
-rw-r--r--external/epoxy/epoxy.pyresource-leak.patch13
3 files changed, 17 insertions, 14 deletions
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 = ''
-