[opencv4] update to v4.3 (#11130)

* [opencv4] draft update to v4.3

* restore uwp patch

* fix qt and ipp features

* fix libepoxy and meson on osx

* fix baseline, trigger a full rebuild due to meson tool changes

* remove jpeg feature on windows due to a bug with MSVC

* minor fixes for some features

* ffmpeg x11 lib not required anymore on apple for downstream projects

* small fixes for ogre and qt5

* remove a broken module

* fix installation path

* fix openexr which was broken and regressed opencv downstream projects

* first round of ci passes

* improve compatibility with android toolchain

* [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR

* fix OpenEXR link for downstream projects

* do not install unrequested features

* fix compatibility with newer OpenEXR

* [OpenCV3] update to v3.4.10

* fix openexr on windows, was creating symlinks that broke vcpkg

* fix openexr wrapper

* [openexr] cmake config files are installed into a lowered-case folder

* remove mangled paths trying to fix android setup

* disable dnn on android, fix mangled cmake config paths again

* fix downstream CUDA dependency

* fix compatibility with vs16.6

* remove from baseline ports now passing tests

* [alembic] fixes for new openexr

* fix baseline

* [field3d] fixes for new openexr

* [field3d] improve fixes, windows still unsupported despite what is said upstream

* apply fixes required from review

* add missing field3d patch

* [field3d] disable mpi integration

* [opencv2] remove cublas integration

* [vtk] do not create libharu::libharu target if already existing

* Update ports/opencv4/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/opencv3/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* improve compatibility with newer CUDNN

* [OpenCV3, OpenCV4] improve compatibility with CUDA 11

* [OpenCV2] improve compatibility with CUDA 11

* [field3d] regenerate patch ignoring space at eol

* [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999)

* [field3d] regenerate patch ignoring space at eol

* [field3d] regenerate patch, again

* [field3d] fixes for windows

* [libass] fix regression

* ci.baseline.txt update

* [CUDA11] use FindCUDA from CMake 3.18 to ease transition later

* re-bump vtk and ffmpeg, which were lost with merges from master

* [OpenCV4] Halide feature is not broken anymore

* [field3d] regenerate hdf5 patch

* [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems...

* merge ci.baseline.txt from master and fix field3d patch

* remove rebuilding

* restore vtk CONTROL file

* update CONTROL files

* Trigger rebuild

* Update ports/freeimage/CONTROL

* Update ports/freeimage/CONTROL

* [opencv3/4] avoid tesseract dependency on uwp builds

* [opencv] add missing module search

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL
index daf330e83..93d1aede7 100644
--- a/ports/libepoxy/CONTROL
+++ b/ports/libepoxy/CONTROL
@@ -1,5 +1,6 @@
 Source: libepoxy
 Version: 1.5.4
+Port-Version: 1
 Homepage: https://github.com/anholt/libepoxy
 Description: Epoxy is a library for handling OpenGL function pointer management for you
 Build-Depends: tool-meson
diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake
index 69482f9c2..caaa02ab2 100644
--- a/ports/libepoxy/portfile.cmake
+++ b/ports/libepoxy/portfile.cmake
@@ -11,8 +11,7 @@ vcpkg_from_github(
         libepoxy-1.5.4_Add_call_convention_to_mock_function.patch
 )
 
-
-if (VCPKG_TARGET_IS_WINDOWS)
+if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
     vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
         OPTIONS
             -Denable-glx=no
@@ -24,7 +23,7 @@ else()
     if (NOT autoreconf OR NOT EXISTS "/usr/share/doc/libgles2/copyright")
         message(FATAL_ERROR "autoreconf and libgles2-mesa-dev must be installed before libepoxy can build. Install them with \"apt-get install dh-autoreconf libgles2-mesa-dev\".")
     endif()
-    
+
     find_program(MAKE make)
     if (NOT MAKE)
         message(FATAL_ERROR "MAKE not found")
@@ -32,34 +31,34 @@ else()
 
     file(REMOVE_RECURSE ${SOURCE_PATH}/m4)
     file(MAKE_DIRECTORY ${SOURCE_PATH}/m4)
-    
+
     set(LIBEPOXY_CONFIG_ARGS "--enable-x11=yes --enable-glx=yes --enable-egl=yes")
-    
+
     vcpkg_execute_required_process(
         COMMAND "autoreconf" -v --install
         WORKING_DIRECTORY ${SOURCE_PATH}
         LOGNAME autoreconf-${TARGET_TRIPLET}
     )
-    
+
     message(STATUS "Configuring ${TARGET_TRIPLET}")
     set(OUT_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/make-build-${TARGET_TRIPLET}-release)
-    
+
     file(REMOVE_RECURSE ${OUT_PATH_RELEASE})
     file(MAKE_DIRECTORY ${OUT_PATH_RELEASE})
-    
+
     vcpkg_execute_required_process(
         COMMAND "./configure" --prefix=${OUT_PATH_RELEASE} "${LIBEPOXY_CONFIG_ARGS}"
         WORKING_DIRECTORY ${SOURCE_PATH}
         LOGNAME config-${TARGET_TRIPLET}
     )
-    
+
     message(STATUS "Building ${TARGET_TRIPLET}")
     vcpkg_execute_required_process(
         COMMAND make
         WORKING_DIRECTORY ${SOURCE_PATH}
         LOGNAME build-${TARGET_TRIPLET}-release
     )
-    
+
     message(STATUS "Installing ${TARGET_TRIPLET}")
     vcpkg_execute_required_process(
         COMMAND make install