From ab8a470580621f5b256152b7aff76a8a16957869 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Mon, 14 Dec 2015 09:42:01 +0100
Subject: [PATCH 1/5] LP-2 make osg use Qt 5.5.1

---
 make/3rdparty/osgearth/osgearth.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/3rdparty/osgearth/osgearth.mk b/make/3rdparty/osgearth/osgearth.mk
index eecff9bb1..4f03c216d 100644
--- a/make/3rdparty/osgearth/osgearth.mk
+++ b/make/3rdparty/osgearth/osgearth.mk
@@ -69,7 +69,7 @@
 ################################
 
 # TODO should be discovered
-QT_VERSION := 5.4.1
+QT_VERSION := 5.5.1
 
 ################################
 #

From 9d2e1dcc1f48faebf6615f238ef1bb0f53155961 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Mon, 14 Dec 2015 09:43:04 +0100
Subject: [PATCH 2/5] LP-2 osg is now installed when doing make
 build_sdk_install

---
 make/tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index dfefe7ab5..881813c99 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -166,9 +166,9 @@ QT_SDK_PREFIX := $(QT_SDK_DIR)
 #
 ##############################
 
-BUILD_SDK_TARGETS := arm_sdk qt_sdk
+BUILD_SDK_TARGETS := arm_sdk qt_sdk osg
 ifeq ($(UNAME), Windows)
-    BUILD_SDK_TARGETS += osg sdl nsis mesawin openssl ccache
+    BUILD_SDK_TARGETS += sdl nsis mesawin openssl ccache
 endif
 ALL_SDK_TARGETS := $(BUILD_SDK_TARGETS) gtest uncrustify doxygen
 

From f5c10caf3f3ebd90a03984aeb6a4d924383d2acd Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Mon, 14 Dec 2015 22:04:23 +0100
Subject: [PATCH 3/5] LP-2 linux: specify architecture when setting QT_SPEC

this is used later in copydata.pro files to copy appropriate files based on 32/64 architecture
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7184cfab2..04db0a97a 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,11 @@ include $(ROOT_DIR)/make/tools.mk
 
 # We almost need to consider autoconf/automake instead of this
 ifeq ($(UNAME), Linux)
-    QT_SPEC := linux-g++
+    ifeq ($(ARCH), x86_64)
+        QT_SPEC := linux-g++-64
+    else
+        QT_SPEC := linux-g++-32
+    endif
     UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
 else ifeq ($(UNAME), Darwin)
     QT_SPEC := macx-g++

From 0f87f2d7407ce823b5be730497762b3deb6ca5b6 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Mon, 14 Dec 2015 09:41:38 +0100
Subject: [PATCH 4/5] LP-2 fix copydata.pro for linux 32 using scope

apparently only linux 64 is using the new gstreamer base multimedia backend
linux 32 is still using the previous backend
---
 ground/gcs/copydata.pro | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ground/gcs/copydata.pro b/ground/gcs/copydata.pro
index 957b81363..4fb80f27c 100644
--- a/ground/gcs/copydata.pro
+++ b/ground/gcs/copydata.pro
@@ -28,10 +28,12 @@ equals(copyqt, 1) {
                   libQt5QuickParticles.so.5 \
                   libQt5XcbQpa.so.5 \
                   libQt5X11Extras.so.5 \
-                  libqgsttools_p.so.1 \
                   libicui18n.so.54 \
                   libicuuc.so.54 \
                   libicudata.so.54
+        *-64 {
+            QT_LIBS += libqgsttools_p.so.1
+        }
         for(lib, QT_LIBS) {
             addCopyFileTarget($${lib},$$[QT_INSTALL_LIBS],$${GCS_QT_LIBRARY_PATH})
         }
@@ -43,11 +45,16 @@ equals(copyqt, 1) {
                      imageformats/libqmng.so \
                      imageformats/libqsvg.so \
                      imageformats/libqtiff.so \
-                     mediaservice/libgstaudiodecoder.so \
-                     mediaservice/libgstmediaplayer.so \
                      platforms/libqxcb.so \
                      xcbglintegrations/libqxcb-glx-integration.so \
                      sqldrivers/libqsqlite.so
+        *-32 {
+            QT_PLUGINS += mediaservice/libqtmedia_audioengine.so
+        }
+        *-64 {
+            QT_PLUGINS += mediaservice/libgstaudiodecoder.so \
+                          mediaservice/libgstmediaplayer.so
+        }
     }
 
     win32 {

From e843cac3840bee820942dcb8f07d7c068050a731 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Mon, 14 Dec 2015 22:05:47 +0100
Subject: [PATCH 5/5] LP-2 osgearth copydata.pro: use scope to copy proper libs
 on linux 32/64

---
 ground/gcs/src/libs/osgearth/copydata.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro
index 85e77482c..bd93a4fe1 100644
--- a/ground/gcs/src/libs/osgearth/copydata.pro
+++ b/ground/gcs/src/libs/osgearth/copydata.pro
@@ -9,10 +9,10 @@ equals(copyosg, 1) {
         # copy osg libraries
 
         data_copy.commands += $(MKDIR) $${GCS_LIBRARY_PATH}/osg $$addNewline()
-        exists( $${OSG_SDK_DIR}/lib64 ) {
+        *-64 {
             data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib64/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/)
         }
-        else {
+        *-32 {
             data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/)
         }