[OpenCV] update to v4.5.4 and v3.4.16

ports/opencv/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "opencv",
-  "version": "4.5.3",
+  "version": "4.5.4",
   "description": "Computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
@@ -114,6 +114,18 @@
         }
       ]
     },
+    "gtk": {
+      "description": "GTK support for opencv",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false,
+          "features": [
+            "gtk"
+          ]
+        }
+      ]
+    },
     "halide": {
       "description": "Halide support for opencv",
       "dependencies": [

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.15")
+set(OPENCV_VERSION "3.4.16")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/opencv
     REF ${OPENCV_VERSION}
-    SHA512 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d
+    SHA512 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
     HEAD_REF master
     PATCHES
       0001-disable-downloading.patch
@@ -24,7 +24,6 @@ vcpkg_from_github(
       0008-devendor-quirc.patch
       0009-fix-protobuf.patch
       0010-fix-uwp-tiff-imgcodecs.patch
-      0011-fix-caffe-io.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
@@ -51,6 +50,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "ffmpeg"   WITH_FFMPEG
  "flann"    BUILD_opencv_flann
  "gdcm"     WITH_GDCM
+ "gtk"      WITH_GTK
  "halide"   WITH_HALIDE
  "jasper"   WITH_JASPER
  "jpeg"     WITH_JPEG
@@ -118,7 +118,7 @@ if("contrib" IN_LIST FEATURES)
       OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
       REPO opencv/opencv_contrib
       REF ${OPENCV_VERSION}
-      SHA512 639f5f869d68014fcc5041f5fe890c98635610d8b26c9964721e2fbe74ce8a12aef8f305364ff024fe0086bf2e7252c4fdd00a5de08854fdcd285c0f4916125a
+      SHA512 31bd55617d3a54fa020d4255e463c90caf41e10136c82a05c24ee19890f0cdc4fc049136874841dc84037dedb0562471ea0345ab1dcd5ad8a5b0218f24ae9a35
       HEAD_REF master
       PATCHES
         0007-fix-hdf5.patch
@@ -328,7 +328,6 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON
         -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}
-        -DWITH_GTK=OFF
         -DWITH_IPP=${WITH_IPP}
         -DWITH_MATLAB=OFF
         -DWITH_MSMF=${WITH_MSMF}

ports/opencv3/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "opencv3",
-  "version": "3.4.15",
-  "port-version": 3,
+  "version": "3.4.16",
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
@@ -100,6 +99,12 @@
         "gdcm"
       ]
     },
+    "gtk": {
+      "description": "GTK support for opencv",
+      "dependencies": [
+        "gtk"
+      ]
+    },
     "halide": {
       "description": "Halide support for opencv",
       "dependencies": [

ports/opencv4/0004-fix-policy-CMP0057.patch

@@ -1,7 +1,7 @@
---- a/modules/videoio/CMakeLists.txt
-+++ b/modules/videoio/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+cmake_minimum_required(VERSION 3.3)
- set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer, mfx, msmf or special value 'all')")
- set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building and using of videoio plugins")
- mark_as_advanced(VIDEOIO_PLUGIN_LIST VIDEOIO_ENABLE_PLUGINS)
+--- a/modules/videoio/CMakeLists.txt
++++ b/modules/videoio/CMakeLists.txt
+@@ -1,3 +1,4 @@
++cmake_minimum_required(VERSION 3.3)
+ set(VIDEOIO_ENABLE_PLUGINS_DEFAULT ON)
+ if(EMSCRIPTEN OR IOS OR WINRT)
+   set(VIDEOIO_ENABLE_PLUGINS_DEFAULT OFF)

ports/opencv4/0008-devendor-quirc.patch

@@ -1,22 +1,22 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -803,7 +803,7 @@ if(WITH_OPENVX)
- endif()
-
- if(WITH_QUIRC)
--  add_subdirectory(3rdparty/quirc)
-+  find_package(quirc CONFIG REQUIRED)
-   set(HAVE_QUIRC TRUE)
- endif()
-
---- a/modules/objdetect/CMakeLists.txt
-+++ b/modules/objdetect/CMakeLists.txt
-@@ -2,7 +2,5 @@ set(the_description "Object Detection")
- ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js)
-
- if(HAVE_QUIRC)
--    get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR)
--    ocv_include_directories(${QUIRC_INCLUDE})
--    ocv_target_link_libraries(${the_module} quirc)
-+    ocv_target_link_libraries(${the_module} quirc::quirc)
- endif()
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -810,7 +810,7 @@ if(WITH_OPENVX)
+ endif()
+ 
+ if(WITH_QUIRC)
+-  add_subdirectory(3rdparty/quirc)
++  find_package(quirc CONFIG REQUIRED)
+   set(HAVE_QUIRC TRUE)
+ endif()
+ 
+--- a/modules/objdetect/CMakeLists.txt
++++ b/modules/objdetect/CMakeLists.txt
+@@ -2,7 +2,5 @@ set(the_description "Object Detection")
+ ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d opencv_dnn WRAP java objc python js)
+ 
+ if(HAVE_QUIRC)
+-    get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR)
+-    ocv_include_directories(${QUIRC_INCLUDE})
+-    ocv_target_link_libraries(${the_module} quirc)
++    ocv_target_link_libraries(${the_module} quirc::quirc)
+ endif()

ports/opencv4/portfile.cmake

@@ -6,7 +6,7 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3")
   message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n    vcpkg remove opencv3")
 endif()
 
-set(OPENCV_VERSION "4.5.3")
+set(OPENCV_VERSION "4.5.4")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -24,7 +24,6 @@ vcpkg_from_github(
       0008-devendor-quirc.patch
       0009-fix-protobuf.patch
       0010-fix-uwp-tiff-imgcodecs.patch
-      0011-fix-caffe-io.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
@@ -53,6 +52,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "eigen"    WITH_EIGEN
  "ffmpeg"   WITH_FFMPEG
  "gdcm"     WITH_GDCM
+ "gtk"      WITH_GTK
  "halide"   WITH_HALIDE
  "jasper"   WITH_JASPER
  "jpeg"     WITH_JPEG
@@ -385,7 +385,6 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON
         -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}
-        -DWITH_GTK=OFF
         -DWITH_IPP=${WITH_IPP}
         -DWITH_MATLAB=OFF
         -DWITH_MSMF=${WITH_MSMF}

ports/opencv4/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "opencv4",
-  "version": "4.5.3",
-  "port-version": 3,
+  "version": "4.5.4",
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
@@ -102,6 +101,12 @@
         "gdcm"
       ]
     },
+    "gtk": {
+      "description": "GDCM support for opencv",
+      "dependencies": [
+        "gtk"
+      ]
+    },
     "halide": {
       "description": "Halide support for opencv",
       "dependencies": [

versions/baseline.json

@@ -4809,20 +4809,20 @@
       "port-version": 2
     },
     "opencv": {
-      "baseline": "4.5.3",
+      "baseline": "4.5.4",
       "port-version": 0
     },
     "opencv2": {
       "baseline": "2.4.13.7",
       "port-version": 6
     },
     "opencv3": {
-      "baseline": "3.4.15",
-      "port-version": 3
+      "baseline": "3.4.16",
+      "port-version": 0
     },
     "opencv4": {
-      "baseline": "4.5.3",
-      "port-version": 3
+      "baseline": "4.5.4",
+      "port-version": 0
     },
     "opendnp3": {
       "baseline": "3.1.0",

versions/o-/opencv.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc004ca8177b867e3e7ebba23c9ed66cd7f2fb18",
+      "version": "4.5.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5b13218917e1efe74e37b28a13cfc8cc7572241e",
       "version": "4.5.3",

versions/o-/opencv3.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d203df7d68c5dd4915832eb2f803c755f1ad529d",
+      "version": "3.4.16",
+      "port-version": 0
+    },
     {
       "git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5",
       "version": "3.4.15",

versions/o-/opencv4.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c4ab37c0ccd8fc8cc603c27a8d475f9caf129e19",
+      "version": "4.5.4",
+      "port-version": 0
+    },
     {
       "git-tree": "d48f3aabd1d417854360efb92874f3b533f83966",
       "version": "4.5.3",