From patchwork Fri Dec 15 14:17:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 36410 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87FAAC47070 for ; Fri, 15 Dec 2023 14:17:50 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web11.63606.1702649863298395552 for ; Fri, 15 Dec 2023 06:17:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=TI2jAyhk; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=Rl259EHL; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018c6dd72da8-6818b158-c325-401d-93d0-1ee6baf1e5ea-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1702649868; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=X5j3OvsW+0xDy8oCn+ZUNUZpMhaAz6zH9gHzpVoIB4o=; b=TI2jAyhkkb0mmy95QPZLu8KcqMacFHAt9FOgP//u05whQmncMXyY3MU4wQTNHsbB 8lpSra9MtCib7BjO0Wqxdzym7ACdUNaCn8Hx9iOX0FfSceCslrUrtKS9OfDNi5k7qBM 1mD5DaM0eCKu3keRSHhhGO605mksr3KDngFNku08= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1702649868; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=X5j3OvsW+0xDy8oCn+ZUNUZpMhaAz6zH9gHzpVoIB4o=; b=Rl259EHLLjhZEFYc02mcY5ZQoAOO+AOe+zifwKs931HN2IdFveoNrysSVcxjLt/I B8rOdzQCGg4AScE9he0lotZuuK13w26e28gojHyagcV/gsmtoyhjcvn6bETXaAfThKI whrETbefPz8Qey5Y3YPWMwuQ5YxtXjt3Jcs6Avo4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Otavio Salvador Cc: openembedded-core@lists.openembedded.org Subject: [AUH] mesa: upgrading to 23.3.1 SUCCEEDED Message-ID: <0101018c6dd72da8-6818b158-c325-401d-93d0-1ee6baf1e5ea-000000@us-west-2.amazonses.com> Date: Fri, 15 Dec 2023 14:17:47 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.12.15-54.240.27.191 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 Dec 2023 14:17:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192511 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *mesa* to *23.3.1* has Succeeded. Next steps: - apply the patch: git am 0001-mesa-upgrade-23.2.1-23.3.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From f33a452f3963295b855311a5b1ed589446f98cc1 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Dec 2023 10:42:54 +0000 Subject: [PATCH] mesa: upgrade 23.2.1 -> 23.3.1 --- .../0001-gallium-Fix-build-with-llvm-17.patch | 2 +- ...e-cmake-dependency-detector-for-llvm.patch | 42 ------------------- ...sdetects-64bit-atomics-on-mips-clang.patch | 2 +- ...k-for-all-linux-host_os-combinations.patch | 6 +-- meta/recipes-graphics/mesa/mesa.inc | 5 +-- .../mesa/{mesa_23.2.1.bb => mesa_23.3.1.bb} | 0 6 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch rename meta/recipes-graphics/mesa/{mesa_23.2.1.bb => mesa_23.3.1.bb} (100%) diff --git a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch index 237f940f0b..ba246280b5 100644 --- a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +++ b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch @@ -1,4 +1,4 @@ -From 6d07f6aa7f92f40d78a2db645f16f0f3e7d3c2e8 Mon Sep 17 00:00:00 2001 +From b51712a0ff7ecc17567a5cc9b290a7b301386ec5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 23 Jun 2023 01:20:38 -0700 Subject: [PATCH] gallium: Fix build with llvm 17 diff --git a/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch b/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch deleted file mode 100644 index 4cded0546d..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 28 Sep 2023 15:34:22 -0700 -Subject: [PATCH] meson: use llvm-config instead of cmake to fix linking errors with meson 1.2.1 - -meson dependency auto dependency detection uses cmake and then -config-tool to process dependencies, in mesa the logic to detect llvm is -using auto detection which means if it finds cmake then it will try to -use cmake method. Cmake method works ok except a case when llvm-dev -package is installed on the build host then it generates its own -native.meson file and ignores OE supplied meson.native file which has -correct llvm-config tool specified which is pointing to llvm-config from -native sysroot. The generated meson.native file points to one found in -/usr/bin and there onwards detector finds native install of llvm and -configures that into building native mesa package. - -Since cmake detector does not always work, disable it by default and use -config-tool which works in all cases. This is suggested in below issues -too - -A similar issue is open in meson upstream [1] and mesa [2] - -[1] https://github.com/mesonbuild/meson/issues/10483 -[2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438] - -Signed-off-by: Khem Raj ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - ---- a/meson.build -+++ b/meson.build -@@ -1659,6 +1659,7 @@ with_llvm = false - if _llvm.allowed() - dep_llvm = dependency( - 'llvm', -+ method : host_machine.system() == 'windows' ? 'auto' : 'config-tool', - version : _llvm_version, - modules : llvm_modules, - optional_modules : llvm_optional_modules, diff --git a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch index 9cd9bee2d2..09619f63b2 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch @@ -1,4 +1,4 @@ -From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001 +From 86f963f152d8aef8991705767e48729982ec048f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 13 Jan 2020 15:23:47 -0800 Subject: [PATCH] meson misdetects 64bit atomics on mips/clang diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index a555c5f865..7fa94cb41a 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -1,4 +1,4 @@ -From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001 +From dc08e8d85df711a37e297dd1756632f4346b1ce1 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations @@ -20,7 +20,7 @@ Signed-off-by: Alistair Francis 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 22385d8..15f48a6 100644 +index fbb0b29..9063169 100644 --- a/meson.build +++ b/meson.build @@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 @@ -32,7 +32,7 @@ index 22385d8..15f48a6 100644 gallium_drivers = get_option('gallium-drivers') if gallium_drivers.contains('auto') -@@ -909,7 +909,7 @@ if cc.has_function('fmemopen') +@@ -955,7 +955,7 @@ if cc.has_function('fmemopen') endif # TODO: this is very incomplete diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e5c405a972..7fbb242b62 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -18,10 +18,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-gallium-Fix-build-with-llvm-17.patch \ - file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ -" + " -SRC_URI[sha256sum] = "64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc" +SRC_URI[sha256sum] = "6e48126d70fdb3f20ffeb246ca0c2e41ffdc835f0663a03d4526b8bf5db41de6" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_23.2.1.bb b/meta/recipes-graphics/mesa/mesa_23.3.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_23.2.1.bb rename to meta/recipes-graphics/mesa/mesa_23.3.1.bb