[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, 24 insertions, 11 deletions

diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt
index 32d7ef097..7345e515f 100644
--- a/ports/libass/CMakeLists.txt
+++ b/ports/libass/CMakeLists.txt
@@ -7,18 +7,30 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)
 

 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

 

-# This is Windows-specific. Other acceptable values on different platforms should be

-#    macOS - CONFIG_CORETEXT

-#    linux - CONFIG_FONTCONFIG

-add_compile_definitions(CONFIG_DIRECTWRITE)

+if(WIN32)

+  add_compile_definitions(CONFIG_DIRECTWRITE)

+elseif(APPLE)

+  add_compile_definitions(CONFIG_CORETEXT)

+else()

+  add_compile_definitions(CONFIG_FONTCONFIG)

+endif()

+

 add_compile_definitions(CONFIG_FREETYPE)

 add_compile_definitions(CONFIG_FRIBIDI)

 add_compile_definitions(CONFIG_HARFBUZZ)

 

 file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)

 

-list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")

-list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")

+if(WIN32)

+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")

+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")

+elseif(APPLE)

+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")

+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")

+else()

+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")

+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")

+endif()

 

 find_package(Freetype REQUIRED)

 

@@ -35,13 +47,13 @@ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
 

 add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def)

 

-target_include_directories(ass PRIVATE 

-  ${FRIBIDI_INCLUDE_DIR} 

+target_include_directories(ass PRIVATE

+  ${FRIBIDI_INCLUDE_DIR}

   ${HARFBUZZ_INCLUDE_DIR})

 

-target_link_libraries(ass PRIVATE 

-  Freetype::Freetype 

-  ${FRIBIDI_LIBRARY} 

+target_link_libraries(ass PRIVATE

+  Freetype::Freetype

+  ${FRIBIDI_LIBRARY}

   ${HARFBUZZ_LIBRARY})

 

 install(TARGETS ass

diff --git a/ports/libass/CONTROL b/ports/libass/CONTROL
index ea25ea9a1..3c11a9e9c 100644
--- a/ports/libass/CONTROL
+++ b/ports/libass/CONTROL
@@ -1,4 +1,5 @@
 Source: libass
 Version: 0.14.0
+Port-Version: 1
 Build-Depends: freetype, fribidi, harfbuzz, dirent (windows)
 Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format.