[openmvs] update to v2.1.0 (#28843)

* update to v2.1.0

* x-add-version

* fix InterfaceMetashape

* Update openmvs.json

ports/openmvs/fix-build.patch

@@ -1,18 +1,5 @@
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index 2365de65f..4d871850d 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # Add applications
- ADD_SUBDIRECTORY(InterfaceCOLMAP)
- ADD_SUBDIRECTORY(InterfaceMetashape)
-+ADD_SUBDIRECTORY(InterfaceVisualSFM)
- ADD_SUBDIRECTORY(DensifyPointCloud)
- ADD_SUBDIRECTORY(ReconstructMesh)
- ADD_SUBDIRECTORY(RefineMesh)
-
 diff --git a/build/Templates/OpenMVSConfig.cmake.in b/build/Templates/OpenMVSConfig.cmake.in
-index 9747b3e1..5e2469d3 100644
+index 9747b3e1..a8eb87df 100644
 --- a/build/Templates/OpenMVSConfig.cmake.in
 +++ b/build/Templates/OpenMVSConfig.cmake.in
 @@ -15,9 +15,67 @@ set(OpenMVS_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_IN@")
@@ -22,10 +9,10 @@ index 9747b3e1..5e2469d3 100644
 +list(APPEND CMAKE_MODULE_PATH "${OpenMVS_CMAKE_DIR}")
 +
 +if (MSVC)
-+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL")
-+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
-+	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
++    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL")
++    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
++    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
++    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
 +endif()
 +
 +set(CMAKE_CXX_STANDARD 14)
@@ -34,24 +21,24 @@ index 9747b3e1..5e2469d3 100644
 +include(CMakeFindDependencyMacro)
 +
 +if(@OpenMVS_USE_OPENMP@)
-+	find_dependency(OpenMP)
-+	add_definitions(-D_USE_OPENMP)
++    find_dependency(OpenMP)
++    add_definitions(-D_USE_OPENMP)
 +endif()
 +
 +if(@OpenMVS_USE_OPENGL@)
-+	find_dependency(OpenGL)
-+	add_definitions(${OpenGL_DEFINITIONS} -D_USE_OPENGL)
++    find_dependency(OpenGL)
++    add_definitions(${OpenGL_DEFINITIONS} -D_USE_OPENGL)
 +endif()
 +
 +if(@OpenMVS_USE_CUDA@)
-+	find_dependency(CUDA)
-+	add_definitions(-D_USE_CUDA)
-+	include_directories(${CUDA_INCLUDE_DIRS})
++    find_dependency(CUDA)
++    add_definitions(-D_USE_CUDA)
++    include_directories(${CUDA_INCLUDE_DIRS})
 +endif()
 +
 +if(@OpenMVS_USE_BREAKPAD@)
-+	find_dependency(BREAKPAD)
-+	add_definitions(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD)
++    find_dependency(BREAKPAD)
++    add_definitions(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD)
 +endif()
 +
 +find_dependency(Boost)
@@ -69,15 +56,15 @@ index 9747b3e1..5e2469d3 100644
 +add_definitions(${VCG_DEFINITIONS})
 +
 +if(@OpenMVS_USE_CERES@)
-+	find_dependency(Ceres)
-+	add_definitions(${CERES_DEFINITIONS})
++    find_dependency(Ceres)
++    add_definitions(${CERES_DEFINITIONS})
 +endif()
 +
 +add_definitions(@OpenMVS_DEFINITIONS@)
 +
 +# Our library dependencies (contains definitions for IMPORTED targets)
 +if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR)
-+	include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake")
++    include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake")
 +endif()
 +
  # These are IMPORTED targets created by OpenMVSTargets.cmake
@@ -86,10 +73,10 @@ index 9747b3e1..5e2469d3 100644
 -
 -include("${CMAKE_CURRENT_LIST_DIR}/OpenMVSTargets.cmake")
 -check_required_components("OpenMVS")
-+set(OpenMVS_BINARIES InterfaceVisualSFM InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh)
++set(OpenMVS_BINARIES InterfaceCOLMAP InterfaceMetashape InterfaceMVSNet DensifyPointCloud ReconstructMesh RefineMesh TextureMesh TransformScene Viewer)
 
 diff --git a/build/Utils.cmake b/build/Utils.cmake
-index 106d43167..33390d192 100644
+index 0cb2d8e1..62e1661f 100644
 --- a/build/Utils.cmake
 +++ b/build/Utils.cmake
 @@ -173,32 +173,6 @@ macro(ComposePackageLibSuffix)
@@ -125,7 +112,7 @@ index 106d43167..33390d192 100644
  endmacro()
 
 
-@@ -806,12 +780,8 @@ macro(ConfigLibrary)
+@@ -805,12 +779,8 @@ macro(ConfigLibrary)
  	# Offer the user the choice of overriding the installation directories
  	set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries")
  	set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables")
@@ -140,7 +127,7 @@ index 106d43167..33390d192 100644
  	set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
  	# Make relative paths absolute (needed later on)
  	foreach(p LIB BIN INCLUDE CMAKE)
-@@ -822,7 +792,7 @@ macro(ConfigLibrary)
+@@ -821,7 +791,7 @@ macro(ConfigLibrary)
  		else()
  			set(${varp} "${CMAKE_INSTALL_PREFIX}/${${var}}")
  		endif()
@@ -155,10 +142,10 @@ similarity index 100%
 rename from libs/Common/Strings.h
 rename to libs/Common/MVSStrings.h
 diff --git a/libs/Common/Types.h b/libs/Common/Types.h
-index bcac65c..9abeefb 100644
+index d5dcb27e..04fbfe2f 100644
 --- a/libs/Common/Types.h
 +++ b/libs/Common/Types.h
-@@ -380,7 +380,7 @@ typedef TAliasCast<double,int32_t> CastD2I;
+@@ -385,7 +385,7 @@ typedef TAliasCast<double,int32_t> CastD2I;
 
  // I N C L U D E S /////////////////////////////////////////////////
 
@@ -169,15 +156,15 @@ index bcac65c..9abeefb 100644
  #include "Thread.h"
 
 diff --git a/apps/InterfaceMetashape/InterfaceMetashape.cpp b/apps/InterfaceMetashape/InterfaceMetashape.cpp
-index 1157bf29..73563b3c 100644
+index 4886973a..c2ab8f98 100644
 --- a/apps/InterfaceMetashape/InterfaceMetashape.cpp
 +++ b/apps/InterfaceMetashape/InterfaceMetashape.cpp
-@@ -246,7 +246,7 @@ bool ParseImageListXML(Scene& scene, PlatformDistCoeffs& pltDistCoeffs, size_t&
- 	tinyxml2::XMLElement* elem;
- 	const size_t nLen(pStream->getSize());
- 	String strCameras; strCameras.resize(nLen);
--	pStream->read(&strCameras[0], nLen);
-+	pStream->read(strCameras.data(), nLen);
- 	tinyxml2::XMLDocument doc;
- 	doc.Parse(strCameras.c_str(), nLen);
- 	if (doc.ErrorID() != tinyxml2::XML_SUCCESS)
+@@ -627,7 +627,7 @@ bool ParseSceneXML(Scene& scene, PlatformDistCoeffs& pltDistCoeffs, size_t& nCam
+ 		}
+ 		const size_t nLen(pStream->getSize());
+ 		String str; str.resize(nLen);
+-		pStream->read(&str[0], nLen);
++		pStream->read(str.data(), nLen);
+ 		doc.Parse(str.c_str(), nLen);
+ 	}
+ 	if (doc.ErrorID() != tinyxml2::XML_SUCCESS) {

ports/openmvs/portfile.cmake

@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cdcseacave/openMVS
-    REF v2.0.1
-    SHA512 f1c1708d6e5c9424b95fb71c88ca510c70a4b11711079f12f173ecf190b009a977f7aa11f49a0b2e634a307f2732e4c33d9cd37d727ba60da99051876adb7d1e
+    REF v2.1.0
+    SHA512 95d83c6694b63b6fd27657c4c5e22ddbc078d26b7324b8f17952a6c7e4547028698aa155077c0cfb916d3497ca31c365e0cbcd81f3cbe959ef40a7ee2e5cd300
     HEAD_REF master
     PATCHES
         fix-build.patch
@@ -32,6 +32,7 @@ vcpkg_cmake_configure(
         -DOpenMVS_USE_SSE=ON
         -DOpenMVS_USE_OPENGL=ON
         -DOpenMVS_USE_BREAKPAD=OFF
+        -DOpenMVS_ENABLE_TESTS=OFF
     OPTIONS_RELEASE
         -DOpenMVS_BUILD_TOOLS=ON
     OPTIONS_DEBUG
@@ -46,22 +47,24 @@ vcpkg_cmake_config_fixup()
 file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake TARGETS_CMAKE)
 string(REPLACE "bin/InterfaceCOLMAP" "tools/${PORT}/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/InterfaceMetashape" "tools/${PORT}/InterfaceMetashape" TARGETS_CMAKE "${TARGETS_CMAKE}")
-string(REPLACE "bin/InterfaceVisualSFM" "tools/${PORT}/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}")
+string(REPLACE "bin/InterfaceMVSNet" "tools/${PORT}/InterfaceMVSNet" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/DensifyPointCloud" "tools/${PORT}/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/ReconstructMesh" "tools/${PORT}/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/RefineMesh" "tools/${PORT}/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/TextureMesh" "tools/${PORT}/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}")
+string(REPLACE "bin/TransformScene" "tools/${PORT}/TransformScene" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/Viewer" "tools/${PORT}/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}")
 
 vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
     DensifyPointCloud
     InterfaceCOLMAP
     InterfaceMetashape
-    InterfaceVisualSFM
+    InterfaceMVSNet
     ReconstructMesh
     RefineMesh
     TextureMesh
+    TransformScene
     Viewer
 )
 

ports/openmvs/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "openmvs",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "OpenMVS: open Multi-View Stereo reconstruction library",
   "homepage": "https://cdcseacave.github.io/openMVS",
   "license": "AGPL-3.0-only",

versions/baseline.json

@@ -5633,7 +5633,7 @@
       "port-version": 5
     },
     "openmvs": {
-      "baseline": "2.0.1",
+      "baseline": "2.1.0",
       "port-version": 0
     },
     "openni2": {

versions/o-/openmvs.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fbeb86b69f146df9049966d4e58117f38e166257",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bf082c0deb661743df2e3c5f658224ccd6375919",
       "version": "2.0.1",