From 6f9d96be2ed8ff1c23402468131814272ad34549 Mon Sep 17 00:00:00 2001 From: James Duley Date: Wed, 27 Apr 2016 21:44:11 +0100 Subject: [PATCH] Update travis to build with osgearth --- .travis.yml | 4 ++-- package/linux/debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e50b0ab6..2ec57c425 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ dist: trusty before_install: - sudo add-apt-repository ppa:librepilot/tools -y - sudo apt-get update -q - - sudo apt-get install -y libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools + - sudo apt-get install -y libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev libosgearth-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools -script: . /opt/qt56/bin/qt56-env.sh && make gcs CCACHE=ccache GCS_EXTRA_CONF=osg +script: . /opt/qt56/bin/qt56-env.sh && make gcs CCACHE=ccache GCS_EXTRA_CONF='osg osgearth' git: depth: 500 diff --git a/package/linux/debian/control b/package/linux/debian/control index 99d3e537e..3b0d49bc6 100644 --- a/package/linux/debian/control +++ b/package/linux/debian/control @@ -2,7 +2,7 @@ Source: Section: electronics Priority: optional Maintainer: The LibrePilot Project <> -Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, libopenscenegraph-dev, qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev +Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, libopenscenegraph-dev, libosgearth-dev, qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev Standards-Version: 3.9.5 Homepage: Vcs-Git: