From patchwork Fri Dec 3 16:43:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 600 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 75DAEC433EF for ; Fri, 3 Dec 2021 16:43:46 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13839.1638549825327887941 for ; Fri, 03 Dec 2021 08:43:45 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 8AF211435 for ; Fri, 3 Dec 2021 08:43:44 -0800 (PST) Received: from oss-tx204.lab.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 356863F73B for ; Fri, 3 Dec 2021 08:43:44 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/6] libx11: update patch status Date: Fri, 3 Dec 2021 16:43:35 +0000 Message-Id: <20211203164340.2963235-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.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 ; Fri, 03 Dec 2021 16:43:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159119 This patch has now been merged upstream. Signed-off-by: Ross Burton --- .../libx11/Fix-hanging-issue-in-_XReply.patch | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch index 2a723b7e43..660e6968bf 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch @@ -9,17 +9,8 @@ If one thread was blocking waiting for an event and another thread sent a reply to the X server, both threads got blocked until an event was received. -Upstream-Status: Submitted [https://patchwork.freedesktop.org/patch/171458/] - -This patch needs to be removed once the corresponding patch has been merged upstream. - -https://patchwork.freedesktop.org/patch/171458/ - -Signed-off-by: Tatu Frisk -Signed-off-by: Jose Alarcon - -[Refreshed for 1.6.7 update] -Signed-off-by: Armin Kuster +Upstream-Status: Backport [93a050c3ad2d2264d3880db3791387b1a9bf2e9e] +Signed-off-by: Ross Burton --- src/xcb_io.c | 19 +++++++------------ From patchwork Fri Dec 3 16:43:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 603 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 5CDE7C4332F for ; Fri, 3 Dec 2021 16:43:47 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13841.1638549826126588879 for ; Fri, 03 Dec 2021 08:43:46 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 1C2A01477 for ; Fri, 3 Dec 2021 08:43:45 -0800 (PST) Received: from oss-tx204.lab.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 BC1733F73B for ; Fri, 3 Dec 2021 08:43:44 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/6] libxkbcommon: remove obsolete util-macros dependency Date: Fri, 3 Dec 2021 16:43:36 +0000 Message-Id: <20211203164340.2963235-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203164340.2963235-1-ross.burton@arm.com> References: <20211203164340.2963235-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 ; Fri, 03 Dec 2021 16:43:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159120 This is a hang-over from the autotools build system. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb index 0e75ed03dc..95accfc184 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.xkbcommon.org" LIC_FILES_CHKSUM = "file://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87" LICENSE = "MIT & MIT-style" -DEPENDS = "util-macros flex-native bison-native" +DEPENDS = "flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" From patchwork Fri Dec 3 16:43:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 605 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 58131C433EF for ; Fri, 3 Dec 2021 16:43:52 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13843.1638549831318595037 for ; Fri, 03 Dec 2021 08:43:51 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 A289A14BF for ; Fri, 3 Dec 2021 08:43:45 -0800 (PST) Received: from oss-tx204.lab.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 4E45F3F73B for ; Fri, 3 Dec 2021 08:43:45 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/6] libxkbcommon: allow building of API documentation Date: Fri, 3 Dec 2021 16:43:37 +0000 Message-Id: <20211203164340.2963235-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203164340.2963235-1-ross.burton@arm.com> References: <20211203164340.2963235-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 ; Fri, 03 Dec 2021 16:43:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159124 Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb index 95accfc184..725fcf009e 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb @@ -15,11 +15,14 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/" inherit meson pkgconfig -EXTRA_OEMESON = "-Denable-docs=false -Denable-xkbregistry=false" +EXTRA_OEMESON = "-Denable-xkbregistry=false" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" -PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," +PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '', d)}" + +PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native" PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," # Fix a following runtime error: # xkbcommon: ERROR: couldn't find a Compose file for locale "C" From patchwork Fri Dec 3 16:43:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 601 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 5BD20C433F5 for ; Fri, 3 Dec 2021 16:43:47 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.13794.1638549826557827158 for ; Fri, 03 Dec 2021 08:43:46 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 34BCB1435 for ; Fri, 3 Dec 2021 08:43:46 -0800 (PST) Received: from oss-tx204.lab.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 D4A6F3F73B for ; Fri, 3 Dec 2021 08:43:45 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/6] xkbcommon: split xkbcli into a separate package Date: Fri, 3 Dec 2021 16:43:38 +0000 Message-Id: <20211203164340.2963235-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203164340.2963235-1-ross.burton@arm.com> References: <20211203164340.2963235-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 ; Fri, 03 Dec 2021 16:43:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159121 Not everyone wants the CLI, so put it in a separate package to reduce mandatory dependencies. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb index 725fcf009e..b4541cc698 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb @@ -24,6 +24,9 @@ PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native" PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," +PACKAGE_BEFORE_PN += "xkbcli" +FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" + # Fix a following runtime error: # xkbcommon: ERROR: couldn't find a Compose file for locale "C" RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" From patchwork Fri Dec 3 16:43:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 602 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 576BBC43217 for ; Fri, 3 Dec 2021 16:43:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.14003.1638549827130374587 for ; Fri, 03 Dec 2021 08:43:47 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 BB8831477 for ; Fri, 3 Dec 2021 08:43:46 -0800 (PST) Received: from oss-tx204.lab.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 676C63F73B for ; Fri, 3 Dec 2021 08:43:46 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/6] libxkbcommon: split libraries into separate packages Date: Fri, 3 Dec 2021 16:43:39 +0000 Message-Id: <20211203164340.2963235-5-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203164340.2963235-1-ross.burton@arm.com> References: <20211203164340.2963235-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 ; Fri, 03 Dec 2021 16:43:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159122 The sublibraries, such as libxkbcommon-x11, have specific linkage, so to avoid link creep they can be put into separate packages. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb index b4541cc698..425c1f386d 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb @@ -25,8 +25,14 @@ PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-n PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," PACKAGE_BEFORE_PN += "xkbcli" +FILES:${PN} = "" FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" +python populate_packages:prepend () { + # Put the libraries into separate packages to avoid dependency creep + do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True) +} + # Fix a following runtime error: # xkbcommon: ERROR: couldn't find a Compose file for locale "C" RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" From patchwork Fri Dec 3 16:43:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 604 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 576F5C43219 for ; Fri, 3 Dec 2021 16:43:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.13794.1638549826557827158 for ; Fri, 03 Dec 2021 08:43:47 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 4DE531435 for ; Fri, 3 Dec 2021 08:43:47 -0800 (PST) Received: from oss-tx204.lab.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 EDC5C3F73B for ; Fri, 3 Dec 2021 08:43:46 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/6] xkbcommon: add option for xkbregistry Date: Fri, 3 Dec 2021 16:43:40 +0000 Message-Id: <20211203164340.2963235-6-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203164340.2963235-1-ross.burton@arm.com> References: <20211203164340.2963235-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 ; Fri, 03 Dec 2021 16:43:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159123 Enable by default, now that libraries are split into separate packages this won't cause a change to existing setups. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb index 425c1f386d..b2717f61bc 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb @@ -15,14 +15,13 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/" inherit meson pkgconfig -EXTRA_OEMESON = "-Denable-xkbregistry=false" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry" PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '', d)}" PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native" PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," +PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2" PACKAGE_BEFORE_PN += "xkbcli" FILES:${PN} = ""