License-Update: typo fix Signed-off-by: Alexander Kanavin <[email protected]> --- ...002-meson.build-make-TLS-ELF-optional.patch | 18 +++++++++--------- .../{mesa-gl_21.0.3.bb => mesa-gl_21.1.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 4 ++-- .../mesa/{mesa_21.0.3.bb => mesa_21.1.1.bb} | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_21.0.3.bb => mesa-gl_21.1.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_21.0.3.bb => mesa_21.1.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 df2346d336..eac6d4df89 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 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001 +From d434b9e5d29d614b57c09e164e1d084094bf2150 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,23 +30,23 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index efc6171..8450968 100644 +index 42f448e..02f6e33 100644 --- a/meson.build +++ b/meson.build -@@ -448,7 +448,7 @@ endif - - # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. +@@ -449,7 +449,7 @@ endif use_elf_tls = false --if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) -+if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') + if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and + (not with_platform_android or get_option('platform-sdk-version') >= 29) and +- (not with_platform_windows or not with_shared_glapi)) ++ (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 fc73f6e..d7482c0 100644 +index a7030ab..635ec20 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -420,6 +420,12 @@ option( +@@ -421,6 +421,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_21.1.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_21.1.1.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 4cec1034e4..32cc997c9e 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org"; BUGTRACKER = "https://bugs.freedesktop.org"; SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f" PE = "2" @@ -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] = "565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b" +SRC_URI[sha256sum] = "eec25ea379054e8911bc5de816aeb50f581b5b708414725003d2f00386b38dd2" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_21.0.3.bb b/meta/recipes-graphics/mesa/mesa_21.1.1.bb similarity index 99% rename from meta/recipes-graphics/mesa/mesa_21.0.3.bb rename to meta/recipes-graphics/mesa/mesa_21.1.1.bb index 8c584d8e9f..1993d6cbd0 100644 --- a/meta/recipes-graphics/mesa/mesa_21.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa_21.1.1.bb @@ -2,3 +2,4 @@ require ${BPN}.inc DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" + -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152172): https://lists.openembedded.org/g/openembedded-core/message/152172 Mute This Topic: https://lists.openembedded.org/mt/83046744/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
