From patchwork Sat Jun 1 17:33:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 44546 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 352F0C3065A for ; Sat, 1 Jun 2024 17:33:41 +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.42224.1717263219257218023 for ; Sat, 01 Jun 2024 10:33:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=XlA63dlL; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=2D3BV0VN; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018fd4dd3842-7509e4ae-45d9-4cba-9ae0-6084ef891431-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1717263218; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=doxmCHEta+Jh81vVtkpVxi6ClBNqwxJbQFfSQO5CJtk=; b=XlA63dlLkAqcnOUfiafD+cKOPx0YW+GgVTQQcL79e2iSKa4vDayyFG9jdf8g/4Pt uQCFGzdUq9B2m2K42oeRPdZuGxQZB3yBd6xy0ZQITu8w8UKJVTMNwop5gw1Njnt9WPG uhDJXuDu1hrobxrVfhX0JHQcoGXCH7CRbYBSWpzI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1717263218; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=doxmCHEta+Jh81vVtkpVxi6ClBNqwxJbQFfSQO5CJtk=; b=2D3BV0VNccyz3pV2D4/7LQ5so9GHfObC/yEXVDgtvZkXUfn4jY/GnONb0Oell4sT yRpIQZlJKaL3ymYCfEyInWzFT8ZkdmVfrQj85NX5qCAEZ+pwjpPZEN2uvYLEqQwFA46 yN42gnS0yoAAgRzs1NGgT9vKx+UaNMFT+pjGSkfk= MIME-Version: 1.0 From: auh@yoctoproject.org To: Denys Dmytriyenko Cc: openembedded-core@lists.openembedded.org Subject: [AUH] wayland: upgrading to 1.23.0 SUCCEEDED Message-ID: <0101018fd4dd3842-7509e4ae-45d9-4cba-9ae0-6084ef891431-000000@us-west-2.amazonses.com> Date: Sat, 1 Jun 2024 17:33:38 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.06.01-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 ; Sat, 01 Jun 2024 17:33:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200163 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *wayland* to *1.23.0* has Succeeded. Next steps: - apply the patch: git am 0001-wayland-upgrade-1.22.0-1.23.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 e424903aa1cd85ca12d209da67e973649a0e07cc Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 1 Jun 2024 14:08:18 +0000 Subject: [PATCH] wayland: upgrade 1.22.0 -> 1.23.0 --- ...build-Fix-strndup-detection-on-MinGW.patch | 9 ++-- ...der-pkgconfig-sysroot-for-pkgdatadir.patch | 46 ------------------- .../{wayland_1.22.0.bb => wayland_1.23.0.bb} | 3 +- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch rename meta/recipes-graphics/wayland/{wayland_1.22.0.bb => wayland_1.23.0.bb} (93%) diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch index bc753de113..c6ddf8a1f9 100644 --- a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -1,4 +1,4 @@ -From b4c64b6f07743e3fb63ce52359bc664ab7d60df0 Mon Sep 17 00:00:00 2001 +From a90bfa622f7323074c715674b368cba80bc7d196 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 20 Feb 2020 15:20:45 -0600 Subject: [PATCH] build: Fix strndup detection on MinGW @@ -20,10 +20,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 3bc25c9..adde7b9 100644 +index 8e28f2a..b56ba91 100644 --- a/meson.build +++ b/meson.build -@@ -38,11 +38,11 @@ have_funcs = [ +@@ -45,11 +45,11 @@ have_funcs = [ 'prctl', 'memfd_create', 'mremap', @@ -36,6 +36,3 @@ index 3bc25c9..adde7b9 100644 config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include ')) have_broken_msg_cmsg_cloexec = false if host_machine.system() == 'freebsd' --- -2.7.4 - diff --git a/meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch b/meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch deleted file mode 100644 index 4573bb635a..0000000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ff8ecbe8891d592e645927659318720f9e190054 Mon Sep 17 00:00:00 2001 -From: Andreas Cord-Landwehr -Date: Sun, 6 Feb 2022 17:23:46 +0100 -Subject: [PATCH] Consider pkgconfig sysroot for pkgdatadir - -For libs/cflags this is done automatically, but not for manually accessed -variables. This matches what wayland-protocols does. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/272] ---- - src/meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index a8a1d2b..721e151 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -65,7 +65,7 @@ if get_option('scanner') - version: meson.project_version(), - variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), -- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), -+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), - 'wayland_scanner=${bindir}/wayland-scanner' - ], -@@ -211,7 +211,7 @@ if get_option('libraries') - filebase: 'wayland-server', - variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), -- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) -+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) - ] - ) - -@@ -250,7 +250,7 @@ if get_option('libraries') - filebase: 'wayland-client', - variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), -- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) -+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) - ] - ) - --- -2.37.2 diff --git a/meta/recipes-graphics/wayland/wayland_1.22.0.bb b/meta/recipes-graphics/wayland/wayland_1.23.0.bb similarity index 93% rename from meta/recipes-graphics/wayland/wayland_1.22.0.bb rename to meta/recipes-graphics/wayland/wayland_1.23.0.bb index e7babc9ec6..8ff47ac171 100644 --- a/meta/recipes-graphics/wayland/wayland_1.22.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.23.0.bb @@ -15,9 +15,8 @@ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ - file://0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch \ " -SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" +SRC_URI[sha256sum] = "05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2" UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" UPSTREAM_CHECK_REGEX = "releases/(?P\d+\.\d+\.(?!9\d+)\d+)"