summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
diff options
context:
space:
mode:
authorAlistair Francis <alistair@alistair23.me>2019-12-20 22:36:48 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-01 10:46:16 +0000
commit34773a298ed795e9d43bf59f0c8456e6b601b0f2 (patch)
treef647fd94b97384769e24d51538f9ab4b435839d0 /meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
parentfc2ba05725d0d179f312706e68edbd3577e44a9d (diff)
downloadpoky-34773a298ed795e9d43bf59f0c8456e6b601b0f2.tar.gz
mesa: Upgrade to 19.3.1
Upgrade mesa to 19.3 and refresh the patches. As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going to change the do_install and add a patch to libepoxy to use the new define. 1: https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb (From OE-Core rev: 7a3d575ba56311c46122dfe9fa88094859fe9713) Signed-off-by: Alistair Francis <alistair@alistair23.me> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch')
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch18
1 files changed, 9 insertions, 9 deletions
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
index 199ed572d5..cd35a1f850 100644
--- 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
@@ -1,13 +1,13 @@
1From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001 1From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com> 2From: Alistair Francis <alistair@alistair23.me>
3Date: Wed, 23 Oct 2019 09:46:28 -0700 3Date: Thu, 14 Nov 2019 13:08:31 -0800
4Subject: [PATCH] meson.build: make TLS ELF optional 4Subject: [PATCH] meson.build: make TLS ELF optional
5 5
6USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make 6USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
7TLS GLX optional again" patch updated to the latest mesa. 7TLS GLX optional again" patch updated to the latest mesa.
8 8
9Upstream-Status: Inappropriate [configuration] 9Upstream-Status: Inappropriate [configuration]
10Signed-off-by: Alistair Francis <alistair.francis@wdc.com> 10Signed-off-by: Alistair Francis <alistair@alistair23.me>
11 11
12--- 12---
13 meson.build | 2 +- 13 meson.build | 2 +-
@@ -15,23 +15,23 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
15 2 files changed, 7 insertions(+), 1 deletion(-) 15 2 files changed, 7 insertions(+), 1 deletion(-)
16 16
17diff --git a/meson.build b/meson.build 17diff --git a/meson.build b/meson.build
18index a1f098c..1e31eb4 100644 18index 09e3759..a954118 100644
19--- a/meson.build 19--- a/meson.build
20+++ b/meson.build 20+++ b/meson.build
21@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat 21@@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
22 endif 22 endif
23 23
24 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. 24 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
25-if not with_platform_android or get_option('platform-sdk-version') >= 29 25-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
26+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') 26+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
27 pre_args += '-DUSE_ELF_TLS' 27 pre_args += '-DUSE_ELF_TLS'
28 endif 28 endif
29 29
30diff --git a/meson_options.txt b/meson_options.txt 30diff --git a/meson_options.txt b/meson_options.txt
31index b768c15..76cef24 100644 31index 626baf3..637ff14 100644
32--- a/meson_options.txt 32--- a/meson_options.txt
33+++ b/meson_options.txt 33+++ b/meson_options.txt
34@@ -333,6 +333,12 @@ option( 34@@ -341,6 +341,12 @@ option(
35 value : true, 35 value : true,
36 description : 'Enable direct rendering in GLX and EGL for DRI', 36 description : 'Enable direct rendering in GLX and EGL for DRI',
37 ) 37 )