On Fri, 20 Dec 2019 at 05:15, Alistair Fr= ancis <alistair@alistair23.me<= /a>> wrote:

Upgrade mesa to 19.3 and refresh the patches.

Also change the regex to not look for x.x.0 versions as they are
development versions

I'm not sure what you had in mind, but the new = regex does not work at all, as ^ outside of [] means "beginning of str= ing", and placing [1-9] where it is would mean it would also exclude x= .0.x versions.

To test, use https://regex101.com/, and you should also run 'devtool= latest-version mesa'. I actually think it's fine to leave the rege= x as it is, x.x.1 versions are usually quick to follow, and it's good t= o get an earlier notice of a new release.

Alex=

=C2=A0

https://g= itlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc= 1ddb

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
=C2=A0...atch_common.h-define-also-EGL_NO_X11.patch | 26 ++++++++++++++++++= +
=C2=A0.../libepoxy/libepoxy_1.5.4.bb=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 |=C2=A0 1 +
=C2=A0...k-for-all-linux-host_os-combinations.patch | 18 ++++++-------
=C2=A0...02-meson.build-make-TLS-ELF-optional.patch | 18 ++++++-------
=C2=A0...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++----
=C2=A0...le-asm-unconditionally-now-that-gen_.patch | 10 +++----
=C2=A0.../{mesa-gl_19.2.4.bb =3D> mesa-gl_19.3.1.bb}=C2=A0 |=C2= =A0 0
=C2=A0.../mesa/{mesa_19.2.4.bb =3D> mesa_19.3.1.bb}=C2=A0 =C2=A0|=C2=A0 = 8 +++---
=C2=A08 files changed, 59 insertions(+), 32 deletions(-)
=C2=A0create mode 100644 meta/recipes-graphics/libepoxy/files/0001-dispatch= _common.h-define-also-EGL_NO_X11.patch
=C2=A0rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb =3D> mesa-g= l_19.3.1.bb} (100%)
=C2=A0rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb =3D> mesa_19.3.1.bb<= /a>} (60%)

diff --git a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-de= fine-also-EGL_NO_X11.patch b/meta/recipes-graphics/libepoxy/files/0001-disp= atch_common.h-define-also-EGL_NO_X11.patch
new file mode 100644
index 0000000000..7262945181
--- /dev/null
+++ b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-al= so-EGL_NO_X11.patch
@@ -0,0 +1,26 @@
+From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 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/me= sa3d/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 dcb3a35..c206253 100644
+--- a/src/dispatch_common.h
++++ b/src/dispatch_common.h
+@@ -52,6 +52,7 @@
+=C2=A0 * should do the same
+=C2=A0 */
+ #=C2=A0 define MESA_EGL_NO_X11_HEADERS 1
++#=C2=A0 define EGL_NO_X11 1
+ # endif
+ #include "epoxy/egl.h"
+ #endif
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb b/meta/rec= ipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 4caf672369..af9867407e 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -10,6 +10,7 @@ LICENSE =3D "MIT"
=C2=A0LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D58ef4c80d401e07bd9ee8= b6b58cf464b"

=C2=A0SRC_URI =3D "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz<= /a> \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-dispatch_common.h-def= ine-also-EGL_NO_X11.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "
=C2=A0SRC_URI[md5sum] =3D "00f47ad447321f9dc59f85bc1c9d0467"
=C2=A0SRC_URI[sha256sum] =3D "0bd2cc681dfeffdef739cb29913f8c3caa47a88a= 451fd2bc6e606c02997289d2"
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-al= l-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-= meson.build-check-for-all-linux-host_os-combinations.patch
index 1869e11059..085254323c 100644
--- 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
@@ -1,6 +1,6 @@
-From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Mon, 11 Nov 2019 09:38:15 -0800
+From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair@alistair23.me>
+Date: Thu, 14 Nov 2019 13:04:49 -0800
=C2=A0Subject: [PATCH] meson.build: check for all linux host_os combination= s

=C2=A0Make sure that we are also looking for our host_os combinations like<= br> @@ -13,30 +13,30 @@ Upstream-Status: Pending
=C2=A0Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
=C2=A0Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
=C2=A0Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Signed-off-by: Alistair Francis <alistair@alistair23.me>

=C2=A0---
=C2=A0 meson.build | 4 ++--
=C2=A0 1 file changed, 2 insertions(+), 2 deletions(-)

=C2=A0diff --git a/meson.build b/meson.build
-index d584152..a1f098c 100644
+index 898d025..09e3759 100644
=C2=A0--- a/meson.build
=C2=A0+++ b/meson.build
-@@ -117,7 +117,7 @@ with_any_opengl =3D with_opengl or with_gles1 or with_= gles2
+@@ -124,7 +124,7 @@ with_any_opengl =3D with_opengl or with_gles1 or with_= gles2
=C2=A0 # Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi =3D get_option('shared-glapi') and with_any_ope= ngl
+ with_shared_glapi =3D with_shared_glapi and with_any_opengl

=C2=A0-system_has_kms_drm =3D ['openbsd', 'netbsd', 'fr= eebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', &= #39;sunos'].contains(host_machine.system())
=C2=A0+system_has_kms_drm =3D ['openbsd', 'netbsd', 'fr= eebsd', 'dragonfly'].contains(host_machine.system()) or host_ma= chine.system().startswith('linux')

=C2=A0 dri_drivers =3D get_option('dri-drivers')
=C2=A0 if dri_drivers.contains('auto')
-@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; = }',
+@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; = }',
=C2=A0 endif

=C2=A0 # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd&#= 39;].contains(host_machine.system())
+-if ['linux', 'cygwin', 'gnu', 'freebsd', = 'gnu/kfreebsd'].contains(host_machine.system())
=C2=A0+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contain= s(host_machine.system()) or host_machine.system().startswith('linux'= ;)
=C2=A0 =C2=A0 pre_args +=3D '-D_GNU_SOURCE'
=C2=A0 elif host_machine.system() =3D=3D 'sunos'
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-TL= S-ELF-optional.patch
index 199ed572d5..cd35a1f850 100644
--- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-option= al.patch
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-option= al.patch
@@ -1,13 +1,13 @@
-From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Wed, 23 Oct 2019 09:46:28 -0700
+From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair@alistair23.me>
+Date: Thu, 14 Nov 2019 13:08:31 -0800
=C2=A0Subject: [PATCH] meson.build: make TLS ELF optional

=C2=A0USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original &q= uot;make
=C2=A0TLS GLX optional again" patch updated to the latest mesa.

=C2=A0Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Signed-off-by: Alistair Francis <alistair@alistair23.me>

=C2=A0---
=C2=A0 meson.build=C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +-
@@ -15,23 +15,23 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>=
=C2=A0 2 files changed, 7 insertions(+), 1 deletion(-)

=C2=A0diff --git a/meson.build b/meson.build
-index a1f098c..1e31eb4 100644
+index 09e3759..a954118 100644
=C2=A0--- a/meson.build
=C2=A0+++ b/meson.build
-@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or with_platfor= m_surfaceless or with_plat
+@@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or with_platfor= m_surfaceless or with_plat
=C2=A0 endif

=C2=A0 # Android uses emutls for versions <=3D P/28. For USE_ELF_TLS we = need ELF TLS.
--if not with_platform_android or get_option('platform-sdk-version'= ) >=3D 29
+-if host_machine.system() !=3D 'windows' and (not with_platform_an= droid or get_option('platform-sdk-version') >=3D 29)
=C2=A0+if (not with_platform_android or get_option('platform-sdk-versio= n') >=3D 29) and get_option('elf-tls')
=C2=A0 =C2=A0 pre_args +=3D '-DUSE_ELF_TLS'
=C2=A0 endif

=C2=A0diff --git a/meson_options.txt b/meson_options.txt
-index b768c15..76cef24 100644
+index 626baf3..637ff14 100644
=C2=A0--- a/meson_options.txt
=C2=A0+++ b/meson_options.txt
-@@ -333,6 +333,12 @@ option(
+@@ -341,6 +341,12 @@ option(
=C2=A0 =C2=A0 value : true,
=C2=A0 =C2=A0 description : 'Enable direct rendering in GLX and EGL for= DRI',
=C2=A0 )
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
index c20a1f7c52..a0536c87ac 100644
--- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-dr= ivers.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-dr= ivers.patch
@@ -1,4 +1,4 @@
-From 5ad6515238bc042cccf9959abad44fdee9aeb07f Mon Sep 17 00:00:00 2001
+From 7eaa21a79ce6d6e92f6bf98c28b68e3fcb4d7874 Mon Sep 17 00:00:00 2001
=C2=A0From: Fabio Berton <fabio.berton@ossystems.com.br>
=C2=A0Date: Wed, 12 Jun 2019 14:18:31 -0300
=C2=A0Subject: [PATCH] Allow enable DRI without DRI drivers
@@ -15,10 +15,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> =C2=A0 2 files changed, 7 insertions(+), 1 deletion(-)

=C2=A0diff --git a/meson.build b/meson.build
-index 1e31eb4..512eec6 100644
+index a954118..62864c6 100644
=C2=A0--- a/meson.build
=C2=A0+++ b/meson.build
-@@ -147,7 +147,7 @@ with_dri_r200 =3D dri_drivers.contains('r200')=
+@@ -154,7 +154,7 @@ with_dri_r200 =3D dri_drivers.contains('r200')=
=C2=A0 with_dri_nouveau =3D dri_drivers.contains('nouveau')
=C2=A0 with_dri_swrast =3D dri_drivers.contains('swrast')

@@ -28,10 +28,10 @@ index 1e31eb4..512eec6 100644
=C2=A0 gallium_drivers =3D get_option('gallium-drivers')
=C2=A0 if gallium_drivers.contains('auto')
=C2=A0diff --git a/meson_options.txt b/meson_options.txt
-index 76cef24..a8abd04 100644
+index 637ff14..700c34c 100644
=C2=A0--- a/meson_options.txt
=C2=A0+++ b/meson_options.txt
-@@ -34,6 +34,12 @@ option(
+@@ -35,6 +35,12 @@ option(
=C2=A0 =C2=A0 choices : ['auto', 'true', 'false'],<= br> =C2=A0 =C2=A0 description : 'enable support for dri3'
=C2=A0 )
diff --git a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-u= nconditionally-now-that-gen_.patch b/meta/recipes-graphics/mesa/files/0004-= Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
index b5658d0c9d..8d614e571a 100644
--- a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-uncondit= ionally-now-that-gen_.patch
+++ b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-uncondit= ionally-now-that-gen_.patch
@@ -1,4 +1,4 @@
-From 1b1cb6e5ea25eaa98573328b9565728a08245997 Mon Sep 17 00:00:00 2001
+From 41cd8836d785c79381764e7de59319f87959a5cf Mon Sep 17 00:00:00 2001
=C2=A0From: Alistair Francis <alistair@alistair23.me>
=C2=A0Date: Thu, 14 Nov 2019 09:06:02 -0800
=C2=A0Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now t= hat
@@ -15,7 +15,7 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
=C2=A0 2 files changed, 67 insertions(+), 33 deletions(-)

=C2=A0diff --git a/meson.build b/meson.build
-index 512eec6..a2bcc3a 100644
+index 62864c6..b53be8d 100644
=C2=A0--- a/meson.build
=C2=A0+++ b/meson.build
=C2=A0@@ -49,6 +49,7 @@ with_vulkan_icd_dir =3D get_option('vulkan-icd-= dir')
@@ -26,7 +26,7 @@ index 512eec6..a2bcc3a 100644
=C2=A0 with_glx_read_only_text =3D get_option('glx-read-only-text')=
=C2=A0 with_glx_direct =3D get_option('glx-direct')
=C2=A0 with_osmesa =3D get_option('osmesa')
-@@ -985,41 +986,68 @@ endif
+@@ -1093,41 +1094,68 @@ dep_ws2_32 =3D cc.find_library('ws2_32', r= equired : with_platform_windows)

=C2=A0 # TODO: shared/static? Is this even worth doing?

@@ -129,10 +129,10 @@ index 512eec6..a2bcc3a 100644
=C2=A0 endif

=C2=A0diff --git a/meson_options.txt b/meson_options.txt
-index a8abd04..0f4bd80 100644
+index 700c34c..62e8472 100644
=C2=A0--- a/meson_options.txt
=C2=A0+++ b/meson_options.txt
-@@ -233,6 +233,12 @@ option(
+@@ -241,6 +241,12 @@ option(
=C2=A0 =C2=A0 value : false,
=C2=A0 =C2=A0 description : 'Enable GLVND support.'
=C2=A0 )
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.2.4.bb b/meta/recipes= -graphics/mesa/mesa-gl_19.3.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_19.2.4.bb
rename to meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa_19.2.4.bb b/meta/recipes-graph= ics/mesa/mesa_19.3.1.bb
similarity index 60%
rename from meta/recipes-graphics/mesa/mesa_19.2.4.bb
rename to meta/recipes-graphics/mesa/mesa_19.3.1.bb
index f4b33df227..d105fec4df 100644
--- a/meta/recipes-graphics/mesa/mesa_19.2.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.3.1.bb
@@ -7,15 +7,15 @@ SRC_URI =3D "https:= //mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0004-Revert-mesa-Enable-as= m-unconditionally-now-that-gen_.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "

-SRC_URI[md5sum] =3D "5c047732b81651ddb341597528b4b096"
-SRC_URI[sha256sum] =3D "09000a0f7dbbd82e193b81a8f1bf0c118eab7ca975c03= 29181968596e548e30f"
+SRC_URI[md5sum] =3D "5c5965db31993af47fee82c9a7ccba5e"
+SRC_URI[sha256sum] =3D "cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4= eb8274723e033beae59"

-UPSTREAM_CHECK_GITTAGREGEX =3D "mesa-(?P<pver>\d+(\.\d+)+)"= ;
+UPSTREAM_CHECK_GITTAGREGEX =3D "mesa-(?P<pver>\d+(\.^[1-9]\d+)+= )"

=C2=A0#because we cannot rely on the fact that all apps will use pkgconfig,=
=C2=A0#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
=C2=A0do_install_append() {
=C2=A0 =C2=A0 =C2=A0if ${@bb.utils.contains('PACKAGECONFIG', 'e= gl', 'true', 'false', d)}; then
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 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
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 sed -i -e 's/^#elif defined(__unix__) &= ;& defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EG= L_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', &= #39;0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
=C2=A0 =C2=A0 =C2=A0fi
=C2=A0}
--
2.24.0

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailma= n/listinfo/openembedded-core

--000000000000c6a154059a1db071--