Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Tue, 12 Nov 2019 at 19:16, Khem Raj wrote: > > > in this case, texrel will endup causing sigsegv, this is a mesa issue, > > > primarily we have been working it around so far. > > > > I sent a new patch, it probably doesn't fix this issue though. > > > > sure, and I think we should be able to address it with a patch or some > feature disable/enable a mechanism > I wonder what changed in new build system that it cant be knobbed out > as it used to be with autotools > It is probably upstream's removal of the 'asm' configuration switch which was previously set to false and now is always on. Seems like switching that on enables poorly written assembly code that causes the qa issue? Also there should be a runtime test for all of this. There is a test for kmscube over virgl but only for glibc. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Tue, Nov 12, 2019 at 10:07 AM Alistair Francis wrote: > > On Tue, Nov 12, 2019 at 8:19 AM Khem Raj wrote: > > > > On Sat, Nov 9, 2019 at 7:36 AM Alexander Kanavin > > wrote: > > > > > > On Sat, 9 Nov 2019 at 00:02, Alistair Francis > > > wrote: > > >> > > >> > right this means glx-tls is not working anymore, and it will fail on > > >> > musl at runtime > > >> > see > > >> > https://gitlab.freedesktop.org/mesa/mesa/issues/966 > > >> > > >> So what do we do here? > > >> > > >> There are some patches in that issue, but they don't cleanly apply and > > >> seem hacky anyway. Can we have two versions of mesa? One for musl and > > >> one for others until this is fixed upstream? > > > > > > > > > Maybe we can silence the warning for musl only, via > > > INSANE_SKIP_..._libc-musl = "textrel"? > > > ffmpeg does the same already. > > > > in this case, texrel will endup causing sigsegv, this is a mesa issue, > > primarily we have been working it around so far. > > I sent a new patch, it probably doesn't fix this issue though. > sure, and I think we should be able to address it with a patch or some feature disable/enable a mechanism I wonder what changed in new build system that it cant be knobbed out as it used to be with autotools > We can't just not update mesa because of this. We can certainly take time to fix it, we are early in release cycle. What about having two > versions, or for musl and one for glibc? > Probably a bad idea > Alistair > > > > > > > > > Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Tue, Nov 12, 2019 at 8:19 AM Khem Raj wrote: > > On Sat, Nov 9, 2019 at 7:36 AM Alexander Kanavin > wrote: > > > > On Sat, 9 Nov 2019 at 00:02, Alistair Francis wrote: > >> > >> > right this means glx-tls is not working anymore, and it will fail on > >> > musl at runtime > >> > see > >> > https://gitlab.freedesktop.org/mesa/mesa/issues/966 > >> > >> So what do we do here? > >> > >> There are some patches in that issue, but they don't cleanly apply and > >> seem hacky anyway. Can we have two versions of mesa? One for musl and > >> one for others until this is fixed upstream? > > > > > > Maybe we can silence the warning for musl only, via > > INSANE_SKIP_..._libc-musl = "textrel"? > > ffmpeg does the same already. > > in this case, texrel will endup causing sigsegv, this is a mesa issue, > primarily we have been working it around so far. I sent a new patch, it probably doesn't fix this issue though. We can't just not update mesa because of this. What about having two versions, or for musl and one for glibc? Alistair > > > > > Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Sat, Nov 9, 2019 at 7:36 AM Alexander Kanavin wrote: > > On Sat, 9 Nov 2019 at 00:02, Alistair Francis wrote: >> >> > right this means glx-tls is not working anymore, and it will fail on >> > musl at runtime >> > see >> > https://gitlab.freedesktop.org/mesa/mesa/issues/966 >> >> So what do we do here? >> >> There are some patches in that issue, but they don't cleanly apply and >> seem hacky anyway. Can we have two versions of mesa? One for musl and >> one for others until this is fixed upstream? > > > Maybe we can silence the warning for musl only, via INSANE_SKIP_..._libc-musl > = "textrel"? > ffmpeg does the same already. in this case, texrel will endup causing sigsegv, this is a mesa issue, primarily we have been working it around so far. > > Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Fri, Nov 08, 2019 at 10:13:07AM -0800, Khem Raj wrote: > On Fri, Nov 8, 2019 at 2:32 AM Ross Burton wrote: > > On 04/11/2019 22:48, Alistair Francis wrote: > > > From: Alistair Francis > > > > > > Upgrade mesa and mesa-gl to 19.2.1. > > > > > > The license hash change was a trivial new line removal. > > > > > > The glx-tls option was removed as it isn't included in the meson.build > > > file. It has been replaced with 'use-elf-tls' instead. > > > > I think this has regressed something, this is a new warning on musl builds: > > > > do_package_qa: QA Issue: ELF binary > > '[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations in .text > > [textrel] > > > > (ditto for libGLESv1_CM.so.1.1.0 libGL.so.1.2.0 libglapi.so.0.0.0) > > right this means glx-tls is not working anymore, and it will fail on > musl at runtime > see > https://gitlab.freedesktop.org/mesa/mesa/issues/966 glx-tls is already PACKAGECONFIG_remove_libc-musl. That this is no longer sufficient is the regression Ross mentioned. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Sat, 9 Nov 2019 at 00:02, Alistair Francis wrote: > > right this means glx-tls is not working anymore, and it will fail on > > musl at runtime > > see > > https://gitlab.freedesktop.org/mesa/mesa/issues/966 > > So what do we do here? > > There are some patches in that issue, but they don't cleanly apply and > seem hacky anyway. Can we have two versions of mesa? One for musl and > one for others until this is fixed upstream? > Maybe we can silence the warning for musl only, via INSANE_SKIP_..._libc-musl = "textrel"? ffmpeg does the same already. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Fri, Nov 8, 2019 at 10:13 AM Khem Raj wrote: > > On Fri, Nov 8, 2019 at 2:32 AM Ross Burton wrote: > > > > On 04/11/2019 22:48, Alistair Francis wrote: > > > From: Alistair Francis > > > > > > Upgrade mesa and mesa-gl to 19.2.1. > > > > > > The license hash change was a trivial new line removal. > > > > > > The glx-tls option was removed as it isn't included in the meson.build > > > file. It has been replaced with 'use-elf-tls' instead. > > > > I think this has regressed something, this is a new warning on musl builds: > > > > do_package_qa: QA Issue: ELF binary > > '[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations in .text > > [textrel] > > > > (ditto for libGLESv1_CM.so.1.1.0 libGL.so.1.2.0 libglapi.so.0.0.0) > > > > right this means glx-tls is not working anymore, and it will fail on > musl at runtime > see > https://gitlab.freedesktop.org/mesa/mesa/issues/966 So what do we do here? There are some patches in that issue, but they don't cleanly apply and seem hacky anyway. Can we have two versions of mesa? One for musl and one for others until this is fixed upstream? Alistair > > > Ross > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Fri, Nov 8, 2019 at 2:32 AM Ross Burton wrote: > > On 04/11/2019 22:48, Alistair Francis wrote: > > From: Alistair Francis > > > > Upgrade mesa and mesa-gl to 19.2.1. > > > > The license hash change was a trivial new line removal. > > > > The glx-tls option was removed as it isn't included in the meson.build > > file. It has been replaced with 'use-elf-tls' instead. > > I think this has regressed something, this is a new warning on musl builds: > > do_package_qa: QA Issue: ELF binary > '[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations in .text > [textrel] > > (ditto for libGLESv1_CM.so.1.1.0 libGL.so.1.2.0 libglapi.so.0.0.0) > right this means glx-tls is not working anymore, and it will fail on musl at runtime see https://gitlab.freedesktop.org/mesa/mesa/issues/966 > Ross > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On 04/11/2019 22:48, Alistair Francis wrote: From: Alistair Francis Upgrade mesa and mesa-gl to 19.2.1. The license hash change was a trivial new line removal. The glx-tls option was removed as it isn't included in the meson.build file. It has been replaced with 'use-elf-tls' instead. I think this has regressed something, this is a new warning on musl builds: do_package_qa: QA Issue: ELF binary '[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations in .text [textrel] (ditto for libGLESv1_CM.so.1.1.0 libGL.so.1.2.0 libglapi.so.0.0.0) Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
Acked-by: Otavio Salvador
---
v6:
- Rebase on master
v4:
- Add a patch (first patch in the series) to fix libsdl2 build
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...02-meson.build-make-TLS-ELF-optional.patch | 48 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 15 +++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 6 +--
5 files changed, 57 insertions(+), 64 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (77%)
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
new file mode 100644
index 00..c3b5e14cd6
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,48 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Alistair Francis
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7992734..06653fe 100644
+--- a/meson.build
b/meson.build
+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+ endif
+
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++if (not with_platform_android or get_option('platform-sdk-version') >= 29)
and get_option('elf-tls')
+ pre_args += '-DUSE_ELF_TLS'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 188e132..ddd47b7 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -339,6 +339,12 @@ option(
+ value : true,
+ description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++ 'elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Enable TLS support in ELF',
++)
+ option(
+ 'I-love-half-baked-turnips',
+ type : 'boolean',
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Enable TLS support in GLX',
-+)
-+
- option(
-
