aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-02-26 13:51:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:29 +0000
commit3e5b34b48d3a1c9bc94331405311ac21a8010637 (patch)
tree4ab6597bd4f7777552215195900ff031824a3a9b
parent20ad8fd118cc9032e7472f0ebbbbe36b637525a3 (diff)
downloadpoky-3e5b34b48d3a1c9bc94331405311ac21a8010637.tar.gz
poky-3e5b34b48d3a1c9bc94331405311ac21a8010637.tar.bz2
poky-3e5b34b48d3a1c9bc94331405311ac21a8010637.zip
webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements
x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. (From OE-Core rev: 1408c00d619d862d4da63882a86ff096a891ad5d) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.26.4.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
index cc69653fb5..190bc78966 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
@@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}"
CVE_PRODUCT = "webkitgtk webkitgtk\+"
@@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \
enchant \
libsecret \
"