From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 18 May 2015 13:58:39 +0000 (+0300)
Subject: webkitgtk: disable audio and video support
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~30307
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cae5c340e4c7af00a181d11346120b550ba83175;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

webkitgtk: disable audio and video support

This allows removal of gstreamer 0.10 dependency from webkit recipe

https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 334870292e2..b9a9d7a0027 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -14,7 +14,7 @@ ICU_LIB = "icu"
 ICU_LIB_powerpc = "pango"
 
 DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
-           gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
+           gtk+ flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
 
 # The libxt requires x11 in DISTRO_FEATURES
@@ -42,6 +42,9 @@ inherit autotools lib_package gtk-doc pkgconfig distro_features_check
 
 S = "${WORKDIR}/webkit-${PV}/"
 
+# Disabled by default because it pulls in obsolete gstreamer 0.10
+WEBKIT_AUDIOVIDEO ?= "--disable-video --disable-web-audio"
+
 EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \
@@ -51,6 +54,7 @@ EXTRA_OECONF = "\
                 --enable-link-prefetch \
                 --with-gtk=2.0 \
                 --disable-geolocation \
+		${WEBKIT_AUDIOVIDEO} \
                 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
                 UNICODE_CFLAGS=-D_REENTRANT \
                "