upgrade libepoxy to 1.5.10

removed epoxy.android.patch: fixed upstream
(063c1df279)

Change-Id: If0c6c438014121bc480efeaeb1018b6b74e51fcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Taichi Haradaguchi 2022-09-22 01:16:36 +09:00 committed by Caolán McNamara
parent 971804673e
commit 2329128fa1
4 changed files with 3 additions and 18 deletions

View file

@ -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

View file

@ -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 \
external/epoxy/Wint-conversion.patch \
))

View file

@ -1,6 +1,6 @@
--- src/dispatch_common.c
+++ src/dispatch_common.c
@@ -190,7 +190,11 @@
@@ -272,7 +272,11 @@
#endif
};

View file

@ -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();
}