diff mbox

[1/3] webkitgtk24: add multimedia option

Message ID 1457988735-22815-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Headers show

Commit Message

Gustavo Zacarias March 14, 2016, 8:52 p.m. UTC 
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>
---
 package/webkitgtk24/Config.in      | 24 ++++++++++++++++++++++++
 package/webkitgtk24/webkitgtk24.mk |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni March 19, 2016, 2:02 p.m. UTC | #1 
Dear Gustavo Zacarias,

On Mon, 14 Mar 2016 17:52:13 -0300, Gustavo Zacarias wrote:
> 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>
> ---
>  package/webkitgtk24/Config.in      | 24 ++++++++++++++++++++++++
>  package/webkitgtk24/webkitgtk24.mk |  4 ++--
>  2 files changed, 26 insertions(+), 2 deletions(-)

All three patches applied, thanks!

Thomas
diff mbox

Patch

diff --git a/package/webkitgtk24/Config.in b/package/webkitgtk24/Config.in
index 3c7c330..02d6791 100644
--- 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 d8e41b9..8556f4e 100644
--- 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 \