diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-02-19 20:47:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-21 09:39:00 +0000 |
commit | 16849053c857a5cdb58462d39b0354569def53b3 (patch) | |
tree | 881fb310d58580126738d260501d32bdea742084 /meta | |
parent | bf745476ea75da66ba7a5d78a017e0ae2648a6da (diff) | |
download | poky-16849053c857a5cdb58462d39b0354569def53b3.tar.gz |
webkitgtk: x11 and wayland are not mutually exclusive
Also enabling wayland if x11 is not enabled is not necessarily
the correct decision.
(From OE-Core rev: 9d447fc61dca53bf41b31acb6e4083a10935ca8c)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1550..153bc8db11 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 \ | |||
38 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ | 38 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ |
39 | " | 39 | " |
40 | 40 | ||
41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ | 41 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ |
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ |
43 | enchant \ | 43 | enchant \ |
44 | libsecret \ | 44 | libsecret \ |