From a27548d062e083914804e981118e97bae17df673 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Tue, 16 Aug 2016 22:54:30 +0100
Subject: [PATCH] LP-380: Turn osgEarth on by default on Linux

---
 .travis.yml                | 2 +-
 Makefile                   | 2 +-
 bitbucket-pipelines.yml    | 1 -
 package/linux/debian/rules | 2 +-
 package/linux/rpmspec.in   | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff5c026fd..06c8fe0e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
         - make build_sdk_install
 
 script:
-        - make config_new CCACHE=ccache GCS_WITH_OSGEARTH=1
+        - make config_new CCACHE=ccache
         - make all_flight
         - make opfw_resource
         - make gcs
diff --git a/Makefile b/Makefile
index e0806b3e3..ff952865c 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ include $(ROOT_DIR)/make/tools.mk
 ifeq ($(UNAME), Linux)
     UAVOBJGENERATOR   := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
     GCS_WITH_OSG      := 1
-    GCS_WITH_OSGEARTH := 0
+    GCS_WITH_OSGEARTH := 1
     GCS_COPY_OSG      := 0
 else ifeq ($(UNAME), Darwin)
     UAVOBJGENERATOR   := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index f61779c9a..b73f5e6aa 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -6,7 +6,6 @@ pipelines:
           - apt-get update -q
           - apt-get install -y libc6-i386 libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev libosgearth-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools
           - make build_sdk_install
-          - make config_new GCS_WITH_OSGEARTH=1
           - make all_flight
           - make opfw_resource
           - make gcs
diff --git a/package/linux/debian/rules b/package/linux/debian/rules
index 59ffe7c2a..e636c8a1d 100755
--- a/package/linux/debian/rules
+++ b/package/linux/debian/rules
@@ -12,7 +12,7 @@ export DH_OPTIONS
 	dh $@ 
 
 override_dh_auto_configure:
-	$(MAKE) config_new GCS_WITH_OSGEARTH=1 WITH_PREBUILT_FW=$(CURDIR)/firmware
+	$(MAKE) config_new WITH_PREBUILT_FW=$(CURDIR)/firmware
 
 override_dh_auto_build:
 	dh_auto_build -- opfw_resource gcs
diff --git a/package/linux/rpmspec.in b/package/linux/rpmspec.in
index 87b0f5b07..35cbc4aca 100644
--- a/package/linux/rpmspec.in
+++ b/package/linux/rpmspec.in
@@ -59,8 +59,7 @@ make config_new                             \
     prefix=%{_prefix}                       \
     QMAKE=qmake-qt5                         \
     udevrulesdir=%{_udevrulesdir}           \
-    WITH_PREBUILT_FW=$(pwd)/build/firmware  \
-    GCS_WITH_OSGEARTH=1
+    WITH_PREBUILT_FW=$(pwd)/build/firmware
 
 make %{?_smp_mflags} opfw_resource gcs