qtwebengine: Enable ffmpegsumo for HTML5 video

(From meta-qt5 rev: 41772b33725f4adc19990aa201a399a6a6180348)

Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch b/meta-qt5/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch
new file mode 100644 (file)
index 0000000..eb80afd
--- /dev/null
+++ b/meta-qt5/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch
@@ -0,0 +1,31 @@
+From 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 Mon Sep 17 00:00:00 2001
+From: Zeno Albisser <zeno.albisser@theqtcompany.com>
+Date: Fri, 30 Jan 2015 13:10:15 +0100
+Subject: [PATCH] eLinux: build ffmpegsumo as well.
+
+This will only contain free codecs.
+
+Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058
+Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
+
+Upstream-Status: Backport [ 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 from https://gitorious.org/qt/qtwebengine.git ]
+---
+ src/core/config/embedded_linux.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
+index 4000625..773bf0b 100644
+--- a/src/core/config/embedded_linux.pri
++++ b/src/core/config/embedded_linux.pri
+@@ -1,7 +1,7 @@
+ GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi"
+ 
+ GYP_CONFIG += \
+-    build_ffmpegsumo=0 \
++    build_ffmpegsumo=1 \
+     configuration_policy=0 \
+     desktop_linux=0 \
+     disable_nacl=1 \
+-- 
+1.9.1
+

diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb b/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb
index e74a739..5e2df65 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb
+++ b/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb
@@ -9,4 +9,5 @@ SRC_URI += " \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
+    file://0001-eLinux-build-ffmpegsumo-as-well.patch \
 "