From patchwork Mon Apr 22 16:38:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 42762 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 3E261C4345F for ; Mon, 22 Apr 2024 16:39:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.756.1713803930269505733 for ; Mon, 22 Apr 2024 09:38:50 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D7716150C; Mon, 22 Apr 2024 09:39:17 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 344E53F7BD; Mon, 22 Apr 2024 09:38:49 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 1/5] waffle: remove dependency on udev Date: Mon, 22 Apr 2024 16:38:42 +0000 Message-Id: <20240422163846.1012183-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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 ; Mon, 22 Apr 2024 16:39:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198597 Waffle 1.8.0 dropped the use of libudev and instead uses libdrm[1] in the gbm code. Update the depends. [1] https://gitlab.freedesktop.org/mesa/waffle/-/commit/6bf58d4bb9044a7c65818d5de5d4ca747766e77f Signed-off-by: Ross Burton --- meta/recipes-graphics/waffle/waffle_1.8.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/waffle/waffle_1.8.0.bb b/meta/recipes-graphics/waffle/waffle_1.8.0.bb index 12b31dcff1c..ad8649b40ef 100644 --- a/meta/recipes-graphics/waffle/waffle_1.8.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.8.0.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" # wants gbm.pc egl.pc -PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm udev" +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm libdrm" # wants egl.pc PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" From patchwork Mon Apr 22 16:38:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 42766 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 4B81EC10F1A for ; Mon, 22 Apr 2024 16:39:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.762.1713803930832714546 for ; Mon, 22 Apr 2024 09:38:50 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 841F71515; Mon, 22 Apr 2024 09:39:18 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D5C493F7BD; Mon, 22 Apr 2024 09:38:49 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 2/5] ruby: remove obsolete build dependences Date: Mon, 22 Apr 2024 16:38:43 +0000 Message-Id: <20240422163846.1012183-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240422163846.1012183-1-ross.burton@arm.com> References: <20240422163846.1012183-1-ross.burton@arm.com> MIME-Version: 1.0 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 ; Mon, 22 Apr 2024 16:39:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198598 Ruby 3.3.0 no longer bundles the readline module[1] so readline is no longer a build dependency[2]. Ruby 3.2.0 no longer bundles the gdbm module[3] so gdbm is no longer a build dependency. [1] https://github.com/ruby/ruby/commit/59fd67fc3d405e529e038172e769ff20a8fb5535 [2] https://github.com/ruby/ruby/commit/172077232e7f40b4dfedf6a5434c252b3d326fab Signed-off-by: Ross Burton --- meta/recipes-devtools/ruby/ruby_3.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/ruby/ruby_3.3.0.bb b/meta/recipes-devtools/ruby/ruby_3.3.0.bb index 17eb6d73c2b..657fc31b4df 100644 --- a/meta/recipes-devtools/ruby/ruby_3.3.0.bb +++ b/meta/recipes-devtools/ruby/ruby_3.3.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \ " -DEPENDS = "zlib openssl libyaml gdbm readline libffi" +DEPENDS = "zlib openssl libyaml libffi" DEPENDS:append:class-target = " ruby-native" DEPENDS:append:class-nativesdk = " ruby-native" From patchwork Mon Apr 22 16:38:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 42764 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 598D9C07E8E for ; Mon, 22 Apr 2024 16:39:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.757.1713803931372713545 for ; Mon, 22 Apr 2024 09:38:51 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 305F4150C; Mon, 22 Apr 2024 09:39:19 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 832193F7BD; Mon, 22 Apr 2024 09:38:50 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 3/5] npth: update homepage Date: Mon, 22 Apr 2024 16:38:44 +0000 Message-Id: <20240422163846.1012183-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240422163846.1012183-1-ross.burton@arm.com> References: <20240422163846.1012183-1-ross.burton@arm.com> MIME-Version: 1.0 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 ; Mon, 22 Apr 2024 16:39:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198599 Set the homepage to the actual homepage, not that of the older GNU Pth. Also fix some whitespace in the license fields. Signed-off-by: Ross Burton --- meta/recipes-support/npth/npth_1.7.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb index f02a731f850..45d4efb4a9c 100644 --- a/meta/recipes-support/npth/npth_1.7.bb +++ b/meta/recipes-support/npth/npth_1.7.bb @@ -1,12 +1,11 @@ SUMMARY = "New GNU Portable Threads library" DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " -HOMEPAGE = "https://www.gnu.org/software/pth/" +HOMEPAGE = "https://gnupg.org/software/npth/" SECTION = "libs" LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "\ - file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\ - " +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" + SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://musl-fix.patch \ From patchwork Mon Apr 22 16:38:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 42765 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 6557FC41513 for ; Mon, 22 Apr 2024 16:39:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.758.1713803931922932232 for ; Mon, 22 Apr 2024 09:38:52 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D1BD71515; Mon, 22 Apr 2024 09:39:19 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 307133F7BD; Mon, 22 Apr 2024 09:38:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 4/5] npth: remove obsolete pkgconfig patch Date: Mon, 22 Apr 2024 16:38:45 +0000 Message-Id: <20240422163846.1012183-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240422163846.1012183-1-ross.burton@arm.com> References: <20240422163846.1012183-1-ross.burton@arm.com> MIME-Version: 1.0 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 ; Mon, 22 Apr 2024 16:39:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198600 npth now provides a pkg-config itself[1] so we don't need to patch one in anymore. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=f3cbbc86cb49a1729d6df573bd76a5559e7f636b Signed-off-by: Ross Burton --- .../recipes-support/npth/npth/pkgconfig.patch | 59 ------------------- meta/recipes-support/npth/npth_1.7.bb | 1 - 2 files changed, 60 deletions(-) delete mode 100644 meta/recipes-support/npth/npth/pkgconfig.patch diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch deleted file mode 100644 index e736921b43d..00000000000 --- a/meta/recipes-support/npth/npth/pkgconfig.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001 -From: Saul Wold -Date: Mon, 10 Nov 2014 13:59:03 -0800 -Subject: [PATCH] Added npth pkgconfig file - -Upstream-Status: Pending - -Signed-off-by: Saul Wold ---- - configure.ac | 1 + - src/Makefile.am | 4 +++- - src/npth.pc.in | 10 ++++++++++ - 3 files changed, 14 insertions(+), 1 deletion(-) - create mode 100644 src/npth.pc.in - -diff --git a/configure.ac b/configure.ac -index 10f3629..65b76a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,6 +476,7 @@ src/Makefile - w32/Makefile - tests/Makefile]) - AC_CONFIG_FILES(npth-config, chmod +x npth-config) -+AC_CONFIG_FILES([src/npth.pc]) - AC_OUTPUT - - echo " -diff --git a/src/Makefile.am b/src/Makefile.am -index 7070118..6f01c64 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -17,8 +17,10 @@ - # License along with this program; if not, see . - - ## Process this file with automake to produce Makefile.in -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = npth.pc - --EXTRA_DIST = libnpth.vers -+EXTRA_DIST = libnpth.vers npth.pc - # versioninfo.rc.in - nodist_include_HEADERS = npth.h - -diff --git a/src/npth.pc.in b/src/npth.pc.in -new file mode 100644 -index 0000000..db091e8 ---- /dev/null -+++ b/src/npth.pc.in -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: npth -+Description: a new portable posix threading library -+Version: @VERSION@ -+Libs: -L${libdir} -lnpth -lpthread -+Cflags: -I${includedir} diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb index 45d4efb4a9c..038caebd3d6 100644 --- a/meta/recipes-support/npth/npth_1.7.bb +++ b/meta/recipes-support/npth/npth_1.7.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ - file://pkgconfig.patch \ file://musl-fix.patch \ " From patchwork Mon Apr 22 16:38:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 42763 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 3F4F2C07C79 for ; Mon, 22 Apr 2024 16:39:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.759.1713803932706544864 for ; Mon, 22 Apr 2024 09:38:52 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7EB91150C; Mon, 22 Apr 2024 09:39:20 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D16D53F7BD; Mon, 22 Apr 2024 09:38:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 5/5] npth: remove obsolete binconfig-disabled inherit Date: Mon, 22 Apr 2024 16:38:46 +0000 Message-Id: <20240422163846.1012183-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240422163846.1012183-1-ross.burton@arm.com> References: <20240422163846.1012183-1-ross.burton@arm.com> MIME-Version: 1.0 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 ; Mon, 22 Apr 2024 16:39:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198601 npth no longer installs the npth-config script[1] that we disabled, so there's no need to inherit the class. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=2b6a8e5369ed37d64d1bafd3a546ec52e25acd26 Signed-off-by: Ross Burton --- meta/recipes-support/npth/npth_1.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb index 038caebd3d6..861f0b92c80 100644 --- a/meta/recipes-support/npth/npth_1.7.bb +++ b/meta/recipes-support/npth/npth_1.7.bb @@ -12,7 +12,7 @@ SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" -inherit autotools binconfig-disabled multilib_header +inherit autotools multilib_header FILES:${PN} = "${libdir}/libnpth.so.*"