diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2015-02-11 23:12:53 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-13 10:16:12 -0200 |
commit | 41772b33725f4adc19990aa201a399a6a6180348 (patch) | |
tree | e6d2d273d3a382259360ff6b924a1961c164af70 /recipes-qt/qt5 | |
parent | 6eeeeb2025ec40b73b4de02289eb78c01c2a2757 (diff) | |
download | meta-qt5-41772b33725f4adc19990aa201a399a6a6180348.tar.gz |
qtwebengine: Enable ffmpegsumo for HTML5 video
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch | 31 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_5.4.0.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch b/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch new file mode 100644 index 00000000..eb80afd2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zeno Albisser <zeno.albisser@theqtcompany.com> | ||
3 | Date: Fri, 30 Jan 2015 13:10:15 +0100 | ||
4 | Subject: [PATCH] eLinux: build ffmpegsumo as well. | ||
5 | |||
6 | This will only contain free codecs. | ||
7 | |||
8 | Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058 | ||
9 | Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> | ||
10 | |||
11 | Upstream-Status: Backport [ 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 from https://gitorious.org/qt/qtwebengine.git ] | ||
12 | --- | ||
13 | src/core/config/embedded_linux.pri | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri | ||
17 | index 4000625..773bf0b 100644 | ||
18 | --- a/src/core/config/embedded_linux.pri | ||
19 | +++ b/src/core/config/embedded_linux.pri | ||
20 | @@ -1,7 +1,7 @@ | ||
21 | GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" | ||
22 | |||
23 | GYP_CONFIG += \ | ||
24 | - build_ffmpegsumo=0 \ | ||
25 | + build_ffmpegsumo=1 \ | ||
26 | configuration_policy=0 \ | ||
27 | desktop_linux=0 \ | ||
28 | disable_nacl=1 \ | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qtwebengine_5.4.0.bb b/recipes-qt/qt5/qtwebengine_5.4.0.bb index e74a7397..5e2df657 100644 --- a/recipes-qt/qt5/qtwebengine_5.4.0.bb +++ b/recipes-qt/qt5/qtwebengine_5.4.0.bb | |||
@@ -9,4 +9,5 @@ SRC_URI += " \ | |||
9 | file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ | 9 | file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ |
10 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 10 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
11 | file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ | 11 | file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ |
12 | file://0001-eLinux-build-ffmpegsumo-as-well.patch \ | ||
12 | " | 13 | " |