From patchwork Tue Dec 13 16:17:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16722 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 AA279C10F1D for ; Tue, 13 Dec 2022 16:17:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.77804.1670948260298278284 for ; Tue, 13 Dec 2022 08:17:40 -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 F06211655; Tue, 13 Dec 2022 08:18:19 -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 EC51F3F71E; Tue, 13 Dec 2022 08:17:38 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 2/4] at-spi2-core: clean up x11 enabling Date: Tue, 13 Dec 2022 16:17:30 +0000 Message-Id: <20221213161732.865885-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221213161732.865885-1-ross.burton@arm.com> References: <20221213161732.865885-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 ; Tue, 13 Dec 2022 16:17:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174541 Use a single PACKAGECONFIG instead of a number of location conditionals. Signed-off-by: Ross Burton --- meta/recipes-support/atk/at-spi2-core_2.46.0.bb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-core_2.46.0.bb b/meta/recipes-support/atk/at-spi2-core_2.46.0.bb index 5ab501908d5..f815a5eeb21 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.46.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.46.0.bb @@ -13,10 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "aa0c86c79f7a8d67bae49a5b7a5ab08430c608cffe6e33bf47a72f41ab03c3d0" -X11DEPENDS = "virtual/libx11 libxi libxtst" - DEPENDS = "dbus glib-2.0 libxml2" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" # For backwards compatibility PROVIDES += "atk at-spi2-atk" @@ -25,9 +22,10 @@ RPROVIDES:${PN} += "atk at-spi2-atk" inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ - -Ddbus_daemon=${bindir}/dbus-daemon \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ -" + -Ddbus_daemon=${bindir}/dbus-daemon" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "-Dx11=yes,-Dx11=no,virtual/libx11 libxi libxtst" GTKDOC_MESON_OPTION = "docs"