t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-06 22:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtmultimedia: Add gstremer-1.0 support

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2014-07-05 09:11:41 +02:00
parent 26b7fee65a
commit 9f802b01e5
3 changed files with 2434 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
recipes-qt/qt5/qtmultimedia.inc
View File

@@ -6,16 +6,14 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[openal] = ",,openal-soft"
PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
do_configure_prepend() {
# disable openal test if it isn't enabled by PACKAGECONFIG
sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro
# disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
sed -i 's/^\( *\)qtCompileTest(gstreamer) {/\1OE_GSTREAMER010_ENABLED:qtCompileTest(gstreamer) {/g' ${S}/qtmultimedia.pro
}
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
SRC_URI += "\
file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
file://0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch \
"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \

2378
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch Normal file
View File

File diff suppressed because it is too large Load Diff

51
recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch Normal file
View File

@@ -0,0 +1,51 @@
From 8d0358d4d586daece0e683ba002fbab16fd53cd1 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 5 Jul 2014 09:10:02 +0200
Subject: [PATCH 2/2] qtmultimedia.pro: Respect
OE_GSTREAMER_ENABLED,OE_GSTREAMER010_ENABLED and OE_OPENAL_ENABLED
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
qtmultimedia.pro | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 37f42a0..5a2a533 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -1,7 +1,7 @@
requires(qtHaveModule(gui))
load(configure)
-qtCompileTest(openal)
+OE_OPENAL_ENABLED:qtCompileTest(openal)
win32 {
qtCompileTest(directshow) {
qtCompileTest(wshellitem)
@@ -22,13 +22,16 @@ win32 {
qtCompileTest(alsa)
qtCompileTest(pulseaudio)
!done_config_gstreamer {
- gstver=1.0
- cache(GST_VERSION, set, gstver);
- qtCompileTest(gstreamer) {
- qtCompileTest(gstreamer_photography)
- qtCompileTest(gstreamer_encodingprofiles)
- qtCompileTest(gstreamer_appsrc)
- } else {
+ OE_GSTREAMER_ENABLED {
+ gstver=1.0
+ cache(GST_VERSION, set, gstver);
+ qtCompileTest(gstreamer) {
+ qtCompileTest(gstreamer_photography)
+ qtCompileTest(gstreamer_encodingprofiles)
+ qtCompileTest(gstreamer_appsrc)
+ }
+ }
+ !OE_GSTREAMER_ENABLED:OE_GSTREAMER010_ENABLED {
gstver=0.10
cache(GST_VERSION, set, gstver);
# Force a re-run of the test
--
2.0.0