From bc503ddb8b00b7fb8ac83b8d8772c0bb1dc9d8e0 Mon Sep 17 00:00:00 2001
From: chausner <15180557+chausner@users.noreply.github.com>
Date: Tue, 28 Sep 2021 20:50:35 +0200
Subject: [PATCH] [openmvs] Update to 1.1.1 (#20373)

* Update openmvs to 1.1.1

* Update CI baseline

* Update patch

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/openmvs/fix-build.patch | 2 +-
 ports/openmvs/portfile.cmake  | 4 ++--
 ports/openmvs/vcpkg.json      | 7 +++----
 versions/baseline.json        | 4 ++--
 versions/o-/openmvs.json      | 5 +++++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ports/openmvs/fix-build.patch b/ports/openmvs/fix-build.patch
index 54d50c25f2..48f62ae0a9 100644
--- a/ports/openmvs/fix-build.patch
+++ b/ports/openmvs/fix-build.patch
@@ -108,7 +108,7 @@ index f4914bf..23d03e6 100644
 --- a/MvgMvsPipeline.py
 +++ b/MvgMvsPipeline.py.in
 @@ -91,12 +91,12 @@ def find(afile):
-     return None
+ 
  
  # Try to find openMVG and openMVS binaries in PATH
 -OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing")
diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake
index d2055fe1a1..ef4f8eac3d 100644
--- a/ports/openmvs/portfile.cmake
+++ b/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 v1.1
-    SHA512 baa9149853dc08c602deeb1a04cf57643d1cb0733aee2776f4e99b210279aad3b4a1013ab1d790e91a3a95b7c72b9c12c6be25f2c30a76b69b5319b610cb8e7a
+    REF v1.1.1
+    SHA512 EEB15D0756F12136A1E7938A0EED97024D564EEF3355F3BB6ABF6C681E38919011E1A133D89CA360F463E7FED5FEB8E0138A0FE9BE4C25B6A13BA4B042AEF3EB
     HEAD_REF master
     PATCHES
         fix-build.patch
diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json
index eba2acd9f8..6e482076c1 100644
--- a/ports/openmvs/vcpkg.json
+++ b/ports/openmvs/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openmvs",
-  "version-string": "1.1",
-  "port-version": 6,
+  "version": "1.1.1",
   "description": "OpenMVS: open Multi-View Stereo reconstruction library",
   "homepage": "https://cdcseacave.github.io/openMVS",
   "dependencies": [
@@ -40,13 +39,13 @@
   ],
   "features": {
     "cuda": {
-      "description": "cuda support for openmvs",
+      "description": "CUDA support for openmvs",
       "dependencies": [
         "cuda"
       ]
     },
     "openmp": {
-      "description": "openmp support for openmvs"
+      "description": "OpenMP support for openmvs"
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 66421ba22e..71bfa3e3c2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4861,8 +4861,8 @@
       "port-version": 3
     },
     "openmvs": {
-      "baseline": "1.1",
-      "port-version": 6
+      "baseline": "1.1.1",
+      "port-version": 0
     },
     "openni2": {
       "baseline": "2.2.0.33",
diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json
index e81c7e82eb..2c4ba8b5f4 100644
--- a/versions/o-/openmvs.json
+++ b/versions/o-/openmvs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cda3b971b05a5519ef36759d8f3f49045fa6445e",
+      "version": "1.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "b1c5c58b15affc0db0e179229c4640341d62a4d7",
       "version-string": "1.1",