From 401c32de3e0834c025cf80838e5f5442e3c4601b Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Fri, 4 Jan 2019 11:36:34 +0100 Subject: Enable gstreamer support for Windows and macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I29b411a517d24e89eaac944507abbe2c471abb5d Reviewed-by: Christian Strømme --- src/multimedia/configure.json | 7 +++++-- src/plugins/plugins.pro | 8 +++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index b50272424..ca6c426ba 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -53,7 +53,9 @@ "test": "gstreamer", "sources": [ { "type": "pkgConfig", - "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0" } + "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0" }, + { "libs": "-lgstreamer-1.0 -lgstbase-1.0 -lgstaudio-1.0 -lgstvideo-1.0 -lgstpbutils-1.0 -lglib-2.0 -lgobject-2.0", + "condition": "config.win32 || config.macos" } ] }, "gstreamer_app_0_10": { @@ -71,7 +73,8 @@ "test": "gstreamer_appsrc", "use": "gstreamer_1_0", "sources": [ - { "type": "pkgConfig", "args": "gstreamer-app-1.0" } + { "type": "pkgConfig", "args": "gstreamer-app-1.0" }, + { "libs": "-lgstapp-1.0", "condition": "config.win32 || config.macos" } ] }, "gstreamer_photography_0_10": { diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 71b9ec6e1..95c004125 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -44,12 +44,10 @@ winrt { audiocapture } +qtConfig(gstreamer): SUBDIRS += gstreamer + unix:!mac:!android { - qtConfig(gstreamer) { - SUBDIRS += gstreamer - } else { - SUBDIRS += audiocapture - } + !qtConfig(gstreamer): SUBDIRS += audiocapture qtConfig(pulseaudio): SUBDIRS += pulseaudio qtConfig(alsa): SUBDIRS += alsa -- cgit v1.2.3