diff --git a/src/osgearth-1-fixes.patch b/src/osgearth-1-fixes.patch index 1070d64f..8d46aa1b 100644 --- a/src/osgearth-1-fixes.patch +++ b/src/osgearth-1-fixes.patch @@ -3,65 +3,26 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Pek -Date: Thu, 22 Mar 2018 22:40:00 +0300 -Subject: [PATCH 1/2] Added cmake options for disabling building of - applications and tests +From: Tony Theodore +Date: Sat, 2 Mar 2019 02:57:50 +1100 +Subject: [PATCH 1/1] add option to disable protobuf diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -326,6 +326,10 @@ ENDIF(INSTALL_TO_OSG_DIR) - # osgEarth Examples - OPTION(BUILD_OSGEARTH_EXAMPLES "Enable to build osgEarth Examples" ON) +@@ -162,8 +162,11 @@ ENDIF(MINGW) + FIND_PACKAGE(SilverLining QUIET) + FIND_PACKAGE(Triton QUIET) -+# Applications and tests -+OPTION(BUILD_APPLICATIONS "Enable build of Applications" ON) -+OPTION(BUILD_TESTS "Enable build of Tests" ON) -+ - # OE Core - ADD_SUBDIRECTORY(src) +-FIND_PACKAGE(Protobuf QUIET) +-SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll") ++OPTION(OSGEARTH_USE_PROTOBUF "Set to OFF to disable Protobuf" ON) ++IF (OSGEARTH_USE_PROTOBUF) ++ FIND_PACKAGE(Protobuf QUIET) ++ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll") ++ENDIF (OSGEARTH_USE_PROTOBUF) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1111111..2222222 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -23,11 +23,11 @@ ENDFOREACH( lib ) - - ADD_SUBDIRECTORY( osgEarthDrivers ) - --IF(NOT ANDROID) -+IF(BUILD_APPLICATIONS AND NOT ANDROID) - ADD_SUBDIRECTORY( applications ) - ENDIF() - --IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR) -+IF(BUILD_TESTS AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR) - ADD_SUBDIRECTORY( tests ) - ENDIF() - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Pek -Date: Mon, 18 Jun 2018 18:49:40 +0300 -Subject: Fix build with OpenSceneGraph >= 3.6.1 - - -diff --git a/src/osgEarth/ScreenSpaceLayout.cpp b/src/osgEarth/ScreenSpaceLayout.cpp -index 346d7bcae..760d26fa8 100644 ---- a/src/osgEarth/ScreenSpaceLayout.cpp -+++ b/src/osgEarth/ScreenSpaceLayout.cpp -@@ -106,7 +106,11 @@ namespace - return diff < 0.0f; - - // then fallback on traversal order. -+#if OSG_VERSION_GREATER_THAN(3,6,1) -+ diff = float(lhs->_traversalOrderNumber) - float(rhs->_traversalOrderNumber); -+#else - diff = float(lhs->_traversalNumber) - float(rhs->_traversalNumber); -+#endif - return diff < 0.0f; - } - } - + SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") + IF (WITH_EXTERNAL_DUKTAPE) diff --git a/src/osgearth.mk b/src/osgearth.mk index 17b3c54c..4d0a1000 100644 --- a/src/osgearth.mk +++ b/src/osgearth.mk @@ -4,14 +4,15 @@ PKG := osgearth $(PKG)_WEBSITE := http://osgearth.org/ $(PKG)_DESCR := Geospatial SDK for OpenSceneGraph $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9 -$(PKG)_CHECKSUM := 22aeef42bb700c1e669d9ba57ce4155c0668caf86cc738750a6b9d34c1eaf2a4 +$(PKG)_VERSION := 2.10 +$(PKG)_CHECKSUM := 986ad26b8e340a40ac6404137aa61f80a030030fa3e8cf5fbdf183c697f2556e $(PKG)_GH_CONF := gwaldron/osgearth/releases/latest, osgearth- $(PKG)_DEPS := curl cc gdal openscenegraph poco sqlite zlib define $(PKG)_BUILD cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ -DDYNAMIC_OSGEARTH=$(CMAKE_SHARED_BOOL) \ + -DOSGEARTH_USE_PROTOBUF=OFF \ -DWITH_EXTERNAL_TINYXML=OFF \ -DBUILD_OSGEARTH_EXAMPLES=OFF \ -DBUILD_APPLICATIONS=OFF \ @@ -20,4 +21,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef -