From: Alexander Kanavin Date: Wed, 19 Feb 2020 19:47:41 +0000 (+0100) Subject: webkitgtk: x11 and wayland are not mutually exclusive X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~11803 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d447fc61dca53bf41b31acb6e4083a10935ca8c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a15506..153bc8db11c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \