diff options
| author |   Ross Burton <ross.burton@arm.com> | 2022-12-12 17:35:46 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-06 17:32:38 +0000 |
| commit | 2eb1012ca7d5312390291e8c12d84a29b34468c9 (patch) | |
| tree | ac09e3bf15fa74dacb3af0018936d2995324dfc9 | |
| parent | 9209ef2035d7016c37c711c7c35fa48189ab1308 (diff) | |
| download | openembedded-core-2eb1012ca7d5312390291e8c12d84a29b34468c9.tar.gz | |
libepoxy: remove upstreamed patch
This patch was upstreamed in 6b09a8bc, 1.5.5 onwards.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 99b6e1ecb18d595e7b66344de882c1e1db6f35c3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb | 4 |
2 files changed, 1 insertions, 30 deletions
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.Jansa@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.Jansa@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" |