blob: 1a629652b43083ad03c28b29a67fdd0f639196aa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From d8911e0db56151d39f7c8c6d9f32349ca54e8c48 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Thu, 31 Oct 2013 15:06:30 +0100
Subject: [PATCH] Initial porting effort to GStreamer 1.0.
* It's already included in 5.5 with this commit:
commit 108dda7a90bd0f0337358b0db47ae55acd16dea6
Author: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Thu Nov 20 17:54:18 2014 +0100
GStreamer: port to 1.0.
* here we restore only the done_config_gstreamer variable
to explicitly disable it from OE build
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
qtmultimedia.pro | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index e58ae1d..81e6ce8 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -17,19 +17,21 @@ win32 {
contains(QT_CONFIG, alsa):qtCompileTest(alsa)
contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
- isEmpty(GST_VERSION) {
- contains(QT_CONFIG, gstreamer-0.10) {
- GST_VERSION = 0.10
- } else: contains(QT_CONFIG, gstreamer-1.0) {
- GST_VERSION = 1.0
+ !done_config_gstreamer {
+ isEmpty(GST_VERSION) {
+ contains(QT_CONFIG, gstreamer-0.10) {
+ GST_VERSION = 0.10
+ } else: contains(QT_CONFIG, gstreamer-1.0) {
+ GST_VERSION = 1.0
+ }
+ }
+ cache(GST_VERSION, set)
+ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
+ qtCompileTest(gstreamer_photography)
+ qtCompileTest(gstreamer_encodingprofiles)
+ qtCompileTest(gstreamer_appsrc)
+ qtCompileTest(linux_v4l)
}
- }
- cache(GST_VERSION, set)
- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
- qtCompileTest(gstreamer_photography)
- qtCompileTest(gstreamer_encodingprofiles)
- qtCompileTest(gstreamer_appsrc)
- qtCompileTest(linux_v4l)
}
qtCompileTest(resourcepolicy)
|
