diff --git a/ports/osgearth/fix-dependency-osg.patch b/ports/osgearth/fix-dependency-osg.patch index 9d8b0d43df..6aae9a560c 100644 --- a/ports/osgearth/fix-dependency-osg.patch +++ b/ports/osgearth/fix-dependency-osg.patch @@ -2,7 +2,7 @@ diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake index b7dff11..d1ec2ff 100644 --- a/CMakeModules/FindOSG.cmake +++ b/CMakeModules/FindOSG.cmake -@@ -121,5 +121,36 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) +@@ -121,5 +121,40 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) SET( OSG_FOUND "YES" ) SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} ) GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH ) @@ -21,6 +21,10 @@ index b7dff11..d1ec2ff 100644 + find_package(TIFF REQUIRED) + find_package(zstd REQUIRED) + find_package(GIF REQUIRED) ++ if (WIN32) ++ find_package(pthreads CONFIG REQUIRED) ++ list(APPEND OSG_DEPENDS_LIBRARY PThreads4W::PThreads4W) ++ endif() + + if (UNIX) + list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread) diff --git a/ports/osgearth/fix-gcc11-compilation.patch b/ports/osgearth/fix-gcc11-compilation.patch new file mode 100644 index 0000000000..582389068f --- /dev/null +++ b/ports/osgearth/fix-gcc11-compilation.patch @@ -0,0 +1,38 @@ +From 8c16194c53d5bf70716dae2c6df67e77a1608dde Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Wed, 28 Jul 2021 06:40:45 -0700 +Subject: [PATCH] fix-gcc11-compilation + +--- + src/osgEarth/Units | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/osgEarth/Units b/src/osgEarth/Units +index dd19afe..bfe826a 100644 +--- a/src/osgEarth/Units ++++ b/src/osgEarth/Units +@@ -196,17 +196,17 @@ namespace osgEarth + class qualified_double + { + public: +- qualified_double( double value, const Units& units ) : _value(value), _units(units) { } ++ qualified_double( double value, const Units& units ) : _value(value), _units(units) { } + +- qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } ++ qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } + + // parses the qualified number from a parseable string (e.g., "123km") +- qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { ++ qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { + Units::parse( parseable, _value, _units, defaultUnits ); + } + + // loads the qualified number from an old-school config (e.g., { value="123" units="km" } ) +- qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { ++ qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { + if ( conf.hasValue("value") ) { + _value = conf.value("value", 0.0); + if ( !Units::parse( conf.value("units"), _units ) ) +-- +2.31.1 + diff --git a/ports/osgearth/fix-imgui.patch b/ports/osgearth/fix-imgui.patch new file mode 100644 index 0000000000..495c3dff86 --- /dev/null +++ b/ports/osgearth/fix-imgui.patch @@ -0,0 +1,21 @@ +From 2aa1535341c9aace4a5ca0115fa51dbf76f582ec Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Wed, 29 Sep 2021 23:12:52 -0700 +Subject: [PATCH] patch + +--- + src/applications/osgearth_imgui/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/applications/osgearth_imgui/CMakeLists.txt b/src/applications/osgearth_imgui/CMakeLists.txt +index 246fd89..5ea6f63 100644 +--- a/src/applications/osgearth_imgui/CMakeLists.txt ++++ b/src/applications/osgearth_imgui/CMakeLists.txt +@@ -1,3 +1,3 @@ +-set(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) + set(TARGET_SRC osgearth_imgui.cpp) + SETUP_IMGUI_APPLICATION(osgearth_imgui) +-- +2.31.1 + diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 6b7725ccc6..0f91f88ca8 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_from_github( make-all-find-packages-required.patch fix-dependency-osg.patch remove-tool-debug-suffix.patch + fix-imgui.patch + fix-gcc11-compilation.patch ) # Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 57cc6af268..a3061ac6eb 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,12 +1,13 @@ { "name": "osgearth", "version": "3.2", - "port-version": 1, + "port-version": 2, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", "dependencies": [ "basisu", + "cfitsio", "draco", "geos", "glew", @@ -20,6 +21,7 @@ ] }, "protobuf", + "pthreads", "sqlite3", "tinyxml" ], diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a5a8dfd1eb..96e21eba49 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -779,7 +779,6 @@ lodepng:x64-osx = skip lodepng:x64-uwp = skip lodepng:x64-windows = skip lodepng:x64-windows-static = skip -lodepng:x64-windows-static-md=skip lodepng:x86-windows = skip log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail @@ -1137,7 +1136,6 @@ pdcurses:x64-linux=fail pdcurses:x64-osx=fail pdcurses:x64-uwp=fail pdcurses:x64-windows-static=fail -pdcurses:x64-windows-static-md=fail pfring:arm64-windows=fail pfring:arm-uwp=fail pfring:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 6a1ff5aa19..0a80fe18ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5082,7 +5082,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 1 + "port-version": 2 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 60da91a0b3..5f39ae9599 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "106a6da206a787832252687e41ad5ba3b102d062", + "version": "3.2", + "port-version": 2 + }, { "git-tree": "f3ac1cffb36f0b0b2b531af29145de695cee2291", "version": "3.2",