[openmvs] Update to 1.0.1 (#9563)

* [openmvs] update * fix windows static * fix x86 windows * Update CONTROL
2024-11-24 14:51:07 +08:00 · 2020-01-10 20:40:42 +02:00 · 2020-01-10 20:40:42 +02:00 · 3b5c2ec03e
commit 3b5c2ec03e
parent 314d59229d
5 changed files with 3 additions and 103 deletions
--- a/ports/openmvs/CONTROL
+++ b/ports/openmvs/CONTROL
@ -1,4 +1,4 @@
 Source: openmvs
-Version: 1.0-3
+Version: 1.0.1
 Description: OpenMVS: open Multi-View Stereo reconstruction library
 Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib
--- a/ports/openmvs/boost-1.71.patch
+++ b/ports/openmvs/boost-1.71.patch
@ -1,13 +0,0 @@
-diff --git a/libs/Common/Types.h b/libs/Common/Types.h
-index aad57d1..ef21380 100644
--- a/libs/Common/Types.h
-+++ b/libs/Common/Types.h
-@@ -88,7 +88,7 @@
- #define BOOST_NO_EXCEPTIONS
- #endif
- #ifdef BOOST_NO_EXCEPTIONS
-namespace boost { void throw_exception(std::exception const&); }
-+#include <boost/throw_exception.hpp>
- #endif
- #define BOOST_NO_UNREACHABLE_RETURN_DETECTION
- // include headers that implement serialization support
--- a/ports/openmvs/cgal-5.0.patch
+++ b/ports/openmvs/cgal-5.0.patch
@ -1,40 +0,0 @@
-diff --git a/libs/MVS/DepthMap.cpp b/libs/MVS/DepthMap.cpp
-index 12973ac..f6621f0 100644
--- a/libs/MVS/DepthMap.cpp
-+++ b/libs/MVS/DepthMap.cpp
-@@ -1071,16 +1071,25 @@ void MVS::EstimatePointNormals(const ImageArr& images, PointCloud& pointcloud, i
- 	// estimates normals direction;
- 	// Note: pca_estimate_normals() requires an iterator over points
- 	// as well as property maps to access each point's position and normal.
-	#if CGAL_VERSION_NR < 1040800000
-	CGAL::pca_estimate_normals(
-	#else
-	CGAL::pca_estimate_normals<CGAL::Sequential_tag>(
-	#endif
-		pointvectors.begin(), pointvectors.end(),
-		CGAL::First_of_pair_property_map<PointVectorPair>(),
-		CGAL::Second_of_pair_property_map<PointVectorPair>(),
-		numNeighbors
-	);
-+        #if CGAL_VERSION_NR < 1041301000
-+          #if CGAL_VERSION_NR < 1040800000
-+          CGAL::pca_estimate_normals(
-+          #else
-+          CGAL::pca_estimate_normals<CGAL::Sequential_tag>(
-+          #endif
-+                pointvectors.begin(), pointvectors.end(),
-+                CGAL::First_of_pair_property_map<PointVectorPair>(),
-+                CGAL::Second_of_pair_property_map<PointVectorPair>(),
-+                numNeighbors
-+          );
-+        #else
-+        CGAL::pca_estimate_normals<CGAL::Sequential_tag>(
-+              pointvectors,
-+              numNeighbors,
-+              CGAL::parameters::point_map(CGAL::First_of_pair_property_map<PointVectorPair>())
-+              .normal_map(CGAL::Second_of_pair_property_map<PointVectorPair>())
-+              );
-+        #endif
- 	// store the point normals
- 	pointcloud.normals.Resize(pointcloud.points.GetSize());
- 	FOREACH(i, pointcloud.normals) {
--- a/ports/openmvs/glfw3_target_compat.patch
+++ b/ports/openmvs/glfw3_target_compat.patch
@ -1,43 +0,0 @@
-diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt
-index f1690a6..78466cd 100644
--- a/apps/Viewer/CMakeLists.txt
-+++ b/apps/Viewer/CMakeLists.txt
-@@ -16,28 +16,7 @@ else()
- 	MESSAGE("-- Can't find GLEW. Continuing without it.")
- 	RETURN()
- endif()
-if(CMAKE_COMPILER_IS_GNUCXX)
-	FIND_PACKAGE(PkgConfig QUIET)
-	pkg_search_module(GLFW QUIET glfw3)
-	if(GLFW_FOUND)
-		INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS})
-		ADD_DEFINITIONS(${GLFW_DEFINITIONS})
-		MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})")
-	else()
-		MESSAGE("-- Can't find GLFW3. Continuing without it.")
-		RETURN()
-	endif()
-else()
-	FIND_PACKAGE(glfw3 QUIET)
-	if(glfw3_FOUND)
-		INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS})
-		ADD_DEFINITIONS(${glfw3_DEFINITIONS})
-		MESSAGE(STATUS "GLFW3 ${glfw3_VERSION} found (include: ${glfw3_INCLUDE_DIRS})")
-	else()
-		MESSAGE("-- Can't find GLFW3. Continuing without it.")
-		RETURN()
-	endif()
-endif()
-+FIND_PACKAGE(glfw3 REQUIRED)
- 
- # List sources files
- FILE(GLOB PCH_C "Common.cpp")
-@@ -54,7 +33,7 @@ FILE(GLOB LIBRARY_FILES_H "*.h" "*.inl")
- LIST(REMOVE_ITEM LIBRARY_FILES_C ${PCH_C})
- SET(LIBRARY_FILES_C "${PCH_C};${LIBRARY_FILES_C}")
- 
-cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};${GLFW_STATIC_LIBRARIES};GLEW::GLEW;${glfw3_LIBRARY};${GLFW3_LIBRARY};glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
-+cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};GLEW::GLEW;glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
- 
- # Manually set Common.h as the precompiled header
- set_target_pch(${VIEWER_NAME} Common.h)
--- a/ports/openmvs/portfile.cmake
+++ b/ports/openmvs/portfile.cmake
@ -5,13 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO cdcseacave/openMVS
-    REF v1.0
-    SHA512 d5743660286068d2ec9e80b8cfdf1dd612d76f12f1f10c95d32bab55ae65032a200d820f2c76e4781068c61597e2533df8755fd5d9076d3aac9223134eb5b561
+    REF 7110659a3f5181397bc2549cea15d5350cd25c9d
+    SHA512 e484a88e0040b69e489476ef20c06184d2dc2bf42452b965b4997a717c2d1f19ab7cd695563c4faacdb0ec8705d072bcfd568d7b3a32e4e8b8c632bcec57e15c
    HEAD_REF master
-    PATCHES
-        glfw3_target_compat.patch
-        boost-1.71.patch
-        cgal-5.0.patch
 )

 vcpkg_configure_cmake(