diff options
author | Alistair Francis <alistair@alistair23.me> | 2019-11-14 12:22:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-21 23:08:19 +0000 |
commit | ed3079a7351c5f7bef9018b47cdc0f6c313f1a1c (patch) | |
tree | 41f47ae727cdeff0c91d8c0bf7045dc53651cb98 /meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch | |
parent | b8c34f9a241b9d79907c5022d67600630e8ed430 (diff) | |
download | poky-ed3079a7351c5f7bef9018b47cdc0f6c313f1a1c.tar.gz |
mesa: Upgrade to 19.2.4
Upgrade mesa and mesa-gl to 19.2.4.
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 have backported the asm removal as an attempt to fix the musl build
issue.
(From OE-Core rev: 82c2acc1f658f039becac04aa3dae696418bd1de)
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch | 52 |
1 files changed, 0 insertions, 52 deletions
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..0000000000 --- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Wed, 12 Jun 2019 14:15:57 -0300 | ||
4 | Subject: [PATCH] meson.build: make TLS GLX optional again | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | This was optional with autotools, and needs to be disabled | ||
8 | when using musl C library, for instance. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
14 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
15 | --- | ||
16 | meson.build | 4 +++- | ||
17 | meson_options.txt | 7 +++++++ | ||
18 | 2 files changed, 10 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/meson.build b/meson.build | ||
21 | index b33b430aed4..0e50bb26c0a 100644 | ||
22 | --- a/meson.build | ||
23 | +++ b/meson.build | ||
24 | @@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat | ||
25 | endif | ||
26 | endif | ||
27 | |||
28 | -pre_args += '-DGLX_USE_TLS' | ||
29 | +if get_option('glx-tls') | ||
30 | + pre_args += '-DGLX_USE_TLS' | ||
31 | +endif | ||
32 | if with_glx != 'disabled' | ||
33 | if not (with_platform_x11 and with_any_opengl) | ||
34 | error('Cannot build GLX support without X11 platform support and at least one OpenGL API') | ||
35 | diff --git a/meson_options.txt b/meson_options.txt | ||
36 | index 1f72faabee8..fcd49efea27 100644 | ||
37 | --- a/meson_options.txt | ||
38 | +++ b/meson_options.txt | ||
39 | @@ -339,6 +339,13 @@ option( | ||
40 | value : true, | ||
41 | description : 'Enable direct rendering in GLX and EGL for DRI', | ||
42 | ) | ||
43 | +option( | ||
44 | + 'glx-tls', | ||
45 | + type : 'boolean', | ||
46 | + value : true, | ||
47 | + description : 'Enable TLS support in GLX', | ||
48 | +) | ||
49 | + | ||
50 | option( | ||
51 | 'I-love-half-baked-turnips', | ||
52 | type : 'boolean', | ||