<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto">We also need to go straight to 19.2.4:&nbsp;<a href="https://lists.freedesktop.org/archives/mesa-dev/2019-November/223773.html">https://lists.freedesktop.org/archives/mesa-dev/2019-November/223773.html</a>&nbsp;<br><br><div id="AppleMailSignature" dir="ltr">Alex</div><div dir="ltr"><br>On 14 Nov 2019, at 8.08, Khem Raj &lt;<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>&gt; wrote:<br><br></div><blockquote type="cite"><div dir="ltr"><span>On Mon, 2019-11-11 at 16:31 -0800, Alistair Francis wrote:</span><br><blockquote type="cite"><span>From: Alistair Francis &lt;<a href="mailto:alistair@alistair23.me">alistair@alistair23.me</a>&gt;</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>Upgrade mesa and mesa-gl to 19.2.3.</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>The license hash change was a trivial new line removal.</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>The glx-tls option was removed as it isn't included in the</span><br></blockquote><blockquote type="cite"><span>meson.build</span><br></blockquote><blockquote type="cite"><span>file. It has been replaced with 'use-elf-tls' instead. We also added</span><br></blockquote><blockquote type="cite"><span>an</span><br></blockquote><blockquote type="cite"><span>INSANE_SKIP to fix this error</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;do_package_qa: QA Issue: ELF binary</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;'[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations</span><br></blockquote><blockquote type="cite"><span>in .text</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;[textrel]</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>The -Dasm=false was removed as it also is no longer included.</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><span></span><br><span>ARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libgl-mesa: ELF</span><br><span>binary /usr/lib/libGL.so.1.2.0 has relocations in .text [textrel]</span><br><span>WARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libgles1-mesa: ELF</span><br><span>binary /usr/lib/libGLESv1_CM.so.1.1.0 has relocations in .text</span><br><span>[textrel]</span><br><span>WARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libgles2-mesa: ELF</span><br><span>binary /usr/lib/libGLESv2.so.2.0.0 has relocations in .text [textrel]</span><br><span>WARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libglapi: ELF binary</span><br><span>/usr/lib/libglapi.so.0.0.0 has relocations in .text [textrel]</span><br><span></span><br><span>with musl is still seen. I think we need to disable asm at least for</span><br><span>musl case.</span><br><span></span><br><blockquote type="cite"><span>Signed-off-by: Alistair Francis &lt;<a href="mailto:alistair@alistair23.me">alistair@alistair23.me</a>&gt;</span><br></blockquote><blockquote type="cite"><span>Signed-off-by: Alistair Francis &lt;<a href="mailto:alistair.francis@wdc.com">alistair.francis@wdc.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span>Acked-by: Otavio Salvador &lt;<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span>---</span><br></blockquote><blockquote type="cite"><span>v7:</span><br></blockquote><blockquote type="cite"><span> - Update to mesa 19.2.3</span><br></blockquote><blockquote type="cite"><span> - Add INSANE_SKIP</span><br></blockquote><blockquote type="cite"><span>v6:</span><br></blockquote><blockquote type="cite"><span> - Rebase on master</span><br></blockquote><blockquote type="cite"><span>v4:</span><br></blockquote><blockquote type="cite"><span> - Add a patch (first patch in the series) to fix libsdl2 build</span><br></blockquote><blockquote type="cite"><span>v3:</span><br></blockquote><blockquote type="cite"><span> - Fix missing Upstream-Status</span><br></blockquote><blockquote type="cite"><span>v2:</span><br></blockquote><blockquote type="cite"><span> - Add back "make TLS ELF optional" patch</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> ...k-for-all-linux-host_os-combinations.patch | 23 ++++----</span><br></blockquote><blockquote type="cite"><span> ...02-meson.build-make-TLS-ELF-optional.patch | 48 +++++++++++++++++</span><br></blockquote><blockquote type="cite"><span> ...on.build-make-TLS-GLX-optional-again.patch | 52 ---------------</span><br></blockquote><blockquote type="cite"><span>----</span><br></blockquote><blockquote type="cite"><span> .../{mesa-gl_19.1.6.bb =&gt; mesa-gl_19.2.3.bb} &nbsp;| &nbsp;0</span><br></blockquote><blockquote type="cite"><span> meta/recipes-graphics/mesa/mesa.inc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| 18 +++----</span><br></blockquote><blockquote type="cite"><span> .../mesa/{mesa_19.1.6.bb =&gt; mesa_19.2.3.bb} &nbsp;&nbsp;| &nbsp;6 +--</span><br></blockquote><blockquote type="cite"><span> 6 files changed, 73 insertions(+), 74 deletions(-)</span><br></blockquote><blockquote type="cite"><span> create mode 100644 meta/recipes-graphics/mesa/files/0002-</span><br></blockquote><blockquote type="cite"><span>meson.build-make-TLS-ELF-optional.patch</span><br></blockquote><blockquote type="cite"><span> delete mode 100644 meta/recipes-graphics/mesa/files/0002-</span><br></blockquote><blockquote type="cite"><span>meson.build-make-TLS-GLX-optional-again.patch</span><br></blockquote><blockquote type="cite"><span> rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb =&gt; mesa-</span><br></blockquote><blockquote type="cite"><span>gl_19.2.3.bb} (100%)</span><br></blockquote><blockquote type="cite"><span> rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb =&gt; mesa_19.2.3.bb}</span><br></blockquote><blockquote type="cite"><span>(77%)</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-</span><br></blockquote><blockquote type="cite"><span>for-all-linux-host_os-combinations.patch b/meta/recipes-</span><br></blockquote><blockquote type="cite"><span>graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-</span><br></blockquote><blockquote type="cite"><span>combinations.patch</span><br></blockquote><blockquote type="cite"><span>index 9fba5da4b2..1aff727455 100644</span><br></blockquote><blockquote type="cite"><span>--- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-</span><br></blockquote><blockquote type="cite"><span>all-linux-host_os-combinations.patch</span><br></blockquote><blockquote type="cite"><span>+++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-</span><br></blockquote><blockquote type="cite"><span>all-linux-host_os-combinations.patch</span><br></blockquote><blockquote type="cite"><span>@@ -1,8 +1,7 @@</span><br></blockquote><blockquote type="cite"><span>-From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00</span><br></blockquote><blockquote type="cite"><span>2001</span><br></blockquote><blockquote type="cite"><span>-From: Fabio Berton &lt;<a href="mailto:fabio.berton@ossystems.com.br">fabio.berton@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span>-Date: Wed, 12 Jun 2019 13:40:20 -0300</span><br></blockquote><blockquote type="cite"><span>+From 7547bd7340dc318392aee8b3a3ad1f9d902121db Mon Sep 17 00:00:00</span><br></blockquote><blockquote type="cite"><span>2001</span><br></blockquote><blockquote type="cite"><span>+From: Alistair Francis &lt;<a href="mailto:alistair.francis@wdc.com">alistair.francis@wdc.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span>+Date: Mon, 11 Nov 2019 09:38:15 -0800</span><br></blockquote><blockquote type="cite"><span> Subject: [PATCH] meson.build: check for all linux host_os</span><br></blockquote><blockquote type="cite"><span>combinations</span><br></blockquote><blockquote type="cite"><span>-Organization: O.S. Systems Software LTDA.</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> Make sure that we are also looking for our host_os combinations like</span><br></blockquote><blockquote type="cite"><span> linux-musl etc. when assuming support for DRM/KMS.</span><br></blockquote><blockquote type="cite"><span>@@ -14,29 +13,33 @@ Upstream-Status: Pending</span><br></blockquote><blockquote type="cite"><span> Signed-off-by: Anuj Mittal &lt;<a href="mailto:anuj.mittal@intel.com">anuj.mittal@intel.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span> Signed-off-by: Fabio Berton &lt;<a href="mailto:fabio.berton@ossystems.com.br">fabio.berton@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span> Signed-off-by: Otavio Salvador &lt;<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span>+Signed-off-by: Alistair Francis &lt;<a href="mailto:alistair.francis@wdc.com">alistair.francis@wdc.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span> ---</span><br></blockquote><blockquote type="cite"><span> &nbsp;meson.build | 4 ++--</span><br></blockquote><blockquote type="cite"><span> &nbsp;1 file changed, 2 insertions(+), 2 deletions(-)</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> diff --git a/meson.build b/meson.build</span><br></blockquote><blockquote type="cite"><span>-index 567a81afd6f..b33b430aed4 100644</span><br></blockquote><blockquote type="cite"><span>+index d58415270d0..a1f098c3b19 100644</span><br></blockquote><blockquote type="cite"><span> --- a/meson.build</span><br></blockquote><blockquote type="cite"><span> +++ b/meson.build</span><br></blockquote><blockquote type="cite"><span>-@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or</span><br></blockquote><blockquote type="cite"><span>with_gles2</span><br></blockquote><blockquote type="cite"><span>+@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or</span><br></blockquote><blockquote type="cite"><span>with_gles2</span><br></blockquote><blockquote type="cite"><span> &nbsp;# Only build shared_glapi if at least one OpenGL API is enabled</span><br></blockquote><blockquote type="cite"><span> &nbsp;with_shared_glapi = get_option('shared-glapi') and with_any_opengl</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',</span><br></blockquote><blockquote type="cite"><span>'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system())</span><br></blockquote><blockquote type="cite"><span>+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',</span><br></blockquote><blockquote type="cite"><span>'gnu/kfreebsd', 'dragonfly', 'linux',</span><br></blockquote><blockquote type="cite"><span>'sunos'].contains(host_machine.system())</span><br></blockquote><blockquote type="cite"><span> +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',</span><br></blockquote><blockquote type="cite"><span>'dragonfly'].contains(host_machine.system()) or</span><br></blockquote><blockquote type="cite"><span>host_machine.system().startswith('linux')</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> &nbsp;dri_drivers = get_option('dri-drivers')</span><br></blockquote><blockquote type="cite"><span> &nbsp;if dri_drivers.contains('auto')</span><br></blockquote><blockquote type="cite"><span>-@@ -845,7 +845,7 @@ if cc.compiles('int foo(void)</span><br></blockquote><blockquote type="cite"><span>__attribute__((__noreturn__));',</span><br></blockquote><blockquote type="cite"><span>+@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return</span><br></blockquote><blockquote type="cite"><span>0; }',</span><br></blockquote><blockquote type="cite"><span> &nbsp;endif</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> &nbsp;# TODO: this is very incomplete</span><br></blockquote><blockquote type="cite"><span> -if ['linux', 'cygwin', 'gnu',</span><br></blockquote><blockquote type="cite"><span>'gnu/kfreebsd'].contains(host_machine.system())</span><br></blockquote><blockquote type="cite"><span> +if ['cygwin', 'gnu',</span><br></blockquote><blockquote type="cite"><span>'gnu/kfreebsd'].contains(host_machine.system()) or</span><br></blockquote><blockquote type="cite"><span>host_machine.system().startswith('linux')</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;pre_args += '-D_GNU_SOURCE'</span><br></blockquote><blockquote type="cite"><span>- endif</span><br></blockquote><blockquote type="cite"><span>- </span><br></blockquote><blockquote type="cite"><span>+ elif host_machine.system() == 'sunos'</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;pre_args += '-D__EXTENSIONS__'</span><br></blockquote><blockquote type="cite"><span>+-- </span><br></blockquote><blockquote type="cite"><span>+2.23.0</span><br></blockquote><blockquote type="cite"><span>+</span><br></blockquote><blockquote type="cite"><span>diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-</span><br></blockquote><blockquote type="cite"><span>TLS-ELF-optional.patch b/meta/recipes-graphics/mesa/files/0002-</span><br></blockquote><blockquote type="cite"><span>meson.build-make-TLS-ELF-optional.patch</span><br></blockquote><blockquote type="cite"><span>new file mode 100644</span><br></blockquote><blockquote type="cite"><span>index 0000000000..c3b5e14cd6</span><br></blockquote><blockquote type="cite"><span>--- /dev/null</span><br></blockquote><blockquote type="cite"><span>+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-</span><br></blockquote><blockquote type="cite"><span>optional.patch</span><br></blockquote><blockquote type="cite"><span>@@ -0,0 +1,48 @@</span><br></blockquote><blockquote type="cite"><span>+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00</span><br></blockquote><blockquote type="cite"><span>2001</span><br></blockquote><blockquote type="cite"><span>+From: Alistair Francis &lt;<a href="mailto:alistair.francis@wdc.com">alistair.francis@wdc.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span>+Date: Wed, 23 Oct 2019 09:46:28 -0700</span><br></blockquote><blockquote type="cite"><span>+Subject: [PATCH] meson.build: make TLS ELF optional</span><br></blockquote><blockquote type="cite"><span>+</span><br></blockquote><blockquote type="cite"><span>+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original</span><br></blockquote><blockquote type="cite"><span>"make</span><br></blockquote><blockquote type="cite"><span>+TLS GLX optional again" patch updated to the latest mesa.</span><br></blockquote><blockquote type="cite"><span>+</span><br></blockquote><blockquote type="cite"><span>+Upstream-Status: Inappropriate [configuration]</span><br></blockquote><blockquote type="cite"><span>+Signed-off-by: Alistair Francis &lt;<a href="mailto:alistair.francis@wdc.com">alistair.francis@wdc.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span>+---</span><br></blockquote><blockquote type="cite"><span>+ meson.build &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| 2 +-</span><br></blockquote><blockquote type="cite"><span>+ meson_options.txt | 6 ++++++</span><br></blockquote><blockquote type="cite"><span>+ 2 files changed, 7 insertions(+), 1 deletion(-)</span><br></blockquote><blockquote type="cite"><span>+</span><br></blockquote><blockquote type="cite"><span>+diff --git a/meson.build b/meson.build</span><br></blockquote><blockquote type="cite"><span>+index 7992734..06653fe 100644</span><br></blockquote><blockquote type="cite"><span>+--- a/meson.build</span><br></blockquote><blockquote type="cite"><span>++++ b/meson.build</span><br></blockquote><blockquote type="cite"><span>+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or</span><br></blockquote><blockquote type="cite"><span>with_platform_surfaceless or with_plat</span><br></blockquote><blockquote type="cite"><span>+ endif</span><br></blockquote><blockquote type="cite"><span>+ </span><br></blockquote><blockquote type="cite"><span>+ # Android uses emutls for versions &lt;= P/28. For USE_ELF_TLS we need</span><br></blockquote><blockquote type="cite"><span>ELF TLS.</span><br></blockquote><blockquote type="cite"><span>+-if not with_platform_android or get_option('platform-sdk-version')</span><br></blockquote><blockquote type="cite"><blockquote type="cite"><span>= 29</span><br></blockquote></blockquote><blockquote type="cite"><span>++if (not with_platform_android or get_option('platform-sdk-version') </span><br></blockquote><blockquote type="cite"><blockquote type="cite"><span>= 29) and get_option('elf-tls')</span><br></blockquote></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;pre_args += '-DUSE_ELF_TLS'</span><br></blockquote><blockquote type="cite"><span>+ endif</span><br></blockquote><blockquote type="cite"><span>+ </span><br></blockquote><blockquote type="cite"><span>+diff --git a/meson_options.txt b/meson_options.txt</span><br></blockquote><blockquote type="cite"><span>+index 188e132..ddd47b7 100644</span><br></blockquote><blockquote type="cite"><span>+--- a/meson_options.txt</span><br></blockquote><blockquote type="cite"><span>++++ b/meson_options.txt</span><br></blockquote><blockquote type="cite"><span>+@@ -339,6 +339,12 @@ option(</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;value : true,</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;description : 'Enable direct rendering in GLX and EGL for DRI',</span><br></blockquote><blockquote type="cite"><span>+ )</span><br></blockquote><blockquote type="cite"><span>++option(</span><br></blockquote><blockquote type="cite"><span>++ &nbsp;'elf-tls',</span><br></blockquote><blockquote type="cite"><span>++ &nbsp;type : 'boolean',</span><br></blockquote><blockquote type="cite"><span>++ &nbsp;value : true,</span><br></blockquote><blockquote type="cite"><span>++ &nbsp;description : 'Enable TLS support in ELF',</span><br></blockquote><blockquote type="cite"><span>++)</span><br></blockquote><blockquote type="cite"><span>+ option(</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;'I-love-half-baked-turnips',</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;type : 'boolean',</span><br></blockquote><blockquote type="cite"><span>+-- </span><br></blockquote><blockquote type="cite"><span>+2.23.0</span><br></blockquote><blockquote type="cite"><span>+</span><br></blockquote><blockquote type="cite"><span>diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-</span><br></blockquote><blockquote type="cite"><span>TLS-GLX-optional-again.patch b/meta/recipes-graphics/mesa/files/0002-</span><br></blockquote><blockquote type="cite"><span>meson.build-make-TLS-GLX-optional-again.patch</span><br></blockquote><blockquote type="cite"><span>deleted file mode 100644</span><br></blockquote><blockquote type="cite"><span>index 641bacf1d9..0000000000</span><br></blockquote><blockquote type="cite"><span>--- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-</span><br></blockquote><blockquote type="cite"><span>optional-again.patch</span><br></blockquote><blockquote type="cite"><span>+++ /dev/null</span><br></blockquote><blockquote type="cite"><span>@@ -1,52 +0,0 @@</span><br></blockquote><blockquote type="cite"><span>-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00</span><br></blockquote><blockquote type="cite"><span>2001</span><br></blockquote><blockquote type="cite"><span>-From: Fabio Berton &lt;<a href="mailto:fabio.berton@ossystems.com.br">fabio.berton@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span>-Date: Wed, 12 Jun 2019 14:15:57 -0300</span><br></blockquote><blockquote type="cite"><span>-Subject: [PATCH] meson.build: make TLS GLX optional again</span><br></blockquote><blockquote type="cite"><span>-Organization: O.S. Systems Software LTDA.</span><br></blockquote><blockquote type="cite"><span>-</span><br></blockquote><blockquote type="cite"><span>-This was optional with autotools, and needs to be disabled</span><br></blockquote><blockquote type="cite"><span>-when using musl C library, for instance.</span><br></blockquote><blockquote type="cite"><span>-</span><br></blockquote><blockquote type="cite"><span>-Upstream-Status: Pending</span><br></blockquote><blockquote type="cite"><span>-</span><br></blockquote><blockquote type="cite"><span>-Signed-off-by: Alexander Kanavin &lt;<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>&gt;</span><br></blockquote><blockquote type="cite"><span>-Signed-off-by: Fabio Berton &lt;<a href="mailto:fabio.berton@ossystems.com.br">fabio.berton@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span>-Signed-off-by: Otavio Salvador &lt;<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>&gt;</span><br></blockquote><blockquote type="cite"><span>----</span><br></blockquote><blockquote type="cite"><span>- meson.build &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| 4 +++-</span><br></blockquote><blockquote type="cite"><span>- meson_options.txt | 7 +++++++</span><br></blockquote><blockquote type="cite"><span>- 2 files changed, 10 insertions(+), 1 deletion(-)</span><br></blockquote><blockquote type="cite"><span>-</span><br></blockquote><blockquote type="cite"><span>-diff --git a/meson.build b/meson.build</span><br></blockquote><blockquote type="cite"><span>-index b33b430aed4..0e50bb26c0a 100644</span><br></blockquote><blockquote type="cite"><span>---- a/meson.build</span><br></blockquote><blockquote type="cite"><span>-+++ b/meson.build</span><br></blockquote><blockquote type="cite"><span>-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or</span><br></blockquote><blockquote type="cite"><span>with_platform_surfaceless or with_plat</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;endif</span><br></blockquote><blockquote type="cite"><span>- endif</span><br></blockquote><blockquote type="cite"><span>- </span><br></blockquote><blockquote type="cite"><span>--pre_args += '-DGLX_USE_TLS'</span><br></blockquote><blockquote type="cite"><span>-+if get_option('glx-tls')</span><br></blockquote><blockquote type="cite"><span>-+ &nbsp;pre_args += '-DGLX_USE_TLS'</span><br></blockquote><blockquote type="cite"><span>-+endif</span><br></blockquote><blockquote type="cite"><span>- if with_glx != 'disabled'</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;if not (with_platform_x11 and with_any_opengl)</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;&nbsp;&nbsp;error('Cannot build GLX support without X11 platform support</span><br></blockquote><blockquote type="cite"><span>and at least one OpenGL API')</span><br></blockquote><blockquote type="cite"><span>-diff --git a/meson_options.txt b/meson_options.txt</span><br></blockquote><blockquote type="cite"><span>-index 1f72faabee8..fcd49efea27 100644</span><br></blockquote><blockquote type="cite"><span>---- a/meson_options.txt</span><br></blockquote><blockquote type="cite"><span>-+++ b/meson_options.txt</span><br></blockquote><blockquote type="cite"><span>-@@ -339,6 +339,13 @@ option(</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;value : true,</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;description : 'Enable direct rendering in GLX and EGL for DRI',</span><br></blockquote><blockquote type="cite"><span>- )</span><br></blockquote><blockquote type="cite"><span>-+option(</span><br></blockquote><blockquote type="cite"><span>-+ &nbsp;'glx-tls',</span><br></blockquote><blockquote type="cite"><span>-+ &nbsp;type : 'boolean',</span><br></blockquote><blockquote type="cite"><span>-+ &nbsp;value : true,</span><br></blockquote><blockquote type="cite"><span>-+ &nbsp;description : 'Enable TLS support in GLX',</span><br></blockquote><blockquote type="cite"><span>-+)</span><br></blockquote><blockquote type="cite"><span>-+</span><br></blockquote><blockquote type="cite"><span>- option(</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;'I-love-half-baked-turnips',</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;type : 'boolean',</span><br></blockquote><blockquote type="cite"><span>diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb</span><br></blockquote><blockquote type="cite"><span>b/meta/recipes-graphics/mesa/mesa-gl_19.2.3.bb</span><br></blockquote><blockquote type="cite"><span>similarity index 100%</span><br></blockquote><blockquote type="cite"><span>rename from meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb</span><br></blockquote><blockquote type="cite"><span>rename to meta/recipes-graphics/mesa/mesa-gl_19.2.3.bb</span><br></blockquote><blockquote type="cite"><span>diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-</span><br></blockquote><blockquote type="cite"><span>graphics/mesa/mesa.inc</span><br></blockquote><blockquote type="cite"><span>index 9e5808ee27..2f866a505c 100644</span><br></blockquote><blockquote type="cite"><span>--- a/meta/recipes-graphics/mesa/mesa.inc</span><br></blockquote><blockquote type="cite"><span>+++ b/meta/recipes-graphics/mesa/mesa.inc</span><br></blockquote><blockquote type="cite"><span>@@ -10,7 +10,7 @@ HOMEPAGE = "<a href="http://mesa3d.org">http://mesa3d.org</a>"</span><br></blockquote><blockquote type="cite"><span> BUGTRACKER = "<a href="https://bugs.freedesktop.org">https://bugs.freedesktop.org</a>"</span><br></blockquote><blockquote type="cite"><span> SECTION = "x11"</span><br></blockquote><blockquote type="cite"><span> LICENSE = "MIT"</span><br></blockquote><blockquote type="cite"><span>-LIC_FILES_CHKSUM =</span><br></blockquote><blockquote type="cite"><span>"file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4"</span><br></blockquote><blockquote type="cite"><span>+LIC_FILES_CHKSUM =</span><br></blockquote><blockquote type="cite"><span>"file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> PE = "2"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>@@ -57,12 +57,12 @@ PACKAGECONFIG_class-target ??= "</span><br></blockquote><blockquote type="cite"><span>${@bb.utils.filter('DISTRO_FEATURES', 'wayland v</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${@bb.utils.contains('DISTRO_FEATURES', 'opengl',</span><br></blockquote><blockquote type="cite"><span>'opengl egl gles gbm dri gallium', '', d)} \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${@bb.utils.contains('DISTRO_FEATURES', 'x11</span><br></blockquote><blockquote type="cite"><span>opengl', 'x11 dri3', '', d)} \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${@bb.utils.contains('DISTRO_FEATURES', 'x11</span><br></blockquote><blockquote type="cite"><span>vulkan', 'dri3', '', d)} \</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;glx-tls \</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;elf-tls \</span><br></blockquote><blockquote type="cite"><span>  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;"</span><br></blockquote><blockquote type="cite"><span>-PACKAGECONFIG_class-native ?= "gbm dri egl opengl glx-tls"</span><br></blockquote><blockquote type="cite"><span>-PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl glx-tls"</span><br></blockquote><blockquote type="cite"><span>+PACKAGECONFIG_class-native ?= "gbm dri egl opengl elf-tls"</span><br></blockquote><blockquote type="cite"><span>+PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl elf-tls"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>-PACKAGECONFIG_remove_libc-musl = "glx-tls"</span><br></blockquote><blockquote type="cite"><span>+PACKAGECONFIG_remove_libc-musl = "elf-tls"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> # "gbm" requires "dri", "opengl"</span><br></blockquote><blockquote type="cite"><span> PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false"</span><br></blockquote><blockquote type="cite"><span>@@ -70,7 +70,7 @@ PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false"</span><br></blockquote><blockquote type="cite"><span> X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage</span><br></blockquote><blockquote type="cite"><span>libxfixes xrandr"</span><br></blockquote><blockquote type="cite"><span> # "x11" requires "opengl"</span><br></blockquote><blockquote type="cite"><span> PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"</span><br></blockquote><blockquote type="cite"><span>-PACKAGECONFIG[glx-tls] = "-Dglx-tls=true, -Dglx-tls=false"</span><br></blockquote><blockquote type="cite"><span>+PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"</span><br></blockquote><blockquote type="cite"><span> PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-</span><br></blockquote><blockquote type="cite"><span>xvmc=false,libxvmc"</span><br></blockquote><blockquote type="cite"><span> PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-</span><br></blockquote><blockquote type="cite"><span>protocols"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>@@ -140,9 +140,6 @@ PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-</span><br></blockquote><blockquote type="cite"><span>Dosmesa=none"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> PACKAGECONFIG[unwind] = "-Dlibunwind=true,-</span><br></blockquote><blockquote type="cite"><span>Dlibunwind=false,libunwind"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>-# mesa tries to run cross-built gen_matypes on build machine to get</span><br></blockquote><blockquote type="cite"><span>struct size information</span><br></blockquote><blockquote type="cite"><span>-EXTRA_OEMESON_append = " -Dasm=false"</span><br></blockquote><blockquote type="cite"><span>-</span><br></blockquote><blockquote type="cite"><span> # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)</span><br></blockquote><blockquote type="cite"><span> FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>@@ -263,6 +260,9 @@ FILES_libxatracker-dev =</span><br></blockquote><blockquote type="cite"><span>"${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la">libxatracker.la</a> \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${includedir}/xa_tracker.h</span><br></blockquote><blockquote type="cite"><span>${includedir}/xa_composite.h ${includedir}/xa_context.h \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${libdir}/pkgconfig/xatracker.pc"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>+# This is a work around for </span><br></blockquote><blockquote type="cite"><span><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/966">https://gitlab.freedesktop.org/mesa/mesa/issues/966</a></span><br></blockquote><blockquote type="cite"><span>+INSANE_SKIP_${PN}_libc-musl += "textrel"</span><br></blockquote><blockquote type="cite"><span>+</span><br></blockquote><blockquote type="cite"><span> # Fix upgrade path from mesa to mesa-megadriver</span><br></blockquote><blockquote type="cite"><span> RREPLACES_mesa-megadriver = "mesa"</span><br></blockquote><blockquote type="cite"><span> RCONFLICTS_mesa-megadriver = "mesa"</span><br></blockquote><blockquote type="cite"><span>diff --git a/meta/recipes-graphics/mesa/mesa_19.1.6.bb</span><br></blockquote><blockquote type="cite"><span>b/meta/recipes-graphics/mesa/mesa_19.2.3.bb</span><br></blockquote><blockquote type="cite"><span>similarity index 77%</span><br></blockquote><blockquote type="cite"><span>rename from meta/recipes-graphics/mesa/mesa_19.1.6.bb</span><br></blockquote><blockquote type="cite"><span>rename to meta/recipes-graphics/mesa/mesa_19.2.3.bb</span><br></blockquote><blockquote type="cite"><span>index 19221e9e25..42181db6f8 100644</span><br></blockquote><blockquote type="cite"><span>--- a/meta/recipes-graphics/mesa/mesa_19.1.6.bb</span><br></blockquote><blockquote type="cite"><span>+++ b/meta/recipes-graphics/mesa/mesa_19.2.3.bb</span><br></blockquote><blockquote type="cite"><span>@@ -2,12 +2,12 @@ require ${BPN}.inc</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> SRC_URI = "<a href="https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz">https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz</a> \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;file://0001-meson.build-check-for-all-linux-host_os-</span><br></blockquote><blockquote type="cite"><span>combinations.patch \</span><br></blockquote><blockquote type="cite"><span>- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;file://0002-meson.build-make-TLS-GLX-optional-again.patch </span><br></blockquote><blockquote type="cite"><span>\</span><br></blockquote><blockquote type="cite"><span>+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;file://0002-meson.build-make-TLS-ELF-optional.patch \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;file://0003-Allow-enable-DRI-without-DRI-drivers.patch \</span><br></blockquote><blockquote type="cite"><span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>-SRC_URI[md5sum] = "7dbb40b8d10e89bee0a5bfc85350647b"</span><br></blockquote><blockquote type="cite"><span>-SRC_URI[sha256sum] =</span><br></blockquote><blockquote type="cite"><span>"2a369b7b48545c6486e7e44913ad022daca097c8bd937bf30dcf3f17a94d3496"</span><br></blockquote><blockquote type="cite"><span>+SRC_URI[md5sum] = "7744fbc59d55bb9a54ac018250bf77dc"</span><br></blockquote><blockquote type="cite"><span>+SRC_URI[sha256sum] =</span><br></blockquote><blockquote type="cite"><span>"5ee6e42504fe41dcc9a6eba26982656a675b2550a640946f463927ed7f1c5047"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span> UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P&lt;pver&gt;\d+(\.\d+)+)"</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>-- </span><br></blockquote><blockquote type="cite"><span>2.23.0</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><span></span><br><span>-- </span><br><span>_______________________________________________</span><br><span>Openembedded-core mailing list</span><br><span><a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a></span><br><span><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a></span><br></div></blockquote></body></html>