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

qtmultimedia: Use 'qtCompileTest' mechanism for GStreamer

Browse Source 
We can use the 'done_config_openal' and 'done_config_gstreamer' trick
to avoid the respective features it to be enabled.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador
2015-02-07 18:39:55 -02:00
parent 0732449ee4
commit 98740e63b0
2 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,12 +11,11 @@ PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}"
SRC_URI += "\
file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
file://0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch \
"
LICENSE += "| GPL-2.0"

53
recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch
View File

@@ -1,53 +0,0 @@
From b5c058f62a79efa213e4492ac7209b3a92f45e3b 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 | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 109dd81..54b67a8 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)
@@ -18,14 +18,17 @@ 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)
- qtCompileTest(linux_v4l)
- } else {
+ OE_GSTREAMER_ENABLED {
+ gstver=1.0
+ cache(GST_VERSION, set, gstver);
+ qtCompileTest(gstreamer) {
+ qtCompileTest(gstreamer_photography)
+ qtCompileTest(gstreamer_encodingprofiles)
+ qtCompileTest(gstreamer_appsrc)
+ qtCompileTest(linux_v4l)
+ }
+ }
+ !OE_GSTREAMER_ENABLED:OE_GSTREAMER010_ENABLED {
gstver=0.10
cache(GST_VERSION, set, gstver);
# Force a re-run of the test
--
2.1.3