summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/atk
diff options
context:
space:
mode:
authorPhilippe Normand <philn@igalia.com>2019-05-31 10:39:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-31 22:12:38 +0100
commitbe18dabdb28703c889f97faadbaec07e76d5e8bd (patch)
treea20a8b834356cc04cf514180d91c1f2b8c95e388 /meta/recipes-support/atk
parent0ab44c72d0fb9b1d110ba975273b520cea5bf29f (diff)
downloadopenembedded-core-be18dabdb28703c889f97faadbaec07e76d5e8bd.tar.gz
openembedded-core-be18dabdb28703c889f97faadbaec07e76d5e8bd.tar.bz2
openembedded-core-be18dabdb28703c889f97faadbaec07e76d5e8bd.zip
at-spi2: Make X11 support truly optional
X11 support in at-spi2-core can be turned off at compile time, so leverage this and disable it when X11 is not present in DISTRO_FEATURES. Signed-off-by: Philippe Normand <philn@igalia.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/atk')
-rw-r--r--meta/recipes-support/atk/at-spi2-atk_2.32.0.bb3
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.32.1.bb4
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
index 8812d33d9a..bcf1c9c77a 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
@@ -11,9 +11,6 @@ DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase distro_features_check upstream-version-is-even
-# The at-spi2-core requires x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-
PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/meta/recipes-support/atk/at-spi2-core_2.32.1.bb
index 0f84259d94..11052a8ece 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.32.1.bb
@@ -18,7 +18,9 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '',
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"
+ -Ddbus_daemon=${bindir}/dbus-daemon \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \
+"
GTKDOC_MESON_OPTION = "docs"