* Also default to enable X11/Wayland support or WebGL according
to enabled DISTRO_FEATURES.
Signed-off-by: Carlos Alberto Lopez Perez <clo...@igalia.com>
---
meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
index e92c6b1..f14c868 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
@@ -29,14 +29,25 @@ DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo
libxslt libxt libidn gnut
atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis
libxcomposite libxtst \
ruby-native libsecret libnotify gstreamer1.0-plugins-bad \
"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'virtual/libgl', '', d)}"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland'
,d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', ''
,d)}"
+
+PACKAGECONFIG[wayland] =
"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"
+PACKAGECONFIG[x11] =
"-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
+PACKAGECONFIG[geoclue] =
"-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
+PACKAGECONFIG[enchant] =
"-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant"
+PACKAGECONFIG[gtk2] =
"-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
+PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
+PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
+PACKAGECONFIG[libsecret] =
"-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret"
EXTRA_OECMAKE = " \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_INTROSPECTION=OFF \
+ -DENABLE_GTKDOC=OFF \
-DENABLE_MINIBROWSER=ON \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'-DENABLE_WEBGL=ON', '-DENABLE_WEBGL=OFF', d)} \
"
# Javascript JIT is not supported on powerpc
--
2.1.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
