[OpenCV] update to 4.5.2 (#18572)

* [OpenCV] update to 4.5.2

* update version refs

* [OpenCV4] fix qt integration

* fix refs

6 files changed, 28 insertions, 27 deletions

diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch
index 431e02bf6..665ec01e6 100644
--- a/ports/opencv3/0002-install-options.patch
+++ b/ports/opencv3/0002-install-options.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcb4a1d..5810b0c 100644
+index f6a2da5..10aa531 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -607,7 +607,7 @@ endif()
@@ -12,10 +12,10 @@ index fcb4a1d..5810b0c 100644
  endif()
  
 diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 8a3dcdb..b8b3bae 100644
+index 3cb10a1..fc81377 100644
 --- a/cmake/OpenCVCompilerOptions.cmake
 +++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -262,7 +262,6 @@ if(MSVC)
+@@ -276,7 +276,6 @@ if(MSVC)
    #endif()
  
    if(BUILD_WITH_DEBUG_INFO)
diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch
index e45ced441..097e8abf8 100644
--- a/ports/opencv3/0003-force-package-requirements.patch
+++ b/ports/opencv3/0003-force-package-requirements.patch
@@ -1,17 +1,17 @@
 diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
-index f99bb33..5407f70 100644
+index 2d28dff..6dbeca9 100644
 --- a/cmake/OpenCVFindLibsGrfmt.cmake
 +++ b/cmake/OpenCVFindLibsGrfmt.cmake
-@@ -7,7 +7,7 @@ if(BUILD_ZLIB)
-   ocv_clear_vars(ZLIB_FOUND)
- else()
-   ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+@@ -11,7 +11,7 @@ else()
+     set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+     set(CMAKE_FIND_LIBRARY_SUFFIXES .so)
+   endif()
 -  find_package(ZLIB "${MIN_VER_ZLIB}")
 +  find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
-   if(ZLIB_FOUND AND ANDROID)
-     if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$")
-       set(ZLIB_LIBRARIES z)
-@@ -33,7 +33,7 @@ if(WITH_JPEG)
+   if(ANDROID)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+     unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+@@ -41,7 +41,7 @@ if(WITH_JPEG)
      ocv_clear_vars(JPEG_FOUND)
    else()
      ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR)
@@ -20,7 +20,7 @@ index f99bb33..5407f70 100644
    endif()
  
    if(NOT JPEG_FOUND)
-@@ -79,7 +79,7 @@ if(WITH_TIFF)
+@@ -87,7 +87,7 @@ if(WITH_TIFF)
      ocv_clear_vars(TIFF_FOUND)
    else()
      ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR)
@@ -29,7 +29,7 @@ index f99bb33..5407f70 100644
      if(TIFF_FOUND)
        ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
      endif()
-@@ -123,7 +123,7 @@ if(WITH_WEBP)
+@@ -131,7 +131,7 @@ if(WITH_WEBP)
      ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
    else()
      ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
@@ -38,7 +38,7 @@ index f99bb33..5407f70 100644
      if(WEBP_FOUND)
        set(HAVE_WEBP 1)
      endif()
-@@ -164,7 +164,7 @@ if(WITH_JASPER)
+@@ -172,7 +172,7 @@ if(WITH_JASPER)
    if(BUILD_JASPER)
      ocv_clear_vars(JASPER_FOUND)
    else()
@@ -47,7 +47,7 @@ index f99bb33..5407f70 100644
    endif()
  
    if(NOT JASPER_FOUND)
-@@ -189,7 +189,7 @@ if(WITH_PNG)
+@@ -197,7 +197,7 @@ if(WITH_PNG)
      ocv_clear_vars(PNG_FOUND)
    else()
      ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR)
@@ -56,7 +56,7 @@ index f99bb33..5407f70 100644
      if(PNG_FOUND)
        include(CheckIncludeFile)
        check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
-@@ -221,7 +221,7 @@ if(WITH_OPENEXR)
+@@ -229,7 +229,7 @@ if(WITH_OPENEXR)
    ocv_clear_vars(HAVE_OPENEXR)
    if(NOT BUILD_OPENEXR)
      ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
@@ -65,7 +65,7 @@ index f99bb33..5407f70 100644
    endif()
  
    if(OPENEXR_FOUND)
-@@ -239,7 +239,7 @@ endif()
+@@ -247,7 +247,7 @@ endif()
  
  # --- GDAL (optional) ---
  if(WITH_GDAL)
@@ -74,7 +74,7 @@ index f99bb33..5407f70 100644
  
      if(NOT GDAL_FOUND)
          set(HAVE_GDAL NO)
-@@ -251,7 +251,7 @@ if(WITH_GDAL)
+@@ -259,7 +259,7 @@ if(WITH_GDAL)
  endif()
  
  if(WITH_GDCM)
diff --git a/ports/opencv3/0006-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch
index 551372950..013c8adeb 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 efb6ca8..8ca8609 100644
+index bcbca83..872f05f 100644
 --- a/cmake/OpenCVModule.cmake
 +++ b/cmake/OpenCVModule.cmake
-@@ -1184,7 +1184,7 @@ function(ocv_add_perf_tests)
+@@ -1186,7 +1186,7 @@ function(ocv_add_perf_tests)
          set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
        endif()
  
diff --git a/ports/opencv3/0008-devendor-quirc.patch b/ports/opencv3/0008-devendor-quirc.patch
index b77b1780e..1dc11ffd7 100644
--- a/ports/opencv3/0008-devendor-quirc.patch
+++ b/ports/opencv3/0008-devendor-quirc.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5810b0c..04315e3 100644
+index 10aa531..74e5ca4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -771,7 +771,7 @@ if(WITH_OPENVX)
+@@ -778,7 +778,7 @@ if(WITH_OPENVX)
  endif()
  
  if(WITH_QUIRC)
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index 8b62f7ddc..4d93c4f1a 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.13")
+set(OPENCV_VERSION "3.4.14")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/opencv
     REF ${OPENCV_VERSION}
-    SHA512 ec87b10534b9187c5ac2eea498c05c73bceab08afaed93b5a117ed34d1eeeb0ffc45901642bebf8f55126fd49ec78d731fc61debe6b40d8642f1323b5dbbeacf
+    SHA512 b8373ead40549e3d487227947c6bd00f6eba368e48bb9356d41cb0f3bfabfb0b10b6e64712febc11ab1e5a1901b1db8b83b63ba492f4e3816c15fa7ddaaf7e69
     HEAD_REF master
     PATCHES
       0001-disable-downloading.patch
@@ -39,6 +39,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ FEATURES
  "contrib"  WITH_CONTRIB
  "cuda"     WITH_CUBLAS
  "cuda"     WITH_CUDA
@@ -114,7 +115,7 @@ if("contrib" IN_LIST FEATURES)
       OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
       REPO opencv/opencv_contrib
       REF ${OPENCV_VERSION}
-      SHA512 49f0aed8e07a443f354859a16c8de5ceae26560f141721ae4beb0d5fcc5b24b755ee313519e159b1a5b6ba125dcca8584f2a515e0ac96a8c9c36bb11ac6b3375
+      SHA512 30f4f25e40908a9d823304197c475dc0f1ae2b24ec5b1ce0484b39959b88897d1291b5b0e12530db24af96d664e90137582e4b03e4dca7fde1319044bdec9b77
       HEAD_REF master
       PATCHES
         0007-fix-hdf5.patch
diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
index 42041c4c1..cf7bb1234 100644
--- a/ports/opencv3/vcpkg.json
+++ b/ports/opencv3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "opencv3",
-  "version": "3.4.13",
+  "version": "3.4.14",
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [