[11/13] mesa: update 20.1.2 -> 20.1.4

Submitted by Alexander Kanavin on Aug. 1, 2020, 9:23 p.m. | Patch ID: 174985

Details

Message ID 20200801212335.14922-11-alex.kanavin@gmail.com
State Accepted
Commit 5774386700196499eb6d29b93158165ad9c4c15c
Headers show

Commit Message

Alexander Kanavin Aug. 1, 2020, 9:23 p.m.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../files/0002-meson.build-make-TLS-ELF-optional.patch    | 8 ++++----
 .../mesa/{mesa-gl_20.1.2.bb => mesa-gl_20.1.4.bb}         | 0
 meta/recipes-graphics/mesa/mesa.inc                       | 2 +-
 .../mesa/{mesa_20.1.2.bb => mesa_20.1.4.bb}               | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_20.1.2.bb => mesa-gl_20.1.4.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_20.1.2.bb => mesa_20.1.4.bb} (100%)

Patch hide | download patch | download mbox

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 91e59d14ed..ee171ad1c8 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 @@ 
-From dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 Mon Sep 17 00:00:00 2001
+From 65857eaee12a21a631750ffcd9e64e0afbbc3af0 Mon Sep 17 00:00:00 2001
 From: Alistair Francis <alistair@alistair23.me>
 Date: Thu, 14 Nov 2019 13:08:31 -0800
 Subject: [PATCH] meson.build: make TLS ELF optional
@@ -15,15 +15,15 @@  Signed-off-by: Alistair Francis <alistair@alistair23.me>
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 261b588..311436e 100644
+index c51dde9..c16f78f 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -392,7 +392,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 host_machine.system() != 'windows' and (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')
+-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
++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')
    pre_args += '-DUSE_ELF_TLS'
  endif
  
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb b/meta/recipes-graphics/mesa/mesa-gl_20.1.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb
rename to 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 6fd92035f0..8d8e5288a9 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 \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            "
 
-SRC_URI[sha256sum] = "283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb"
+SRC_URI[sha256sum] = "6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta/recipes-graphics/mesa/mesa_20.1.2.bb b/meta/recipes-graphics/mesa/mesa_20.1.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_20.1.2.bb
rename to meta/recipes-graphics/mesa/mesa_20.1.4.bb