From patchwork Fri Dec 1 13:14:52 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: 35543 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 84043C10F1D for ; Fri, 1 Dec 2023 13:14:57 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web11.22182.1701436490758350134 for ; Fri, 01 Dec 2023 05:14:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=XptDuyW/; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=qr4uu7ub; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101018c25848b62-8752194b-1291-4d0c-8f26-42f6cf5f88dd-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=1701436492; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=FzDnjdke49Kz8V415ocfumPwIio9yBbCJziRLepQfhE=; b=XptDuyW/nLiG86yzCRRZqCJUmB9g986Iw64HI7qXhuR7LN80rz6k9aEafTg1tDH2 5dLTf0YvgTuCPbS+tVGXNOPKiZlD6vas9Skmr37I1HrAUqakg0HSKP1ihM48HieNfF2 3ofxMWzR1uf+drVj4Plvkge1jUsnzJManOQvf3z4= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1701436492; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=FzDnjdke49Kz8V415ocfumPwIio9yBbCJziRLepQfhE=; b=qr4uu7ub6ZHh6qcazH4kq+wNjwjexpdrohBsbJzUtg23NWncdHyGolqf0eEwV6tX 9sdXbzHQ767OaeqZQtgNAL+w+9pVoCTGF0WWAu/cFnpcFioWkHuU8UxK09fDjecu/GR Dh0Ik0s/eHuxbkPpiaNZTaXQ9dJrOrfHtIpxhnuI= MIME-Version: 1.0 From: auh@yoctoproject.org To: Otavio Salvador Cc: openembedded-core@lists.openembedded.org Subject: [AUH] mesa: upgrading to 23.3.0 SUCCEEDED Message-ID: <0101018c25848b62-8752194b-1291-4d0c-8f26-42f6cf5f88dd-000000@us-west-2.amazonses.com> Date: Fri, 1 Dec 2023 13:14:52 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.27.193 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, 01 Dec 2023 13:14:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191651 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *mesa* to *23.3.0* has Succeeded. Next steps: - apply the patch: git am 0001-mesa-upgrade-23.2.1-23.3.0.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 53614bcfcfb9cc61f71bc6fe5b4cb73d76535c36 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 1 Dec 2023 11:46:29 +0000 Subject: [PATCH] mesa: upgrade 23.2.1 -> 23.3.0 --- ...e-cmake-dependency-detector-for-llvm.patch | 42 ------------------- meta/recipes-graphics/mesa/mesa.inc | 5 +-- .../mesa/{mesa_23.2.1.bb => mesa_23.3.0.bb} | 0 3 files changed, 2 insertions(+), 45 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.0.bb} (100%) 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/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e5c405a972..b75863d6ee 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] = "50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5" 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.0.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_23.2.1.bb rename to meta/recipes-graphics/mesa/mesa_23.3.0.bb