<div dir="ltr"><div dir="ltr">On Fri, 20 Dec 2019 at 05:15, Alistair Francis <<a href="mailto:alistair@alistair23.me">alistair@alistair23.me</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Upgrade mesa to 19.3 and refresh the patches.<br>
<br>
Also change the regex to not look for x.x.0 versions as they are<br>
development versions<br></blockquote><div><br></div><div>Old: mesa-(?P<pver>\d+(\.\d+)+)</div><div>New: mesa-(?P<pver>\d+(\.^[1-9]\d+)+)</div><div><br></div><div>I'm not sure what you had in mind, but the new regex does not work at all, as ^ outside of [] means "beginning of string", and placing [1-9] where it is would mean it would also exclude x.0.x versions.</div><div><br></div><div>To test, use <a href="https://regex101.com/">https://regex101.com/</a>, and you should also run 'devtool latest-version mesa'. I actually think it's fine to leave the regex as it is, x.x.1 versions are usually quick to follow, and it's good to get an earlier notice of a new release.<br></div><div><br></div><div>Alex<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going<br>
to change the do_install and add a patch to libepoxy to use the new<br>
define.<br>
<br>
1: <a href="https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb</a><br>
<br>
Signed-off-by: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
---<br>
...atch_common.h-define-also-EGL_NO_X11.patch | 26 +++++++++++++++++++<br>
.../libepoxy/<a href="http://libepoxy_1.5.4.bb" rel="noreferrer" target="_blank">libepoxy_1.5.4.bb</a> | 1 +<br>
...k-for-all-linux-host_os-combinations.patch | 18 ++++++-------<br>
...02-meson.build-make-TLS-ELF-optional.patch | 18 ++++++-------<br>
...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++----<br>
...le-asm-unconditionally-now-that-gen_.patch | 10 +++----<br>
.../{<a href="http://mesa-gl_19.2.4.bb" rel="noreferrer" target="_blank">mesa-gl_19.2.4.bb</a> => <a href="http://mesa-gl_19.3.1.bb" rel="noreferrer" target="_blank">mesa-gl_19.3.1.bb</a>} | 0<br>
.../mesa/{<a href="http://mesa_19.2.4.bb" rel="noreferrer" target="_blank">mesa_19.2.4.bb</a> => <a href="http://mesa_19.3.1.bb" rel="noreferrer" target="_blank">mesa_19.3.1.bb</a>} | 8 +++---<br>
8 files changed, 59 insertions(+), 32 deletions(-)<br>
create mode 100644 meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch<br>
rename meta/recipes-graphics/mesa/{<a href="http://mesa-gl_19.2.4.bb" rel="noreferrer" target="_blank">mesa-gl_19.2.4.bb</a> => <a href="http://mesa-gl_19.3.1.bb" rel="noreferrer" target="_blank">mesa-gl_19.3.1.bb</a>} (100%)<br>
rename meta/recipes-graphics/mesa/{<a href="http://mesa_19.2.4.bb" rel="noreferrer" target="_blank">mesa_19.2.4.bb</a> => <a href="http://mesa_19.3.1.bb" rel="noreferrer" target="_blank">mesa_19.3.1.bb</a>} (60%)<br>
<br>
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<br>
new file mode 100644<br>
index 0000000000..7262945181<br>
--- /dev/null<br>
+++ b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch<br>
@@ -0,0 +1,26 @@<br>
+From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001<br>
+From: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com" target="_blank">Martin.Jansa@gmail.com</a>><br>
+Date: Fri, 25 Oct 2019 11:09:34 +0000<br>
+Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11<br>
+<br>
+MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in:<br>
+<a href="https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb" rel="noreferrer" target="_blank">https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb</a><br>
+<br>
+Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com" target="_blank">Martin.Jansa@gmail.com</a>><br>
+Upstream-Status: Pending<br>
+---<br>
+ src/dispatch_common.h | 1 +<br>
+ 1 file changed, 1 insertion(+)<br>
+<br>
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h<br>
+index dcb3a35..c206253 100644<br>
+--- a/src/dispatch_common.h<br>
++++ b/src/dispatch_common.h<br>
+@@ -52,6 +52,7 @@<br>
+ * should do the same<br>
+ */<br>
+ # define MESA_EGL_NO_X11_HEADERS 1<br>
++# define EGL_NO_X11 1<br>
+ # endif<br>
+ #include "epoxy/egl.h"<br>
+ #endif<br>
diff --git a/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.4.bb" rel="noreferrer" target="_blank">libepoxy_1.5.4.bb</a> b/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.4.bb" rel="noreferrer" target="_blank">libepoxy_1.5.4.bb</a><br>
index 4caf672369..af9867407e 100644<br>
--- a/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.4.bb" rel="noreferrer" target="_blank">libepoxy_1.5.4.bb</a><br>
+++ b/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.4.bb" rel="noreferrer" target="_blank">libepoxy_1.5.4.bb</a><br>
@@ -10,6 +10,7 @@ LICENSE = "MIT"<br>
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"<br>
<br>
SRC_URI = "<a href="https://github.com/anholt/$%7BBPN%7D/releases/download/$%7BPV%7D/$%7BBP%7D.tar.xz" rel="noreferrer" target="_blank">https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz</a> \<br>
+ file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \<br>
"<br>
SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"<br>
SRC_URI[sha256sum] = "0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"<br>
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch<br>
index 1869e11059..085254323c 100644<br>
--- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch<br>
+++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch<br>
@@ -1,6 +1,6 @@<br>
-From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001<br>
-From: Alistair Francis <<a href="mailto:alistair.francis@wdc.com" target="_blank">alistair.francis@wdc.com</a>><br>
-Date: Mon, 11 Nov 2019 09:38:15 -0800<br>
+From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001<br>
+From: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
+Date: Thu, 14 Nov 2019 13:04:49 -0800<br>
Subject: [PATCH] meson.build: check for all linux host_os combinations<br>
<br>
Make sure that we are also looking for our host_os combinations like<br>
@@ -13,30 +13,30 @@ Upstream-Status: Pending<br>
Signed-off-by: Anuj Mittal <<a href="mailto:anuj.mittal@intel.com" target="_blank">anuj.mittal@intel.com</a>><br>
Signed-off-by: Fabio Berton <<a href="mailto:fabio.berton@ossystems.com.br" target="_blank">fabio.berton@ossystems.com.br</a>><br>
Signed-off-by: Otavio Salvador <<a href="mailto:otavio@ossystems.com.br" target="_blank">otavio@ossystems.com.br</a>><br>
-Signed-off-by: Alistair Francis <<a href="mailto:alistair.francis@wdc.com" target="_blank">alistair.francis@wdc.com</a>><br>
+Signed-off-by: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
<br>
---<br>
meson.build | 4 ++--<br>
1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/meson.build b/meson.build<br>
-index d584152..a1f098c 100644<br>
+index 898d025..09e3759 100644<br>
--- a/meson.build<br>
+++ b/meson.build<br>
-@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2<br>
+@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2<br>
# Only build shared_glapi if at least one OpenGL API is enabled<br>
- with_shared_glapi = get_option('shared-glapi') and with_any_opengl<br>
+ with_shared_glapi = with_shared_glapi and with_any_opengl<br>
<br>
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system())<br>
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux')<br>
<br>
dri_drivers = get_option('dri-drivers')<br>
if dri_drivers.contains('auto')<br>
-@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',<br>
+@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',<br>
endif<br>
<br>
# TODO: this is very incomplete<br>
--if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())<br>
+-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system())<br>
+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux')<br>
pre_args += '-D_GNU_SOURCE'<br>
elif host_machine.system() == 'sunos'<br>
diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch<br>
index 199ed572d5..cd35a1f850 100644<br>
--- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch<br>
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch<br>
@@ -1,13 +1,13 @@<br>
-From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001<br>
-From: Alistair Francis <<a href="mailto:alistair.francis@wdc.com" target="_blank">alistair.francis@wdc.com</a>><br>
-Date: Wed, 23 Oct 2019 09:46:28 -0700<br>
+From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001<br>
+From: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
+Date: Thu, 14 Nov 2019 13:08:31 -0800<br>
Subject: [PATCH] meson.build: make TLS ELF optional<br>
<br>
USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make<br>
TLS GLX optional again" patch updated to the latest mesa.<br>
<br>
Upstream-Status: Inappropriate [configuration]<br>
-Signed-off-by: Alistair Francis <<a href="mailto:alistair.francis@wdc.com" target="_blank">alistair.francis@wdc.com</a>><br>
+Signed-off-by: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
<br>
---<br>
meson.build | 2 +-<br>
@@ -15,23 +15,23 @@ Signed-off-by: Alistair Francis <<a href="mailto:alistair.francis@wdc.com" target="_blank">alistair.francis@wdc.com</a>><br>
2 files changed, 7 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/meson.build b/meson.build<br>
-index a1f098c..1e31eb4 100644<br>
+index 09e3759..a954118 100644<br>
--- a/meson.build<br>
+++ b/meson.build<br>
-@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat<br>
+@@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat<br>
endif<br>
<br>
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.<br>
--if not with_platform_android or get_option('platform-sdk-version') >= 29<br>
+-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)<br>
+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')<br>
pre_args += '-DUSE_ELF_TLS'<br>
endif<br>
<br>
diff --git a/meson_options.txt b/meson_options.txt<br>
-index b768c15..76cef24 100644<br>
+index 626baf3..637ff14 100644<br>
--- a/meson_options.txt<br>
+++ b/meson_options.txt<br>
-@@ -333,6 +333,12 @@ option(<br>
+@@ -341,6 +341,12 @@ option(<br>
value : true,<br>
description : 'Enable direct rendering in GLX and EGL for DRI',<br>
)<br>
diff --git a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch<br>
index c20a1f7c52..a0536c87ac 100644<br>
--- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch<br>
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch<br>
@@ -1,4 +1,4 @@<br>
-From 5ad6515238bc042cccf9959abad44fdee9aeb07f Mon Sep 17 00:00:00 2001<br>
+From 7eaa21a79ce6d6e92f6bf98c28b68e3fcb4d7874 Mon Sep 17 00:00:00 2001<br>
From: Fabio Berton <<a href="mailto:fabio.berton@ossystems.com.br" target="_blank">fabio.berton@ossystems.com.br</a>><br>
Date: Wed, 12 Jun 2019 14:18:31 -0300<br>
Subject: [PATCH] Allow enable DRI without DRI drivers<br>
@@ -15,10 +15,10 @@ Signed-off-by: Otavio Salvador <<a href="mailto:otavio@ossystems.com.br" target="_blank">otavio@ossystems.com.br</a>><br>
2 files changed, 7 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/meson.build b/meson.build<br>
-index 1e31eb4..512eec6 100644<br>
+index a954118..62864c6 100644<br>
--- a/meson.build<br>
+++ b/meson.build<br>
-@@ -147,7 +147,7 @@ with_dri_r200 = dri_drivers.contains('r200')<br>
+@@ -154,7 +154,7 @@ with_dri_r200 = dri_drivers.contains('r200')<br>
with_dri_nouveau = dri_drivers.contains('nouveau')<br>
with_dri_swrast = dri_drivers.contains('swrast')<br>
<br>
@@ -28,10 +28,10 @@ index 1e31eb4..512eec6 100644<br>
gallium_drivers = get_option('gallium-drivers')<br>
if gallium_drivers.contains('auto')<br>
diff --git a/meson_options.txt b/meson_options.txt<br>
-index 76cef24..a8abd04 100644<br>
+index 637ff14..700c34c 100644<br>
--- a/meson_options.txt<br>
+++ b/meson_options.txt<br>
-@@ -34,6 +34,12 @@ option(<br>
+@@ -35,6 +35,12 @@ option(<br>
choices : ['auto', 'true', 'false'],<br>
description : 'enable support for dri3'<br>
)<br>
diff --git a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch<br>
index b5658d0c9d..8d614e571a 100644<br>
--- a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch<br>
+++ b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch<br>
@@ -1,4 +1,4 @@<br>
-From 1b1cb6e5ea25eaa98573328b9565728a08245997 Mon Sep 17 00:00:00 2001<br>
+From 41cd8836d785c79381764e7de59319f87959a5cf Mon Sep 17 00:00:00 2001<br>
From: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
Date: Thu, 14 Nov 2019 09:06:02 -0800<br>
Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that<br>
@@ -15,7 +15,7 @@ Signed-off-by: Alistair Francis <<a href="mailto:alistair@alistair23.me" target="_blank">alistair@alistair23.me</a>><br>
2 files changed, 67 insertions(+), 33 deletions(-)<br>
<br>
diff --git a/meson.build b/meson.build<br>
-index 512eec6..a2bcc3a 100644<br>
+index 62864c6..b53be8d 100644<br>
--- a/meson.build<br>
+++ b/meson.build<br>
@@ -49,6 +49,7 @@ with_vulkan_icd_dir = get_option('vulkan-icd-dir')<br>
@@ -26,7 +26,7 @@ index 512eec6..a2bcc3a 100644<br>
with_glx_read_only_text = get_option('glx-read-only-text')<br>
with_glx_direct = get_option('glx-direct')<br>
with_osmesa = get_option('osmesa')<br>
-@@ -985,41 +986,68 @@ endif<br>
+@@ -1093,41 +1094,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows)<br>
<br>
# TODO: shared/static? Is this even worth doing?<br>
<br>
@@ -129,10 +129,10 @@ index 512eec6..a2bcc3a 100644<br>
endif<br>
<br>
diff --git a/meson_options.txt b/meson_options.txt<br>
-index a8abd04..0f4bd80 100644<br>
+index 700c34c..62e8472 100644<br>
--- a/meson_options.txt<br>
+++ b/meson_options.txt<br>
-@@ -233,6 +233,12 @@ option(<br>
+@@ -241,6 +241,12 @@ option(<br>
value : false,<br>
description : 'Enable GLVND support.'<br>
)<br>
diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa-gl_19.2.4.bb" rel="noreferrer" target="_blank">mesa-gl_19.2.4.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa-gl_19.3.1.bb" rel="noreferrer" target="_blank">mesa-gl_19.3.1.bb</a><br>
similarity index 100%<br>
rename from meta/recipes-graphics/mesa/<a href="http://mesa-gl_19.2.4.bb" rel="noreferrer" target="_blank">mesa-gl_19.2.4.bb</a><br>
rename to meta/recipes-graphics/mesa/<a href="http://mesa-gl_19.3.1.bb" rel="noreferrer" target="_blank">mesa-gl_19.3.1.bb</a><br>
diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_19.2.4.bb" rel="noreferrer" target="_blank">mesa_19.2.4.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa_19.3.1.bb" rel="noreferrer" target="_blank">mesa_19.3.1.bb</a><br>
similarity index 60%<br>
rename from meta/recipes-graphics/mesa/<a href="http://mesa_19.2.4.bb" rel="noreferrer" target="_blank">mesa_19.2.4.bb</a><br>
rename to meta/recipes-graphics/mesa/<a href="http://mesa_19.3.1.bb" rel="noreferrer" target="_blank">mesa_19.3.1.bb</a><br>
index f4b33df227..d105fec4df 100644<br>
--- a/meta/recipes-graphics/mesa/<a href="http://mesa_19.2.4.bb" rel="noreferrer" target="_blank">mesa_19.2.4.bb</a><br>
+++ b/meta/recipes-graphics/mesa/<a href="http://mesa_19.3.1.bb" rel="noreferrer" target="_blank">mesa_19.3.1.bb</a><br>
@@ -7,15 +7,15 @@ SRC_URI = "<a href="https://mesa.freedesktop.org/archive/mesa-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz</a> \<br>
file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \<br>
"<br>
<br>
-SRC_URI[md5sum] = "5c047732b81651ddb341597528b4b096"<br>
-SRC_URI[sha256sum] = "09000a0f7dbbd82e193b81a8f1bf0c118eab7ca975c0329181968596e548e30f"<br>
+SRC_URI[md5sum] = "5c5965db31993af47fee82c9a7ccba5e"<br>
+SRC_URI[sha256sum] = "cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4eb8274723e033beae59"<br>
<br>
-UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"<br>
+UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.^[1-9]\d+)+)"<br>
<br>
#because we cannot rely on the fact that all apps will use pkgconfig,<br>
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER<br>
do_install_append() {<br>
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then<br>
- sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h<br>
+ sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h<br>
fi<br>
}<br>
-- <br>
2.24.0<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>