[openmvg] Fix for building with eigen 3.4.0. (#20056)

* [openmvg] Fix for building with eigen 3.4.0.

* Bump port version.

* Convert "version-string" field into "version"

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update vcpkg_check_features call

* [openmvg] x-add-version

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

ports/openmvg/0001-eigen_3.4.0.patch

@@ -0,0 +1,25 @@
+From 7be28dca0403660e721d66de954f27b92897163e Mon Sep 17 00:00:00 2001
+From: Alberto Luaces <aluaces@udc.es>
+Date: Wed, 8 Sep 2021 18:00:53 +0200
+Subject: [PATCH] eigen_3.4.0
+
+---
+ src/openMVG/multiview/solver_fundamental_kernel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/openMVG/multiview/solver_fundamental_kernel.cpp b/src/openMVG/multiview/solver_fundamental_kernel.cpp
+index 5e0c12eb..fa025198 100644
+--- a/src/openMVG/multiview/solver_fundamental_kernel.cpp
++++ b/src/openMVG/multiview/solver_fundamental_kernel.cpp
+@@ -134,7 +134,7 @@ void EightPointSolver::Solve
+     MatX9 epipolar_constraint(x1.cols(), 9);
+     epipolar_constraint.fill(0.0);
+     EncodeEpipolarEquation(x1, x2, &epipolar_constraint);
+-    Eigen::SelfAdjointEigenSolver<MatX9> solver
++    Eigen::SelfAdjointEigenSolver<Eigen::Matrix<double, 9, 9>> solver
+       (epipolar_constraint.transpose() * epipolar_constraint);
+     f = solver.eigenvectors().leftCols<1>();
+   }
+-- 
+2.30.2
+

ports/openmvg/portfile.cmake

@@ -14,6 +14,7 @@ vcpkg_from_github(
     SHA512 6e74effbc66f5d5e7c2d5edd7dacf3c0fa7eec1cb666244db8e4147c08d2e6faca98c1164ca1305a5013d247d479184742e5156232d4d8430615af31811e216e
     PATCHES
         build_fixes.patch
+        0001-eigen_3.4.0.patch
 )
 
 set(OpenMVG_USE_OPENMP OFF)
@@ -26,10 +27,11 @@ if("openmp" IN_LIST FEATURES)
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    opencv OpenMVG_USE_OPENCV
-    opencv OpenMVG_USE_OCVSIFT
-    software OpenMVG_BUILD_SOFTWARES
-    software OpenMVG_BUILD_GUI_SOFTWARES
+    FEATURES
+        opencv OpenMVG_USE_OPENCV
+        opencv OpenMVG_USE_OCVSIFT
+        software OpenMVG_BUILD_SOFTWARES
+        software OpenMVG_BUILD_GUI_SOFTWARES
 )
 
 # remove some deps to prevent conflict

ports/openmvg/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "openmvg",
-  "version-string": "1.6",
-  "port-version": 2,
+  "version": "1.6",
+  "port-version": 3,
   "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
   "dependencies": [
     "cereal",

versions/baseline.json

@@ -4826,7 +4826,7 @@
     },
     "openmvg": {
       "baseline": "1.6",
-      "port-version": 2
+      "port-version": 3
     },
     "openmvs": {
       "baseline": "1.1",

versions/o-/openmvg.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f3087d8d002d7f226e77427ce363e2b20371485",
+      "version": "1.6",
+      "port-version": 3
+    },
     {
       "git-tree": "f62103b28735c9e72b9a866e6530c52629e77295",
       "version-string": "1.6",