wxwidgets: enable webkit PACKAGECONFIG only when opengl is available

The latest version of webkitgtk3 requires opengl DISTRO_FEATURE, so the
webkit PACKAGECONFIG should be enabled only when opengl is available.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
index 815a0b2d0a..a149134f5a 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
@@ -50,7 +50,13 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
 PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
 "
-PACKAGECONFIG:append:class-target = " mediactrl ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'webkit', '', d)}"
+PACKAGECONFIG:append:class-target = " mediactrl"
+
+# (x11 OR wayland) AND opengl -> webkit
+PACKAGECONFIG:append:class-target = "\
+    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', \
+    bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webkit', '', d),\
+   '', d)}"
 
 PACKAGECONFIG:class-native ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)}"