Signed-off-by: Alexander Kanavin <[email protected]> --- .../0002-meson.build-make-TLS-ELF-optional.patch | 12 ++++++------ .../mesa/{mesa-gl_21.1.7.bb => mesa-gl_21.2.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- .../mesa/{mesa_21.1.7.bb => mesa_21.2.1.bb} | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_21.1.7.bb => mesa-gl_21.2.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_21.1.7.bb => mesa_21.2.1.bb} (99%)
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 @@ -From d434b9e5d29d614b57c09e164e1d084094bf2150 Mon Sep 17 00:00:00 2001 +From 8f2f48b41aa17eec3c4d63685e3296f28e60b980 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional @@ -30,10 +30,10 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 42f448e..02f6e33 100644 +index 23618c1..c8cc5e3 100644 --- a/meson.build +++ b/meson.build -@@ -449,7 +449,7 @@ endif +@@ -476,7 +476,7 @@ endif use_elf_tls = false if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and @@ -41,12 +41,12 @@ index 42f448e..02f6e33 100644 + (not with_platform_windows or not with_shared_glapi) and get_option('elf-tls')) pre_args += '-DUSE_ELF_TLS' use_elf_tls = true - endif + diff --git a/meson_options.txt b/meson_options.txt -index a7030ab..635ec20 100644 +index 29c402c..f70d9b2 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -421,6 +421,12 @@ option( +@@ -455,6 +455,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.1.7.bb b/meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_21.1.7.bb rename to meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 145d08487c..2fb823dfb8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb" +SRC_URI[sha256sum] = "2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_21.1.7.bb b/meta/recipes-graphics/mesa/mesa_21.2.1.bb similarity index 99% rename from meta/recipes-graphics/mesa/mesa_21.1.7.bb rename to meta/recipes-graphics/mesa/mesa_21.2.1.bb index 951fe8333b..4cb7e80eb5 100644 --- a/meta/recipes-graphics/mesa/mesa_21.1.7.bb +++ b/meta/recipes-graphics/mesa/mesa_21.2.1.bb @@ -2,3 +2,4 @@ require ${BPN}.inc DRIDRIVERS ??= "" DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965" DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965" + -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155114): https://lists.openembedded.org/g/openembedded-core/message/155114 Mute This Topic: https://lists.openembedded.org/mt/85060423/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
