From 546e341c0408b066a5f05da3e558a870c4b74ca7 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 22 Mar 2018 01:03:33 +0300 Subject: osgearth: build with geos and poco + update patch --- src/osgearth-1-fixes.patch | 24 ------------------------ src/osgearth.mk | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/osgearth-1-fixes.patch b/src/osgearth-1-fixes.patch index 138f3f2..959813a 100644 --- a/src/osgearth-1-fixes.patch +++ b/src/osgearth-1-fixes.patch @@ -4,30 +4,6 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek -Date: Fri, 16 Mar 2018 17:09:37 +0300 -Subject: [PATCH 1/2] disable usage of extra libraries - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,10 +117,10 @@ ENDIF (OSGEARTH_USE_GLES) - - FIND_PACKAGE(CURL) - FIND_PACKAGE(GDAL) --FIND_PACKAGE(GEOS) -+#FIND_PACKAGE(GEOS) - FIND_PACKAGE(Sqlite3) - FIND_PACKAGE(ZLIB) --FIND_PACKAGE(Poco) -+#FIND_PACKAGE(Poco) - - FIND_PACKAGE(LevelDB) - FIND_PACKAGE(RocksDB) - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Pek Date: Fri, 16 Mar 2018 17:10:49 +0300 Subject: [PATCH 2/2] disable build of applications and tests diff --git a/src/osgearth.mk b/src/osgearth.mk index bc7d2c0..6f86f84 100644 --- a/src/osgearth.mk +++ b/src/osgearth.mk @@ -7,7 +7,7 @@ $(PKG)_IGNORE := $(PKG)_VERSION := 2.9 $(PKG)_CHECKSUM := 22aeef42bb700c1e669d9ba57ce4155c0668caf86cc738750a6b9d34c1eaf2a4 $(PKG)_GH_CONF := gwaldron/osgearth/releases/latest, osgearth- -$(PKG)_DEPS := curl cc gdal openscenegraph sqlite tinyxml2 zlib +$(PKG)_DEPS := curl cc gdal openscenegraph poco sqlite tinyxml2 zlib define $(PKG)_BUILD cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ -- cgit v0.12