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

ports/gtk/0002-windows-build.patch

@@ -0,0 +1,11 @@
+diff -ru /gdk/win32/gdkinput-winpointer.c b/gdk/win32/gdkinput-winpointer.c
+--- a/gdk/win32/gdkinput-winpointer.c
++++ b/gdk/win32/gdkinput-winpointer.c
+@@ -18,6 +18,7 @@
+ #include "config.h"
+
+ #include <gdk/gdk.h>
++#include "gdk-private.h"
+ #include "gdkwin32.h"
+ #include "gdkprivate-win32.h"
+ #include "gdkdevicemanager-win32.h"

ports/gtk/0003-vs2022-rc.patch

@@ -0,0 +1,22 @@
+diff -ru a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in
+--- a/gtk/gtk-win32.rc.body.in
++++ b/gtk/gtk-win32.rc.body.in
+@@ -1,5 +1,4 @@
+-#include <winuser.h>
+-#include <winver.h>
++#include <windows.h>
+
+ GTK_ICON               ICON                    "gtk.ico"
+
+diff -ru a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py
+--- a/tools/generate-uac-manifest.py
++++ b/tools/generate-uac-manifest.py
+@@ -92,7 +92,7 @@
+
+     if resource is None:
+         outfile = open(output_file_base_name + '.rc', 'w+')
+-        outfile.write('#include <winuser.h>')
++        outfile.write('#include <windows.h>')
+     else:
+         if resource != output_file_base_name + '.rc':
+             outfile = open(output_file_base_name + '.rc', 'w+')

ports/gtk/0004-macos-build.patch

@@ -0,0 +1,12 @@
+diff -u a/gdk/macos/gdkmacoseventsource-private.h b/gdk/macos/gdkmacoseventsource-private.h
+--- a/gdk/macos/gdkmacoseventsource-private.h
++++ b/gdk/macos/gdkmacoseventsource-private.h
+@@ -24,6 +24,8 @@
+
+ #include "gdkmacosdisplay.h"
+
++#include "gdk-private.h"
++
+ G_BEGIN_DECLS
+
+ typedef enum

ports/gtk/0005-xdamage-optional.patch

@@ -0,0 +1,25 @@
+diff -u a/meson.build b/meson.build
+--- a/meson.build
++++ b/meson.build
+@@ -498,14 +498,18 @@
+   xi_dep         = dependency('xi')
+   xext_dep       = dependency('xext')
+   xcursor_dep    = dependency('xcursor')
+-  xdamage_dep    = dependency('xdamage')
++  xdamage_dep    = dependency('xdamage', required: false)
+   xfixes_dep     = dependency('xfixes')
+   fontconfig_dep = dependency('fontconfig')
+
+-  x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr', 'xcursor', 'xdamage', 'xfixes', 'xinerama']
++  x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr', 'xcursor', 'xfixes', 'xinerama']
++
++  if xdamage_dep.found()
++    x11_pkgs += ['xdamage']
++  endif
+
+   cdata.set('HAVE_XCURSOR', 1)
+-  cdata.set('HAVE_XDAMAGE', 1)
++  cdata.set('HAVE_XDAMAGE', xdamage_dep.found())
+   cdata.set('HAVE_XFIXES', 1)
+
+   if not cc.has_function('XkbQueryExtension', dependencies: x11_dep,

ports/gtk/portfile.cmake

@@ -1,14 +1,19 @@
 
-set(GTK_VERSION 4.3.0)
+set(GTK_VERSION 4.4.0)
 
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/gtk
-    REF  40ebed3a03aef096addc0af09fec4ec529d882a0 #v4.3.0
-    SHA512 6f68e1e2f18a4bf0299f0563ccf091cbee3a1dc1db0819565216d50f98f3f3ad4904eef746357d9bc2fdac8a5e29c5cbed5d4df5dd0f89bb941f7438ae3cd096
+    REF  f1f197e3b94a55d5cbfaae2498f991a0ae733b32 #v4.4.0
+    SHA512 80ffc2c2a2baae4a4097470a41d0b10d5df9086e60daa520aad845fe571e03486c4f87e295ae4f05aa0069df80fe40ad7655de4f9aecc21c2482bbe0b2b6e2fb
     HEAD_REF master # branch name
-    PATCHES build.patch
+    PATCHES
+        0001-build.patch
+        0002-windows-build.patch
+        0003-vs2022-rc.patch
+        0004-macos-build.patch
+        0005-xdamage-optional.patch
 ) 
 
 vcpkg_find_acquire_program(PKGCONFIG)

ports/gtk/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "gtk",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "dependencies": [

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,30 @@
         }
       ]
     },
+    "gstreamer": {
+      "description": "gstreamer support for opencv",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false,
+          "features": [
+            "gstreamer"
+          ]
+        }
+      ]
+    },
+    "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")
@@ -43,32 +42,33 @@ 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
- "dnn"      BUILD_opencv_dnn
- "eigen"    WITH_EIGEN
- "ffmpeg"   WITH_FFMPEG
- "flann"    BUILD_opencv_flann
- "gdcm"     WITH_GDCM
- "halide"   WITH_HALIDE
- "jasper"   WITH_JASPER
- "jpeg"     WITH_JPEG
- "lapack"   WITH_LAPACK
- "nonfree"  OPENCV_ENABLE_NONFREE
- "openexr"  WITH_OPENEXR
- "opengl"   WITH_OPENGL
- "png"      WITH_PNG
- "qt"       WITH_QT
- "quirc"    WITH_QUIRC
- "sfm"      BUILD_opencv_sfm
- "tiff"     WITH_TIFF
- "vtk"      WITH_VTK
- "webp"     WITH_WEBP
- "world"    BUILD_opencv_world
+ "contrib"   WITH_CONTRIB
+ "cuda"      WITH_CUBLAS
+ "cuda"      WITH_CUDA
+ "dnn"       BUILD_opencv_dnn
+ "eigen"     WITH_EIGEN
+ "ffmpeg"    WITH_FFMPEG
+ "flann"     BUILD_opencv_flann
+ "gdcm"      WITH_GDCM
+ "gstreamer" WITH_GSTREAMER
+ "halide"    WITH_HALIDE
+ "jasper"    WITH_JASPER
+ "jpeg"      WITH_JPEG
+ "lapack"    WITH_LAPACK
+ "nonfree"   OPENCV_ENABLE_NONFREE
+ "openexr"   WITH_OPENEXR
+ "opengl"    WITH_OPENGL
+ "png"       WITH_PNG
+ "qt"        WITH_QT
+ "quirc"     WITH_QUIRC
+ "sfm"       BUILD_opencv_sfm
+ "tiff"      WITH_TIFF
+ "vtk"       WITH_VTK
+ "webp"      WITH_WEBP
+ "world"     BUILD_opencv_world
 )
 
-# Cannot use vcpkg_check_features() for "dnn", "ipp", ovis", "tbb"
+# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "tbb"
 # As the respective value of their variables can be unset conditionally.
 set(BUILD_opencv_dnn OFF)
 if("dnn" IN_LIST FEATURES)
@@ -79,6 +79,15 @@ if("dnn" IN_LIST FEATURES)
   endif()
 endif()
 
+set(WITH_GTK OFF)
+if("gtk" IN_LIST FEATURES)
+  if(VCPKG_TARGET_IS_LINUX)
+    set(WITH_GTK ON)
+  else()
+    message(WARNING "The gtk module cannot be enabled outside Linux")
+  endif()
+endif()
+
 set(WITH_IPP OFF)
 if("ipp" IN_LIST FEATURES)
   set(WITH_IPP ON)
@@ -118,7 +127,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 +337,7 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON
         -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}
-        -DWITH_GTK=OFF
+        -DWITH_GTK=${WITH_GTK}
         -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,18 @@
         "gdcm"
       ]
     },
+    "gstreamer": {
+      "description": "gstreamer support for opencv",
+      "dependencies": [
+        "gstreamer"
+      ]
+    },
+    "gtk": {
+      "description": "GTK support for opencv",
+      "dependencies": [
+        "gtk"
+      ]
+    },
     "halide": {
       "description": "Halide support for opencv",
       "dependencies": [

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

@@ -2,6 +2,6 @@
 +++ 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)
+ 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,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -803,7 +803,7 @@ if(WITH_OPENVX)
+@@ -810,7 +810,7 @@ if(WITH_OPENVX)
  endif()
 
  if(WITH_QUIRC)
@@ -12,7 +12,7 @@
 --- 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)
+ 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)