From 35143d41c07a9997a46d8867630b883007c7c83d Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Thu, 27 Dec 2018 13:51:58 -0500
Subject: [PATCH] Moving Android builds to GStreamer 1.14.4

---
 QGCCommon.pri                         | 10 +++++-----
 src/VideoStreaming/VideoStreaming.pri | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/QGCCommon.pri b/QGCCommon.pri
index 21b88be8e..3f91bf861 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -19,7 +19,7 @@
 linux {
     linux-g++ | linux-g++-64 | linux-g++-32 | linux-clang {
         message("Linux build")
-        CONFIG += LinuxBuild
+        CONFIG  += LinuxBuild
         DEFINES += __STDC_LIMIT_MACROS
         linux-clang {
             message("Linux clang")
@@ -29,7 +29,7 @@ linux {
         message("Linux R-Pi2 build")
         CONFIG += LinuxBuild
         DEFINES += __STDC_LIMIT_MACROS __rasp_pi2__
-    } else : android-g++ {
+    } else : android-g++ | android-clang {
         CONFIG += AndroidBuild MobileBuild
         DEFINES += __android__
         DEFINES += __STDC_LIMIT_MACROS
@@ -56,9 +56,9 @@ linux {
 } else : macx {
     macx-clang | macx-llvm {
         message("Mac build")
-        CONFIG += MacBuild
-        CONFIG += x86_64
-        CONFIG -= x86
+        CONFIG  += MacBuild
+        CONFIG  += x86_64
+        CONFIG  -= x86
         equals(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 5) {
                 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
         } else {
diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri
index cd984dac9..f4265181b 100644
--- a/src/VideoStreaming/VideoStreaming.pri
+++ b/src/VideoStreaming/VideoStreaming.pri
@@ -73,18 +73,18 @@ LinuxBuild {
         QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\validate\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\validate\\\" /Y $$escape_expand(\\n)
     }
 } else:AndroidBuild {
-    #- gstreamer assumed to be installed in $$PWD/../../android/gstreamer-1.0-android-armv7-1.5.2 (or x86)
+    #- gstreamer assumed to be installed in $$PWD/../../gstreamer-1.0-android-universal-1.14.4/armv7 (or x86)
     Androidx86Build {
-        GST_ROOT = $$PWD/../../gstreamer-1.0-android-x86-1.5.2
+        GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.14.4/x86
     } else {
-        GST_ROOT = $$PWD/../../gstreamer-1.0-android-armv7-1.5.2
+        GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.14.4/armv7
     }
     exists($$GST_ROOT) {
         QMAKE_CXXFLAGS  += -pthread
         CONFIG          += VideoEnabled
 
         # We want to link these plugins statically
-        LIBS += -L$$GST_ROOT/lib/gstreamer-1.0/static \
+        LIBS += -L$$GST_ROOT/lib/gstreamer-1.0 \
             -lgstvideo-1.0 \
             -lgstcoreelements \
             -lgstudp \
@@ -95,7 +95,6 @@ LinuxBuild {
             -lgstsdpelem \
             -lgstvideoparsersbad \
             -lgstrtpmanager \
-            -lgstrmdemux \
             -lgstisomp4 \
             -lgstmatroska \
 
@@ -105,7 +104,7 @@ LinuxBuild {
             -lgstnet-1.0 -lgio-2.0 \
             -lgstaudio-1.0 -lgstcodecparsers-1.0 -lgstbase-1.0 \
             -lgstreamer-1.0 -lgstrtp-1.0 -lgstpbutils-1.0 -lgstrtsp-1.0 -lgsttag-1.0 \
-            -lgstvideo-1.0 -lavformat -lavcodec -lavutil -lx264 -lavresample \
+            -lgstvideo-1.0 -lavformat -lavcodec -lavutil -lx264 -lavfilter -lswresample \
             -lgstriff-1.0 -lgstcontroller-1.0 -lgstapp-1.0 \
             -lgstsdp-1.0 -lbz2 -lgobject-2.0 \
             -Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0 -lorc-0.4 -liconv -lffi -lintl \
-- 
2.22.0