summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-08-22 14:50:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-23 08:25:53 +0100
commit10e15f62c1319ba96a80b3eb14cd9693a5a85ec8 (patch)
treee1a1c38587dc29a09213b8c8733d1c1358adca74 /meta/recipes-graphics/mesa/files
parentfbc6717a2e11164b04992091e667962644a4edd5 (diff)
downloadpoky-10e15f62c1319ba96a80b3eb14cd9693a5a85ec8.tar.gz
mesa: upgrade 21.1.5 -> 21.2.1
(From OE-Core rev: 0d0a0902fe8db8a87c16be3b722e3b8d5f193785) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch12
1 files changed, 6 insertions, 6 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 eac6d4df89..35ab8d5a72 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,4 +1,4 @@
1From d434b9e5d29d614b57c09e164e1d084094bf2150 Mon Sep 17 00:00:00 2001 1From 8f2f48b41aa17eec3c4d63685e3296f28e60b980 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair@alistair23.me> 2From: Alistair Francis <alistair@alistair23.me>
3Date: Thu, 14 Nov 2019 13:08:31 -0800 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
@@ -30,10 +30,10 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
30 2 files changed, 7 insertions(+), 1 deletion(-) 30 2 files changed, 7 insertions(+), 1 deletion(-)
31 31
32diff --git a/meson.build b/meson.build 32diff --git a/meson.build b/meson.build
33index 42f448e..02f6e33 100644 33index 23618c1..c8cc5e3 100644
34--- a/meson.build 34--- a/meson.build
35+++ b/meson.build 35+++ b/meson.build
36@@ -449,7 +449,7 @@ endif 36@@ -476,7 +476,7 @@ endif
37 use_elf_tls = false 37 use_elf_tls = false
38 if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and 38 if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
39 (not with_platform_android or get_option('platform-sdk-version') >= 29) and 39 (not with_platform_android or get_option('platform-sdk-version') >= 29) and
@@ -41,12 +41,12 @@ index 42f448e..02f6e33 100644
41+ (not with_platform_windows or not with_shared_glapi) and get_option('elf-tls')) 41+ (not with_platform_windows or not with_shared_glapi) and get_option('elf-tls'))
42 pre_args += '-DUSE_ELF_TLS' 42 pre_args += '-DUSE_ELF_TLS'
43 use_elf_tls = true 43 use_elf_tls = true
44 endif 44
45diff --git a/meson_options.txt b/meson_options.txt 45diff --git a/meson_options.txt b/meson_options.txt
46index a7030ab..635ec20 100644 46index 29c402c..f70d9b2 100644
47--- a/meson_options.txt 47--- a/meson_options.txt
48+++ b/meson_options.txt 48+++ b/meson_options.txt
49@@ -421,6 +421,12 @@ option( 49@@ -455,6 +455,12 @@ option(
50 value : true, 50 value : true,
51 description : 'Enable direct rendering in GLX and EGL for DRI', 51 description : 'Enable direct rendering in GLX and EGL for DRI',
52 ) 52 )