summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-01 21:23:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-02 13:42:09 (GMT)
commit06838f93e5f3d49c86804f2110fbb0794c94ed43 (patch)
tree6c533ca35b265f2a448d5016f62d17cbaa822cae
parentbf63957752ba6b63e3daaab323cefe1d0b12a1ba (diff)
downloadpoky-06838f93e5f3d49c86804f2110fbb0794c94ed43.tar.gz
mesa: update 20.1.2 -> 20.1.4
(From OE-Core rev: 5774386700196499eb6d29b93158165ad9c4c15c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch8
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_20.1.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa_20.1.4.bb (renamed from meta/recipes-graphics/mesa/mesa_20.1.2.bb)0
4 files changed, 5 insertions, 5 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 91e59d1..ee171ad 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 dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 Mon Sep 17 00:00:00 2001 1From 65857eaee12a21a631750ffcd9e64e0afbbc3af0 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
@@ -15,15 +15,15 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
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 261b588..311436e 100644 18index c51dde9..c16f78f 100644
19--- a/meson.build 19--- a/meson.build
20+++ b/meson.build 20+++ b/meson.build
21@@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat 21@@ -392,7 +392,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 host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) 25-if not ['windows', 'freebsd'].contains(host_machine.system()) 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 ['windows', 'freebsd'].contains(host_machine.system()) and (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
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb b/meta/recipes-graphics/mesa/mesa-gl_20.1.4.bb
index e50782b..e50782b 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_20.1.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6fd9203..8d8e528 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
23 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 23 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
24 " 24 "
25 25
26SRC_URI[sha256sum] = "283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb" 26SRC_URI[sha256sum] = "6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe"
27 27
28UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 28UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
29 29
diff --git a/meta/recipes-graphics/mesa/mesa_20.1.2.bb b/meta/recipes-graphics/mesa/mesa_20.1.4.bb
index 96e8aa3..96e8aa3 100644
--- a/meta/recipes-graphics/mesa/mesa_20.1.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_20.1.4.bb