diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2015-05-18 16:58:39 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-20 21:41:08 +0100 |
commit | 443d25ace122ac91efc4e7412188623a2df9f120 (patch) | |
tree | 35fdda8e520c3ac2853528de16332c32179e36f9 /meta | |
parent | 4c67abd709c4c18fc3f066e2214052849e81e233 (diff) | |
download | poky-443d25ace122ac91efc4e7412188623a2df9f120.tar.gz |
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
(From OE-Core rev: cae5c340e4c7af00a181d11346120b550ba83175)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 6 |
1 files changed, 5 insertions, 1 deletions
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" | |||
14 | ICU_LIB_powerpc = "pango" | 14 | ICU_LIB_powerpc = "pango" |
15 | 15 | ||
16 | DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ | 16 | DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ |
17 | gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" | 17 | gtk+ flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" |
18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | 18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" |
19 | 19 | ||
20 | # The libxt requires x11 in DISTRO_FEATURES | 20 | # The libxt requires x11 in DISTRO_FEATURES |
@@ -42,6 +42,9 @@ inherit autotools lib_package gtk-doc pkgconfig distro_features_check | |||
42 | 42 | ||
43 | S = "${WORKDIR}/webkit-${PV}/" | 43 | S = "${WORKDIR}/webkit-${PV}/" |
44 | 44 | ||
45 | # Disabled by default because it pulls in obsolete gstreamer 0.10 | ||
46 | WEBKIT_AUDIOVIDEO ?= "--disable-video --disable-web-audio" | ||
47 | |||
45 | EXTRA_OECONF = "\ | 48 | EXTRA_OECONF = "\ |
46 | --enable-debug=no \ | 49 | --enable-debug=no \ |
47 | --enable-svg \ | 50 | --enable-svg \ |
@@ -51,6 +54,7 @@ EXTRA_OECONF = "\ | |||
51 | --enable-link-prefetch \ | 54 | --enable-link-prefetch \ |
52 | --with-gtk=2.0 \ | 55 | --with-gtk=2.0 \ |
53 | --disable-geolocation \ | 56 | --disable-geolocation \ |
57 | ${WEBKIT_AUDIOVIDEO} \ | ||
54 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ | 58 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ |
55 | UNICODE_CFLAGS=-D_REENTRANT \ | 59 | UNICODE_CFLAGS=-D_REENTRANT \ |
56 | " | 60 | " |