From 108dda7a90bd0f0337358b0db47ae55acd16dea6 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 20 Nov 2014 17:54:18 +0100 Subject: GStreamer: port to 1.0. 0.10 is still used by default. To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake for qtmultimedia.pro. Contributions from: Andrew den Exter Ilya Smelykh Jim Hodapp Sergio Schvezov Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c Reviewed-by: Andrew den Exter --- qtmultimedia.pro | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'qtmultimedia.pro') diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 3cec526e8..84f254861 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -17,11 +17,27 @@ win32 { } else { qtCompileTest(alsa) qtCompileTest(pulseaudio) - qtCompileTest(gstreamer) { - qtCompileTest(gstreamer_photography) - qtCompileTest(gstreamer_encodingprofiles) - qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) + !done_config_gstreamer { + gstver=0.10 + !isEmpty(GST_VERSION): gstver=$$GST_VERSION + cache(GST_VERSION, set, gstver); + qtCompileTest(gstreamer) { + qtCompileTest(gstreamer_photography) + qtCompileTest(gstreamer_encodingprofiles) + qtCompileTest(gstreamer_appsrc) + qtCompileTest(linux_v4l) + } else { + gstver=1.0 + cache(GST_VERSION, set, gstver); + # Force a re-run of the test + CONFIG -= done_config_gstreamer + qtCompileTest(gstreamer) { + qtCompileTest(gstreamer_photography) + qtCompileTest(gstreamer_encodingprofiles) + qtCompileTest(gstreamer_appsrc) + qtCompileTest(linux_v4l) + } + } } qtCompileTest(resourcepolicy) qtCompileTest(gpu_vivante) -- cgit v1.2.1