webkitgtk24: add multimedia option

Add a BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA option that will select/pull in
the basic required components in order for a few multimedia websites
(HTML5 video) to work.
Tested with videojs.com & youtube.com

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/webkitgtk24/Config.in b/package/webkitgtk24/Config.in
index 3c7c3300b9aad672c9f680c4d024babe333a80fa..02d67918c717f9d77ef167199a7c8693995ec778 100644 (file)
--- a/package/webkitgtk24/Config.in
+++ b/package/webkitgtk24/Config.in
@@ -48,3 +48,27 @@ config BR2_PACKAGE_WEBKITGTK24
          WebKit is an open source, standards compliant web browser engine.
 
          http://www.webkitgtk.org/
+
+if BR2_PACKAGE_WEBKITGTK24
+
+config BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA
+       bool "multimedia support"
+       select BR2_PACKAGE_GSTREAMER1
+       select BR2_PACKAGE_GST1_PLUGINS_BASE
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE
+       select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
+       select BR2_PACKAGE_GST1_PLUGINS_GOOD
+       select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4
+       select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
+       select BR2_PACKAGE_GST1_LIBAV
+       help
+         This option pulls in all of the required dependencies
+         to enable basic multimedia (video/audio) support.
+
+endif

diff --git a/package/webkitgtk24/webkitgtk24.mk b/package/webkitgtk24/webkitgtk24.mk
index d8e41b940819d06d7cb805749c703c639b54cc91..8556f4ed2f45924215208a60dfc6b0bb10ffa3c1 100644 (file)
--- a/package/webkitgtk24/webkitgtk24.mk
+++ b/package/webkitgtk24/webkitgtk24.mk
@@ -42,11 +42,11 @@ WEBKITGTK24_CONF_OPTS = \
        --disable-gtk-doc-html \
        --disable-wayland-target
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
+ifeq ($(BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA),y)
 WEBKITGTK24_CONF_OPTS += \
        --enable-video \
        --enable-web-audio
-WEBKITGTK24_DEPENDENCIES += gst1-plugins-base
+WEBKITGTK24_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
 else
 WEBKITGTK24_CONF_OPTS += \
        --disable-video \