[OpenMVG/OpenMVS] fix tools (#12229)

3 files changed, 60 insertions, 7 deletions

diff --git a/ports/theia/CONTROL b/ports/theia/CONTROL
index 2d527adcd..521468056 100644
--- a/ports/theia/CONTROL
+++ b/ports/theia/CONTROL
@@ -1,5 +1,6 @@
 Source: theia
-Version: 0.8-2
+Version: 0.8
+Port-Version: 3
 Build-Depends: flann, cereal, ceres[suitesparse], openimageio, glew, freeglut (!osx)
 Homepage: https://github.com/sweeneychris/TheiaSfM
 Description: An open source library for multiview geometry and structure from motion
diff --git a/ports/theia/fix-external-dependencies.patch b/ports/theia/fix-external-dependencies.patch
index 7a4b00961..fc6e540f3 100644
--- a/ports/theia/fix-external-dependencies.patch
+++ b/ports/theia/fix-external-dependencies.patch
@@ -1,7 +1,22 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c1b150..5810156 100644
+index 9c1b150..1adbfed 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
+@@ -105,10 +105,10 @@ add_definitions(-DTHEIA_DATA_DIR="${CMAKE_SOURCE_DIR}/data")
+ 
+ # Eigen
+ set(MIN_EIGEN_VERSION 3.2.0)
+-find_package(Eigen ${MIN_EIGEN_VERSION} REQUIRED)
+-if (EIGEN_FOUND)
+-  message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}")
+-endif (EIGEN_FOUND)
++find_package(Eigen3 ${MIN_EIGEN_VERSION} REQUIRED)
++if (EIGEN3_FOUND)
++  message("-- Found Eigen version ${EIGEN3_VERSION}: ${EIGEN3_INCLUDE_DIRS}")
++endif (EIGEN3_FOUND)
+ 
+ # Use a larger inlining threshold for Clang, since it hobbles Eigen,
+ # resulting in an unreasonably slow version of the blas routines. The
 @@ -129,70 +129,27 @@ endif ()
  
  # GFlags. The namespace patch is borrow from Ceres Solver (see license in
@@ -299,10 +314,48 @@ index 84f3829..f88d75a 100644
 -add_subdirectory(visual_sfm)
 \ No newline at end of file
 +add_subdirectory(visual_sfm)
+diff --git a/libraries/optimo/CMakeLists.txt b/libraries/optimo/CMakeLists.txt
+index 80f5e5f..ea57f1b 100644
+--- a/libraries/optimo/CMakeLists.txt
++++ b/libraries/optimo/CMakeLists.txt
+@@ -67,11 +67,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ 
+ # Locations to search for Eigen
+ # Eigen
+-find_package(Eigen REQUIRED)
+-if (EIGEN_FOUND)
+-  message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}")
+-endif (EIGEN_FOUND)
+-include_directories(${EIGEN_INCLUDE_DIRS})
++find_package(Eigen3 REQUIRED)
++if (EIGEN3_FOUND)
++  message("-- Found Eigen version ${EIGEN3_VERSION_STRING}: ${EIGEN3_INCLUDE_DIRS}")
++endif (EIGEN3_FOUND)
++include_directories(${EIGEN3_INCLUDE_DIRS})
+ 
+ # Setting CXX FLAGS appropriately. The code below was inspired from
+ # Google CERES and modified for this library.
 diff --git a/libraries/statx/CMakeLists.txt b/libraries/statx/CMakeLists.txt
-index 23b9e49..af236a3 100644
+index 23b9e49..c58a550 100644
 --- a/libraries/statx/CMakeLists.txt
 +++ b/libraries/statx/CMakeLists.txt
+@@ -72,11 +72,11 @@ message("-- Default Install prefix: ${CMAKE_INSTALL_PREFIX}")
+ option(STATX_WITH_CERES "Enables GEV parameter estimation using Ceres" ON)
+ 
+ # Eigen
+-find_package(Eigen REQUIRED)
+-if (EIGEN_FOUND)
+-  message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}")
+-endif (EIGEN_FOUND)
+-include_directories(${EIGEN_INCLUDE_DIRS})
++find_package(Eigen3 REQUIRED)
++if (EIGEN3_FOUND)
++  message("-- Found Eigen version ${EIGEN3_VERSION_STRING}: ${EIGEN3_INCLUDE_DIRS}")
++endif (EIGEN3_FOUND)
++include_directories(${EIGEN3_INCLUDE_DIRS})
+ 
+ # Google Flags
+ find_package(Gflags REQUIRED)
 @@ -103,7 +103,11 @@ if(STATX_WITH_CERES)
    endif(CERES_FOUND)
  
diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake
index c131ac095..77b4c11c3 100644
--- a/ports/theia/portfile.cmake
+++ b/ports/theia/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
@@ -15,6 +13,7 @@ vcpkg_from_github(
 file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake)
 file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake)
 file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -40,5 +39,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/datase
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/spectra/doxygen)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/theia RENAME copyright)
-file(COPY ${SOURCE_PATH}/data/camera_sensor_database_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/theia)
+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(COPY ${SOURCE_PATH}/data/camera_sensor_database_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})