[osgearth ] update osgearth to 3.2 and updated patches (#20160)

* initial update for osgearth 3.2 and updated patches * Adding output from ./vcpkg x-add-version --all * update version * update version * delete Remark * update version Co-authored-by: Paul Levy <plevy@pelicanmapping.com> Co-authored-by: Jonliu1993 <13720414433@163.com>
2024-12-27 10:21:07 +08:00 · 2021-09-27 22:39:25 -04:00 · 2021-09-27 22:39:25 -04:00 · 124239f751
commit 124239f751
parent 8e0a801c62
7 changed files with 114 additions and 167 deletions
--- a/ports/osgearth/fix-dependencies.patch
+++ b/ports/osgearth/fix-dependencies.patch
@ -1,67 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 001ebf1..8e49af2 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,24 +128,45 @@ ENDIF (OSGEARTH_USE_GLES)
- 
- # required
- find_package(OSG REQUIRED)
-find_package(CURL REQUIRED)
-+find_package(CURL CONFIG REQUIRED)
-+set(CURL_LIBRARY CURL::libcurl)
-+
- find_package(GDAL REQUIRED)
-+set(GDAL_LIBRARY ${GDAL_LIBRARIES})
-+set(GDAL_FOUND 1)
- 
- # optional
-find_package(GEOS REQUIRED)
-find_package(Sqlite3 REQUIRED)
-+find_package(geos CONFIG REQUIRED)
-+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c)
-+set(GEOS_FOUND 1)
-+
-+find_package(unofficial-sqlite3 CONFIG REQUIRED)
-+set(SQLITE3_FOUND 1)
-+set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3)
-+
- find_package(Draco REQUIRED)
- find_package(BASISU REQUIRED)
-+
- find_package(GLEW REQUIRED)
-find_package(Protobuf REQUIRED)
-find_package(WEBP REQUIRED)
-+set(GLEW_LIBRARIES GLEW::GLEW)
-+set(GLEW_FOUND 1)
-+
-+find_package(protobuf CONFIG REQUIRED)
-+set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf)
-+set(Protobuf_FOUND 1)
-+
-+find_package(WebP CONFIG REQUIRED)
-+set(WEBP_LIBRARY WebP::webp)
-+set(WEBP_FOUND 1)
- 
- if(OSGEARTH_ENABLE_PROFILING)
-     find_package(Tracy REQUIRED)
- endif()
- 
- if(OSGEARTH_BUILD_ZIP_PLUGIN)
-    find_package(LIBZIP REQUIRED)
-+    find_package(libzip CONFIG REQUIRED)
-+    set(LIBZIP_LIBRARY libzip::zip)
-+    set(LIBZIP_FOUND 1)
- endif()
- 
- if(OSGEARTH_BUILD_TRITON_NODEKIT)
-@@ -193,7 +214,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
- # TinyXML is an XML parsing library
- SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
- IF (WITH_EXTERNAL_TINYXML)
-    find_package(TinyXML REQUIRED)
-+    find_package(tinyxml CONFIG REQUIRED)
-+    set(TINYXML_FOUND 1)
-+    set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
- ENDIF (WITH_EXTERNAL_TINYXML)
- 
- # postfix settings for various configs
--- a/ports/osgearth/fix-dependency-osg.patch
+++ b/ports/osgearth/fix-dependency-osg.patch
@ -152,20 +152,21 @@ index 8c61e42..bbda7be 100644
 SET(TARGET_SRC osgearth_viewer.cpp )
 
 diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
-index c49bfcd..a7b9a2d 100644
+index cd55c1164..7cecdac74 100644
 --- a/src/osgEarth/CMakeLists.txt
 +++ b/src/osgEarth/CMakeLists.txt
-@@ -870,9 +870,11 @@ ENDIF(TRACY_FOUND)
- 
+@@ -928,9 +928,11 @@ ENDIF(TRACY_FOUND)
+
 OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
 if(NOT NRL_STATIC_LIBRARIES)
-  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)
+-  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)
 +  LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY)
 +  TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES})
 else(NOT NRL_STATIC_LIBRARIES)
-  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY)
+-  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY)
 +  LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY)
 +  TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES} ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY})
 endif(NOT NRL_STATIC_LIBRARIES)
- 
+
 LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY})
+ 
--- a/ports/osgearth/make-all-find-packages-required.patch
+++ b/ports/osgearth/make-all-find-packages-required.patch
@ -1,84 +1,95 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 049e37e..c78bd16 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,9 +121,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit
- 
- # Mobile/GLES:
- IF (OSGEARTH_USE_GLES)
-    find_package(OpenGLES) 
-+    find_package(OpenGLES REQUIRED)
- ELSE ()
-    find_package(OpenGL)
-+    find_package(OpenGL REQUIRED)
- ENDIF (OSGEARTH_USE_GLES)
- 
- # required
-@@ -132,28 +132,28 @@ find_package(CURL REQUIRED)
- find_package(GDAL REQUIRED)
- 
- # optional
-find_package(GEOS)
-find_package(Sqlite3)
-find_package(Draco)
-find_package(BASISU)
-find_package(GLEW)
-find_package(Protobuf)
-find_package(WEBP)
-+find_package(GEOS REQUIRED)
-+find_package(Sqlite3 REQUIRED)
-+find_package(Draco REQUIRED)
-+find_package(BASISU REQUIRED)
-+find_package(GLEW REQUIRED)
-+find_package(Protobuf REQUIRED)
-+find_package(WEBP REQUIRED)
- 
- if(OSGEARTH_ENABLE_PROFILING)
-    find_package(Tracy)
-+    find_package(Tracy REQUIRED)
- endif()
- 
- if(OSGEARTH_BUILD_ZIP_PLUGIN)
-    find_package(LIBZIP)
-+    find_package(LIBZIP REQUIRED)
- endif()
- 
- if(OSGEARTH_BUILD_TRITON_NODEKIT)
-    find_package(Triton QUIET)
-+    find_package(Triton QUIET REQUIRED)
- endif()
- 
- if(OSGEARTH_BUILD_SILVERLINING_NODEKIT)
-    find_package(SilverLining QUIET)
-+    find_package(SilverLining QUIET REQUIRED)
- endif()
- 
- # Sqlite enables the MBTiles format:
-@@ -182,18 +182,18 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile
- # Duktape is the JavaScript interpreter
- SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
- IF (WITH_EXTERNAL_DUKTAPE)
-    find_package(Duktape)
-+    find_package(Duktape REQUIRED)
- ENDIF (WITH_EXTERNAL_DUKTAPE)
- 
- # Whether to install shaders (glsl files).
-# If true, shaders install into a resources folder. If false, they are inlined in the 
-+# If true, shaders install into a resources folder. If false, they are inlined in the
- # code and you cannot tweak them after install.
- OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Make INSTALL" OFF)
- 
- # TinyXML is an XML parsing library
- SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
- IF (WITH_EXTERNAL_TINYXML)
-    find_package(TinyXML)
-+    find_package(TinyXML REQUIRED)
- ENDIF (WITH_EXTERNAL_TINYXML)
- 
- # postfix settings for various configs
-@@ -272,4 +272,4 @@ ADD_SUBDIRECTORY(src)
- 
- if (OSGEARTH_BUILD_DOCS)
-     ADD_SUBDIRECTORY(docs)
-endif()    
-+endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7541c8d..b4076fe 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit
+ 
+ # Mobile/GLES:
+ IF (OSGEARTH_USE_GLES)
+-    find_package(OpenGLES)
+    find_package(OpenGLES REQUIRED)
+ ELSE ()
+-    find_package(OpenGL)
+    find_package(OpenGL REQUIRED)
+ ENDIF (OSGEARTH_USE_GLES)
+ 
+ # required
+ find_package(OSG REQUIRED)
+-find_package(CURL REQUIRED)
+find_package(CURL CONFIG REQUIRED)
+set(CURL_LIBRARY CURL::libcurl)
+ find_package(GDAL REQUIRED)
+-
+set(GDAL_LIBRARY ${GDAL_LIBRARIES})
+set(GDAL_FOUND 1)
+ # optional
+-find_package(GEOS)
+-find_package(Sqlite3)
+-find_package(Draco)
+-find_package(BASISU)
+-find_package(GLEW)
+-find_package(Protobuf)
+-find_package(WEBP)
+-find_package(Blend2D)
+find_package(geos CONFIG REQUIRED)
+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c)
+set(GEOS_FOUND 1)
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
+set(SQLITE3_FOUND 1)
+set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3)
+find_package(Draco REQUIRED)
+find_package(BASISU REQUIRED)
+find_package(GLEW REQUIRED)
+set(GLEW_LIBRARIES GLEW::GLEW)
+set(GLEW_FOUND 1)
+find_package(protobuf CONFIG REQUIRED)
+set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf)
+set(Protobuf_FOUND 1)
+find_package(WebP CONFIG REQUIRED)
+set(WEBP_LIBRARY WebP::webp)
+set(WEBP_FOUND 1)
+find_package(Blend2D REQUIRED)
+ 
+ if(OSGEARTH_ENABLE_PROFILING)
+-    find_package(Tracy)
+    find_package(Tracy REQUIRED)
+ endif()
+ 
+ if(OSGEARTH_BUILD_ZIP_PLUGIN)
+-    find_package(LIBZIP)
+    find_package(libzip CONFIG REQUIRED)
+    set(LIBZIP_LIBRARY libzip::zip)
+    set(LIBZIP_FOUND 1)
+ endif()
+ 
+ if(OSGEARTH_BUILD_TRITON_NODEKIT)
+-    find_package(Triton QUIET)
+    find_package(Triton QUIET REQUIRED)
+ endif()
+ 
+ if(OSGEARTH_BUILD_SILVERLINING_NODEKIT)
+-    find_package(SilverLining QUIET)
+    find_package(SilverLining QUIET REQUIRED)
+ endif()
+ 
+ # Sqlite enables the MBTiles format:
+@@ -193,7 +207,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile
+ # Duktape is the JavaScript interpreter
+ SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
+ IF (WITH_EXTERNAL_DUKTAPE)
+-    find_package(Duktape)
+    find_package(Duktape REQUIRED)
+ ENDIF (WITH_EXTERNAL_DUKTAPE)
+ 
+ # Whether to install shaders (glsl files).
+@@ -204,7 +218,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
+ # TinyXML is an XML parsing library
+ SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
+ IF (WITH_EXTERNAL_TINYXML)
+-    find_package(TinyXML)
+    find_package(tinyxml CONFIG REQUIRED)
+    set(TINYXML_FOUND 1)
+    set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
+ ENDIF (WITH_EXTERNAL_TINYXML)
+ 
+ # postfix settings for various configs
--- a/ports/osgearth/portfile.cmake
+++ b/ports/osgearth/portfile.cmake
@ -11,14 +11,12 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO gwaldron/osgearth
-    REF 342fcadf4c8892ba84841cb5b4162bdc51519e3c #version 3.1
-    SHA512 03378a918306846d2144e545785c783b01e33fa2dd5c77d16d390a275217b6ce7a3a743c35ae99a497b272a7516b055442c0a891bd312cce727a5538b40364f5
+    REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2
+    SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670
    HEAD_REF master
    PATCHES 
        StaticOSG.patch # Fix port compilation in static-md module
-        deprecated_cpp_fix.patch # Fix port headers to not use classes deprecated in c++17. Gives errors when using the installed port headers
        make-all-find-packages-required.patch
-        fix-dependencies.patch
        fix-dependency-osg.patch
        remove-tool-debug-suffix.patch
 )
@ -79,7 +77,7 @@ endif()

 if ("tools" IN_LIST FEATURES)
    vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp
-        osgearth_conv osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer
+        osgearth_conv osgearth_imgui osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer
        AUTO_CLEAN
    )
 endif()
--- a/ports/osgearth/vcpkg.json
+++ b/ports/osgearth/vcpkg.json
@ -1,8 +1,7 @@
 {
  "name": "osgearth",
-  "version": "3.1",
-  "port-version": 4,
-  "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.",
+  "version": "3.2",
+  "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
  "homepage": "https://github.com/gwaldron/osgearth",
  "supports": "!(x86 | wasm32)",
  "dependencies": [
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -4945,8 +4945,8 @@
      "port-version": 2
    },
    "osgearth": {
-      "baseline": "3.1",
-      "port-version": 4
+      "baseline": "3.2",
+      "port-version": 0
    },
    "osi": {
      "baseline": "0.108.6",
--- a/versions/o-/osgearth.json
+++ b/versions/o-/osgearth.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "a77075c3ff1a0372588cb78af6f4f08352b82896",
+      "version": "3.2",
+      "port-version": 0
+    },
    {
      "git-tree": "d12ff3ef1419ab8813b430101fb6dbcc96861671",
      "version": "3.1",