From f6d5cbf4f800fd71ce8e1878ad06a1c036c5afc9 Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 5 May 2016 23:17:13 +0100 Subject: [PATCH] Turn on osgearth for default debian package --- package/linux/deb.mk | 2 +- package/linux/debian/control | 2 +- package/linux/debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux/deb.mk b/package/linux/deb.mk index d30691af6..79668b0ca 100644 --- a/package/linux/deb.mk +++ b/package/linux/deb.mk @@ -28,7 +28,7 @@ OPT_QT := qt56 TRUSTY_DEPS_SED := s/qml-module-.*/$(OPT_QT)quickcontrols/g; \ s/qt5-default.*/$(OPT_QT)-meta-minimal, $(OPT_QT)svg, $(OPT_QT)script, $(OPT_QT)serialport, $(OPT_QT)multimedia, $(OPT_QT)translations, $(OPT_QT)tools/g; -# Leave off Qt and ARM compiler dependencies if calling package target under the assumption that +# Leave off Qt and OSG dependencies if calling package target under the assumption that # OP is providing them or the user already has them installed because OP is already built. PACKAGE_DEPS_SED := s/python.*/python/;s/{misc:Depends}.*/{misc:Depends}/; diff --git a/package/linux/debian/control b/package/linux/debian/control index 3b0d49bc6..943829425 100644 --- a/package/linux/debian/control +++ b/package/linux/debian/control @@ -10,5 +10,5 @@ Vcs-Browser: Package: Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-xmllistmodel, qml-module-qtquick-localstorage, qml-module-qtquick-particles2, qml-module-qtquick-window2, qml-module-qtquick2 +Depends: ${shlibs:Depends}, ${misc:Depends}, openscenegraph-plugin-osgearth, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-xmllistmodel, qml-module-qtquick-localstorage, qml-module-qtquick-particles2, qml-module-qtquick-window2, qml-module-qtquick2 Description: diff --git a/package/linux/debian/rules b/package/linux/debian/rules index 66bbb414c..2fb9d4eb1 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_EXTRA_CONF=osg WITH_PREBUILT_FW=$(CURDIR)/firmware + $(MAKE) config_new GCS_EXTRA_CONF='osg osgearth' WITH_PREBUILT_FW=$(CURDIR)/firmware override_dh_auto_build: dh_auto_build -- opfw_resource gcs