[OpenCV] update to v4.5.3 and to v3.4.15 (#18827)

* [OpenCV] update to v4.5.3 and to v3.4.15

* [OpenCV] update refs

* [libxml2] add missing find_dependency(Iconv)
[libiconv] update cmake wrapper

* [libiconv] fix hints

* [opencv4] do not require cudnn if cuda enabled

* [opencv] update refs

* [OpenCV] increase CI coverage even more

* [vcpkg-ci-opencv] trying to restore x64-uwp ci tests

* restore previous patches to avoid unnecessary modifications

* [OpenCV] fix refs

* [OpenCV] fix CMake Warning related to protobuf dependency

* [OpenCV] fix refs

* [libxml2] fix references

* [libxml2] restore previous cmake wrapper, new one is broken

* [libxml2] fix references

* bump versions

* update refs

* [libxml2] Update the format for vcpkg-cmake-wrapper.cmake

* Update versions/l-/libxml2.json

* [libxml2] update port version

* [libxml2] update refs

* [OpenCV] fix refs

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>

4 files changed, 10 insertions, 11 deletions

diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch
index 665ec01e6..481f17651 100644
--- a/ports/opencv3/0002-install-options.patch
+++ b/ports/opencv3/0002-install-options.patch
@@ -12,17 +12,17 @@ index f6a2da5..10aa531 100644
  endif()
  
 diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 3cb10a1..fc81377 100644
+index 303d4f4..b727937 100644
 --- a/cmake/OpenCVCompilerOptions.cmake
 +++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -276,7 +276,6 @@ if(MSVC)
+@@ -284,7 +284,6 @@ if(MSVC)
    #endif()
  
    if(BUILD_WITH_DEBUG_INFO)
 -    set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
      set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
      set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
-   endif()
+     set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
 diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
 index c7f9fc2..a1f657b 100644
 --- a/cmake/OpenCVGenConfig.cmake
diff --git a/ports/opencv3/0006-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch
index 013c8adeb..13048d030 100644
--- a/ports/opencv3/0006-fix-uwp.patch
+++ b/ports/opencv3/0006-fix-uwp.patch
@@ -1,8 +1,8 @@
 diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index bcbca83..872f05f 100644
+index 5501b99..578b00e 100644
 --- a/cmake/OpenCVModule.cmake
 +++ b/cmake/OpenCVModule.cmake
-@@ -1186,7 +1186,7 @@ function(ocv_add_perf_tests)
+@@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests)
          set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
        endif()
  
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index 741570731..618f2f170 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -6,13 +6,13 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4")
   message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n    vcpkg remove opencv4")
 endif()
 
-set(OPENCV_VERSION "3.4.14")
+set(OPENCV_VERSION "3.4.15")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/opencv
     REF ${OPENCV_VERSION}
-    SHA512 b8373ead40549e3d487227947c6bd00f6eba368e48bb9356d41cb0f3bfabfb0b10b6e64712febc11ab1e5a1901b1db8b83b63ba492f4e3816c15fa7ddaaf7e69
+    SHA512 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d
     HEAD_REF master
     PATCHES
       0001-disable-downloading.patch
@@ -116,7 +116,7 @@ if("contrib" IN_LIST FEATURES)
       OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
       REPO opencv/opencv_contrib
       REF ${OPENCV_VERSION}
-      SHA512 30f4f25e40908a9d823304197c475dc0f1ae2b24ec5b1ce0484b39959b88897d1291b5b0e12530db24af96d664e90137582e4b03e4dca7fde1319044bdec9b77
+      SHA512 639f5f869d68014fcc5041f5fe890c98635610d8b26c9964721e2fbe74ce8a12aef8f305364ff024fe0086bf2e7252c4fdd00a5de08854fdcd285c0f4916125a
       HEAD_REF master
       PATCHES
         0007-fix-hdf5.patch
@@ -351,7 +351,7 @@ vcpkg_copy_pdbs()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES)
   set(DEPS_STRING "include(CMakeFindDependencyMacro)
-find_dependency(protobuf CONFIG)
+find_dependency(Protobuf CONFIG)
 if(protobuf_FOUND)
   if(TARGET protobuf::libprotobuf)
     add_library (libprotobuf INTERFACE IMPORTED)
diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
index 5bf690492..6c88ac069 100644
--- a/ports/opencv3/vcpkg.json
+++ b/ports/opencv3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "opencv3",
-  "version": "3.4.14",
-  "port-version": 2,
+  "version": "3.4.15",
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [