From: Ross Burton <ross.bur...@arm.com> This patch was upstreamed in 6b09a8bc, 1.5.5 onwards.
Signed-off-by: Ross Burton <ross.bur...@arm.com> Signed-off-by: Alexandre Belloni <alexandre.bell...@bootlin.com> (cherry picked from commit 99b6e1ecb18d595e7b66344de882c1e1db6f35c3) Signed-off-by: Steve Sakoman <st...@sakoman.com> --- ...atch_common.h-define-also-EGL_NO_X11.patch | 27 ------------------- .../libepoxy/libepoxy_1.5.10.bb | 4 +-- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch diff --git a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch deleted file mode 100644 index 971a3f54e0..0000000000 --- a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7211120d1e2f059d900f3379b9790484dbcf7761 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <martin.ja...@gmail.com> -Date: Fri, 25 Oct 2019 11:09:34 +0000 -Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11 - -MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in: -https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb - -Signed-off-by: Martin Jansa <martin.ja...@gmail.com> -Upstream-Status: Pending - ---- - src/dispatch_common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index a136943..448c9b1 100644 ---- a/src/dispatch_common.h -+++ b/src/dispatch_common.h -@@ -55,6 +55,7 @@ - * as EGL_NO_X11 - */ - # define MESA_EGL_NO_X11_HEADERS 1 -+# define EGL_NO_X11 1 - # endif - #include "epoxy/egl.h" - #endif diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb index d10134568a..384afa6907 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb @@ -9,9 +9,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" -SRC_URI = "git://github.com/anholt/libepoxy;branch=master;protocol=https \ - file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \ - " +SRC_URI = "git://github.com/anholt/libepoxy;branch=master;protocol=https" SRCREV = "c84bc9459357a40e46e2fec0408d04fbdde2c973" S = "${WORKDIR}/git" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175156): https://lists.openembedded.org/g/openembedded-core/message/175156 Mute This Topic: https://lists.openembedded.org/mt/95957175/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
