From cae5c340e4c7af00a181d11346120b550ba83175 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 18 May 2015 16:58:39 +0300 Subject: 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 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-sato') 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 334870292e..b9a9d7a002 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 \ " -- cgit 1.2.3-korg