mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

at-spi2-core: clean up x11 enabling

Browse Source 
Use a single PACKAGECONFIG instead of a number of location conditionals.

(From OE-Core rev: 15bad54d61f9a9151dd4a2bace5d5feb3e7adc7a)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-12-13 16:17:30 +00:00
committed by Richard Purdie
parent 3f79265a7d
commit 566d928f5f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/atk/at-spi2-core_2.46.0.bb
+4 -6
View File
@@ -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"