[OpenCV] Update to v4.1.1 (#5169)

* [OpenCV] update to v4

* [OpenCV] update to v4.1

* [OpenCV] merge #6901 and #6812

* [OpenCV] port patches to v4.1

* [OpenCV] fix naming

* [OpenCV] fix regression with static linkage

* [OpenCV] fix linking to optional feature dependencies in static mode

* fix ffmpeg on some architectures

* trigger rebuild of regressions on macOS

* [zxing-cpp] fix opencv 4.1 compat

* [ogre] improve patching for static builds

* [OpenCV] fixes for extra features

* [OpenCV] drastically reduce patchset

* [OpenCV] fix regression on linux

* [OpenCV] fix regression on Windows

* [qt5] depends on qt5-activeqt only on windows

* update to v4.1.1

* [OpenCV] additional fixes for 4.1.1

* [OpenCV] fix Eigen3 feature integration

* [opencv] Fix compilation in UWP

* [opencv] Fix merge conflicts

* [ffmpeg] fix cmake module for osx

* [OpenCV] add pre-caching of optflow cuda package

* [gdcm] properly fix #6863 instead of wrong #6901

* [OpenCV] fix OpenMP feature

* [opencv] Add missing GetModuleHandle() call guard for UWP

* [freeimage] Do not depend on libwebp[all] on UWP

* [opencv] Set app container bit for UWP

* [zxing-cpp] Fail with explicit message in UWP

* [pthreads4w] fix target creation, missing dlls

* [pthreads4w] bump CONTROL

* [opencv,zxing-cpp] Fix OpenCV Video IO module

* [zxing-cpp] Revert unnecessary changes

* [opencv] Feature halide

* Fix regression in UWP

* [ffmpeg] remove unnecessary patch pointing to old OpenCV version

* [opencv] remove versioning from windows dll filenames

* [opencv] Move port to opencv4

* [opencv,opencv4] Make meta-package install OpenCV 4.1

* [opencv3] Rename old port opencv->opencv3

* Add failure messages when another OpenCV is already installed

3 files changed, 42 insertions, 14 deletions

diff --git a/ports/ffmpeg/FindFFMPEG.cmake b/ports/ffmpeg/FindFFMPEG.cmake
index 65ab59e90..b3c187340 100644
--- a/ports/ffmpeg/FindFFMPEG.cmake
+++ b/ports/ffmpeg/FindFFMPEG.cmake
@@ -35,6 +35,8 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
 include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake)
 
+set(FFMPEG_VERSION "4.1")
+
 find_dependency(Threads)
 #list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS Threads::Threads)
 if(UNIX)
@@ -83,7 +85,7 @@ macro(FFMPEG_FIND_GENEX varname shortname headername)
     set(FFMPEG_${varname}_FOUND 1)
     list(APPEND FFMPEG_LIBRARY_DIRS ${FFMPEG_${varname}_LIBRARY_RELEASE_DIR} ${FFMPEG_${varname}_LIBRARY_DEBUG_DIR})
   endif()
-endmacro(FFMPEG_FIND)
+endmacro(FFMPEG_FIND_GENEX)
 
 if(WIN32)
   if(NOT FFMPEG_${varname}_INCLUDE_DIRS)
@@ -92,8 +94,39 @@ if(WIN32)
   if (FFMPEG_stdint_INCLUDE_DIRS)
     set(STDINT_OK TRUE)
   endif()
+  FFMPEG_FIND_GENEX(libzlib zlib       zlib.h)
 else()
   set(STDINT_OK TRUE)
+  FFMPEG_FIND_GENEX(libzlib z          zlib.h)
+endif()
+
+if(APPLE)
+  find_library(VT_UNIT VideoToolbox)
+  if (NOT VT_UNIT)
+      message(FATAL_ERROR "VideoToolbox not found")
+  endif()
+  find_library(AT_UNIT AudioToolbox)
+  if (NOT AT_UNIT)
+      message(FATAL_ERROR "AudioToolbox not found")
+  endif()
+  find_library(SEC_UNIT Security)
+  if (NOT SEC_UNIT)
+      message(FATAL_ERROR "Security not found")
+  endif()
+  find_library(CF_UNIT CoreFoundation)
+  if (NOT CF_UNIT)
+      message(FATAL_ERROR "CoreFoundation not found")
+  endif()
+  find_library(CM_UNIT CoreMedia)
+  if (NOT CM_UNIT)
+      message(FATAL_ERROR "CoreMedia not found")
+  endif()
+  find_library(CV_UNIT CoreVideo)
+  if (NOT CV_UNIT)
+      message(FATAL_ERROR "CoreVideo not found")
+  endif()
+  find_package(Iconv QUIET)
+  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${VT_UNIT} ${AT_UNIT} ${SEC_UNIT} ${CF_UNIT} ${CM_UNIT} ${CV_UNIT} ${Iconv_LIBRARIES})
 endif()
 
 FFMPEG_FIND(libavcodec    avcodec    avcodec.h)
@@ -103,13 +136,20 @@ FFMPEG_FIND(libavformat   avformat   avformat.h)
 FFMPEG_FIND(libavutil     avutil     avutil.h)
 FFMPEG_FIND(libswresample swresample swresample.h)
 FFMPEG_FIND(libswscale    swscale    swscale.h)
-FFMPEG_FIND_GENEX(libzlib zlib       zlib.h)
 
 if (FFMPEG_libavcodec_FOUND AND FFMPEG_libavdevice_FOUND AND FFMPEG_libavfilter_FOUND AND FFMPEG_libavformat_FOUND AND FFMPEG_libavutil_FOUND AND FFMPEG_libswresample_FOUND AND FFMPEG_libswscale_FOUND AND FFMPEG_libzlib_FOUND AND STDINT_OK)
   list(APPEND FFMPEG_INCLUDE_DIRS ${FFMPEG_libavformat_INCLUDE_DIRS} ${FFMPEG_libavdevice_INCLUDE_DIRS} ${FFMPEG_libavcodec_INCLUDE_DIRS} ${FFMPEG_libavutil_INCLUDE_DIRS} ${FFMPEG_libswscale_INCLUDE_DIRS} ${FFMPEG_stdint_INCLUDE_DIRS})
   list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
   list(REMOVE_DUPLICATES FFMPEG_LIBRARY_DIRS)
 
+  set(FFMPEG_libavformat_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+  set(FFMPEG_libavdevice_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+  set(FFMPEG_libavcodec_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+  set(FFMPEG_libavutil_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+  set(FFMPEG_libswscale_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+  set(FFMPEG_libavfilter_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+  set(FFMPEG_libswresample_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+
   list(APPEND FFMPEG_LIBRARIES
     ${FFMPEG_libavformat_LIBRARY}
     ${FFMPEG_libavdevice_LIBRARY}
diff --git a/ports/ffmpeg/configure_opencv.patch b/ports/ffmpeg/configure_opencv.patch
deleted file mode 100644
index ac5c82797..000000000
--- a/ports/ffmpeg/configure_opencv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure

-+++ b/configure

-@@ -6110,7 +6110,7 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec

- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb

- enabled libopencv         && { check_headers opencv2/core/core_c.h &&

-                                { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||

--                                 require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||

-+                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core341 -lopencv_imgproc341; } ||

-                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }

- enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion

- enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||

diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 7309bd544..ea69db42f 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -12,7 +12,6 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         create-lib-libraries.patch
         detect-openssl.patch
-        configure_opencv.patch
         fix_windowsinclude-in-ffmpegexe-1.patch
         fix_windowsinclude-in-ffmpegexe-2.patch
         fix_libvpx_windows_linking.patch