misc/openmvg: update 2.0 → 2.0-78

Reported by:	portscout

(cherry picked from commit 9103c28fb0ba4c078aafbe09e1c333ef3f7cde14)

7 files changed, 53 insertions, 45 deletions

diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
index f6164352e868..0cf630ef3a32 100644
--- a/misc/openmvg/Makefile
+++ b/misc/openmvg/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openmvg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0
-PORTREVISION=	12
+DISTVERSION=	2.0-78
+DISTVERSIONSUFFIX=	-gd67601b7
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -38,7 +38,6 @@ LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libgmp.so:math/gmp \
 		libjbig.so:graphics/jbigkit \
 		libmetis.so:math/metis \
-		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libpng.so:graphics/png \
diff --git a/misc/openmvg/distinfo b/misc/openmvg/distinfo
index 0ac3ff64ba0d..2cb5791e057b 100644
--- a/misc/openmvg/distinfo
+++ b/misc/openmvg/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1636913713
-SHA256 (openMVG-openMVG-v2.0_GH0.tar.gz) = 950da7d6fc370cc99ad29092fd3b46196f782af2f905e475a7262ceb96170618
-SIZE (openMVG-openMVG-v2.0_GH0.tar.gz) = 15129786
+TIMESTAMP = 1697821285
+SHA256 (openMVG-openMVG-v2.0-78-gd67601b7_GH0.tar.gz) = d51a5617da9b86720c5e53689c13c7f7d2152ac00338763d6fb1c2b626beb784
+SIZE (openMVG-openMVG-v2.0-78-gd67601b7_GH0.tar.gz) = 15319980
 SHA256 (openMVG-thirdparty-cereal-ac168fe_GH0.tar.gz) = 99290309c96f65eca82883224fc19d08271d086328e97a657758deaea1110014
 SIZE (openMVG-thirdparty-cereal-ac168fe_GH0.tar.gz) = 374597
diff --git a/misc/openmvg/files/patch-CMakeLists.txt b/misc/openmvg/files/patch-CMakeLists.txt
index 970e92633172..ec5e0a57cb08 100644
--- a/misc/openmvg/files/patch-CMakeLists.txt
+++ b/misc/openmvg/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-10-20 20:39:31 UTC
+--- CMakeLists.txt.orig	2023-09-16 06:22:49 UTC
 +++ CMakeLists.txt
-@@ -113,8 +115,8 @@ include(OptimizeForArchitecture)
+@@ -122,8 +122,8 @@ include(OptimizeForArchitecture)
  OptimizeForArchitecture()
  
  if (UNIX AND NOT OpenMVG_BUILD_COVERAGE)
diff --git a/misc/openmvg/files/patch-openMVG_matching_metric__simd.hpp b/misc/openmvg/files/patch-openMVG_matching_metric__simd.hpp
deleted file mode 100644
index d5b98e1586ad..000000000000
--- a/misc/openmvg/files/patch-openMVG_matching_metric__simd.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- openMVG/matching/metric_simd.hpp.orig	2021-11-29 11:14:30 UTC
-+++ openMVG/matching/metric_simd.hpp
-@@ -17,7 +17,9 @@
- #include <numeric>
- 
- #include <cstdint>
-+#if defined(__amd64__) || defined(__i386__)
- #include <immintrin.h>
-+#endif
- 
- namespace openMVG {
- namespace matching {
diff --git a/misc/openmvg/files/patch-software_SfM_CMakeLists.txt b/misc/openmvg/files/patch-software_SfM_CMakeLists.txt
index c73e826d2457..b80d5f72dd4b 100644
--- a/misc/openmvg/files/patch-software_SfM_CMakeLists.txt
+++ b/misc/openmvg/files/patch-software_SfM_CMakeLists.txt
@@ -1,8 +1,8 @@
 - workaround for https://github.com/openMVG/openMVG/issues/1962
 
---- software/SfM/CMakeLists.txt.orig	2021-11-14 08:42:39 UTC
+--- software/SfM/CMakeLists.txt.orig	2023-09-16 06:22:49 UTC
 +++ software/SfM/CMakeLists.txt
-@@ -200,6 +200,7 @@ target_link_libraries(openMVG_main_ComputeStructureFro
+@@ -189,6 +189,7 @@ target_link_libraries(openMVG_main_FrustumFiltering
      openMVG_system
      openMVG_features
      openMVG_sfm
diff --git a/misc/openmvg/files/patch-third__party_stlplus3_CMakeLists.txt b/misc/openmvg/files/patch-third__party_stlplus3_CMakeLists.txt
new file mode 100644
index 000000000000..73b348f05340
--- /dev/null
+++ b/misc/openmvg/files/patch-third__party_stlplus3_CMakeLists.txt
@@ -0,0 +1,13 @@
+- workaround for https://github.com/openMVG/openMVG/issues/2256
+
+--- third_party/stlplus3/CMakeLists.txt.orig	2023-10-20 17:19:07 UTC
++++ third_party/stlplus3/CMakeLists.txt
+@@ -6,7 +6,7 @@ file(GLOB LIBSLTPLUS_CPP_FILESYSTEM "${CMAKE_CURRENT_S
+ list(APPEND LIBSLTPLUS_SRCS
+   ${LIBSLTPLUS_HPP_FILESYSTEM} ${LIBSLTPLUS_CPP_FILESYSTEM})
+ 
+-add_library(openMVG_stlplus STATIC ${LIBSLTPLUS_SRCS})
++add_library(openMVG_stlplus ${LIBSLTPLUS_SRCS})
+ if(STLPLUS_INCLUDE_INSTALL_DIR)
+   target_include_directories(openMVG_stlplus PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/misc/openmvg/pkg-plist b/misc/openmvg/pkg-plist
index e36db44d1596..c90cda0d7fa9 100644
--- a/misc/openmvg/pkg-plist
+++ b/misc/openmvg/pkg-plist
@@ -6,6 +6,7 @@ bin/openMVG_main_ComputeFeatures
 bin/openMVG_main_ComputeMatches
 bin/openMVG_main_ComputeSfM_DataColor
 bin/openMVG_main_ComputeStructureFromKnownPoses
+bin/openMVG_main_ComputeVLAD
 bin/openMVG_main_ConvertList
 bin/openMVG_main_ConvertSfM_DataFormat
 bin/openMVG_main_ExportCameraFrustums
@@ -178,6 +179,9 @@ include/openMVG/matching_image_collection/Pair_Builder.hpp
 include/openMVG/matching_image_collection/Retrieval_Helpers.hpp
 include/openMVG/matching_image_collection/Vlad.hpp
 include/openMVG/matching_image_collection/VladBase.hpp
+include/openMVG/multiview/LiGT/LiGT_algorithm.hpp
+include/openMVG/multiview/LiGT/LiGT_algorithm_converter.hpp
+include/openMVG/multiview/LiGT/LiGT_types.hpp
 include/openMVG/multiview/conditioning.hpp
 include/openMVG/multiview/essential.hpp
 include/openMVG/multiview/motion_from_essential.hpp
@@ -252,6 +256,7 @@ include/openMVG/sfm/pipelines/sfm_regions_provider.hpp
 include/openMVG/sfm/pipelines/sfm_regions_provider_cache.hpp
 include/openMVG/sfm/pipelines/sfm_robust_model_estimation.hpp
 include/openMVG/sfm/pipelines/stellar/relative_scale.hpp
+include/openMVG/sfm/pipelines/stellar/sfm_stellar_engine.hpp
 include/openMVG/sfm/pipelines/stellar/stellar_definitions.hpp
 include/openMVG/sfm/pipelines/stellar/stellar_solver.hpp
 include/openMVG/sfm/pipelines/structure_from_known_poses/structure_estimator.hpp
@@ -304,11 +309,14 @@ include/openMVG/third_party/htmlDoc/htmlDoc.hpp
 include/openMVG/third_party/stlplus3/filesystemSimplified/file_system.hpp
 include/openMVG/third_party/stlplus3/filesystemSimplified/portability_fixes.hpp
 include/openMVG/third_party/stlplus3/filesystemSimplified/wildcard.hpp
-include/openMVG/third_party/vectorGraphics/svgDrawer.hpp
 include/openMVG/tracks/flat_pair_map.hpp
 include/openMVG/tracks/tracks.hpp
 include/openMVG/tracks/union_find.hpp
 include/openMVG/types.hpp
+include/openMVG/vector_graphics/svgAttributes.hpp
+include/openMVG/vector_graphics/svgDrawer.hpp
+include/openMVG/vector_graphics/svgElement.hpp
+include/openMVG/vector_graphics/svgHistogram.hpp
 include/openMVG/version.hpp
 include/openMVG_dependencies/cereal/include/cereal/access.hpp
 include/openMVG_dependencies/cereal/include/cereal/archives/adapters.hpp
@@ -452,6 +460,8 @@ include/openMVG_dependencies/nonFree/sift/vl/random.h
 include/openMVG_dependencies/nonFree/sift/vl/sift.h
 lib/libopenMVG_easyexif.so
 lib/libopenMVG_exif.so
+lib/libopenMVG_exif.so.2
+lib/libopenMVG_exif.so.2.0
 lib/libopenMVG_fast.so
 lib/libopenMVG_features.so
 lib/libopenMVG_features.so.2
@@ -494,28 +504,26 @@ lib/libopenMVG_system.so
 lib/libopenMVG_system.so.2
 lib/libopenMVG_system.so.2.0
 lib/libvlsift.so
-lib/openMVG-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/openMVG-targets.cmake
-share/openMVG/cmake/OpenMVGConfig.cmake
-share/openMVG/cmake/OpenMVGTargets-%%CMAKE_BUILD_TYPE%%.cmake
-share/openMVG/cmake/OpenMVGTargets.cmake
-share/openMVG/sensor_width_camera_database.txt
-share/openMVG/webgl/common/camera.js
-share/openMVG/webgl/common/camera_gizmo.js
-share/openMVG/webgl/common/common.js
-share/openMVG/webgl/common/dual_quaternion.js
-share/openMVG/webgl/common/index.html
-share/openMVG/webgl/common/main.js
-share/openMVG/webgl/common/matrix3.js
-share/openMVG/webgl/common/matrix4.js
-share/openMVG/webgl/common/plane.js
-share/openMVG/webgl/common/point_cloud.js
-share/openMVG/webgl/common/quaternion.js
-share/openMVG/webgl/common/render_context.js
-share/openMVG/webgl/common/shader.js
-share/openMVG/webgl/common/style.css
-share/openMVG/webgl/common/trackball.js
-share/openMVG/webgl/common/vector.js
+lib/openMVG/cmake/OpenMVGConfig.cmake
+lib/openMVG/cmake/OpenMVGTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/openMVG/cmake/OpenMVGTargets.cmake
+lib/openMVG/sensor_width_camera_database.txt
+lib/openMVG/webgl/common/camera.js
+lib/openMVG/webgl/common/camera_gizmo.js
+lib/openMVG/webgl/common/common.js
+lib/openMVG/webgl/common/dual_quaternion.js
+lib/openMVG/webgl/common/index.html
+lib/openMVG/webgl/common/main.js
+lib/openMVG/webgl/common/matrix3.js
+lib/openMVG/webgl/common/matrix4.js
+lib/openMVG/webgl/common/plane.js
+lib/openMVG/webgl/common/point_cloud.js
+lib/openMVG/webgl/common/quaternion.js
+lib/openMVG/webgl/common/render_context.js
+lib/openMVG/webgl/common/shader.js
+lib/openMVG/webgl/common/style.css
+lib/openMVG/webgl/common/trackball.js
+lib/openMVG/webgl/common/vector.js
 @dir include/openMVG/exif/image_data
 @dir include/openMVG/image/image_test
 @dir include/openMVG_dependencies/cereal/doc