From 801f40c6883e40792ed4dc13547dcd9c4c2e2701 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 13 Aug 2021 22:57:28 +0200 Subject: [PATCH] [OpenCV] update to v4.5.3 and to v3.4.15 (#18827) * [OpenCV] update to v4.5.3 and to v3.4.15 * [OpenCV] update refs * [libxml2] add missing find_dependency(Iconv) [libiconv] update cmake wrapper * [libiconv] fix hints * [opencv4] do not require cudnn if cuda enabled * [opencv] update refs * [OpenCV] increase CI coverage even more * [vcpkg-ci-opencv] trying to restore x64-uwp ci tests * restore previous patches to avoid unnecessary modifications * [OpenCV] fix refs * [OpenCV] fix CMake Warning related to protobuf dependency * [OpenCV] fix refs * [libxml2] fix references * [libxml2] restore previous cmake wrapper, new one is broken * [libxml2] fix references * bump versions * update refs * [libxml2] Update the format for vcpkg-cmake-wrapper.cmake * Update versions/l-/libxml2.json * [libxml2] update port version * [libxml2] update refs * [OpenCV] fix refs Co-authored-by: NancyLi1013 --- ports/libiconv/CONTROL | 2 +- ports/libiconv/vcpkg-cmake-wrapper.cmake | 14 +++++--- ports/libxml2/vcpkg-cmake-wrapper.cmake | 29 +++++----------- ports/libxml2/vcpkg.json | 2 +- ports/opencv/vcpkg.json | 14 +++++++- ports/opencv3/0002-install-options.patch | 6 ++-- ports/opencv3/0006-fix-uwp.patch | 4 +-- ports/opencv3/portfile.cmake | 8 ++--- ports/opencv3/vcpkg.json | 3 +- ports/opencv4/0002-install-options.patch | 10 +++--- ports/opencv4/0004-fix-policy-CMP0057.patch | 4 +-- ports/opencv4/0006-fix-uwp.patch | 4 +-- ports/opencv4/0008-devendor-quirc.patch | 4 +-- ports/opencv4/0009-fix-qt-integration.patch | 37 --------------------- ports/opencv4/portfile.cmake | 16 ++++----- ports/opencv4/vcpkg.json | 17 ++++++++-- scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 +-- versions/baseline.json | 14 ++++---- versions/l-/libiconv.json | 5 +++ versions/l-/libxml2.json | 5 +++ versions/o-/opencv.json | 5 +++ versions/o-/opencv3.json | 5 +++ versions/o-/opencv4.json | 5 +++ 23 files changed, 110 insertions(+), 107 deletions(-) delete mode 100644 ports/opencv4/0009-fix-qt-integration.patch diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 6eed4fee330808..2e69c031b37ea7 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 9 +Port-Version: 10 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake index db39413da1f899..8e25449ae2d4d5 100644 --- a/ports/libiconv/vcpkg-cmake-wrapper.cmake +++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -2,14 +2,20 @@ include(SelectLibraryConfigurations) _find_package(${ARGS}) if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) - find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib) + find_path(CHARSET_INCLUDE_DIR NAMES "libcharset.h" HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug") + find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") select_library_configurations(CHARSET) + if(NOT TARGET Iconv::Charset) + add_library(Iconv::Charset INTERFACE IMPORTED) + set_target_properties(Iconv::Charset PROPERTIES + INTERFACE_LINK_LIBRARIES "\$<\$>:${CHARSET_LIBRARY_RELEASE}>;\$<\$:${CHARSET_LIBRARY_DEBUG}>" + INTERFACE_INCLUDE_DIRECTORIES "${CHARSET_INCLUDE_DIRS}") + endif() if(CHARSET_LIBRARIES) list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES}) if(TARGET Iconv::Iconv) - target_link_libraries(Iconv::Iconv INTERFACE ${CHARSET_LIBRARIES}) + set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Charset) endif() endif() endif() diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 6209ea464f773e..9287c37e630bce 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -9,21 +9,17 @@ endif() if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG) find_package(LibLZMA) find_package(ZLIB) + find_package(Iconv) include(SelectLibraryConfigurations) find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) - find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib) - find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib) unset(LIBXML2_LIBRARIES) unset(LIBXML2_LIBRARY CACHE) select_library_configurations(LIBXML2) - select_library_configurations(ICONV) - select_library_configurations(CHARSET) list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + if(Iconv_LIBRARIES) + list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) + endif() if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE) set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}") endif() @@ -43,20 +39,11 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 target_link_libraries(LibXml2::LibXml2 INTERFACE "ws2_32") endif() endif() - if(ICONV_LIBRARIES) - list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES}) - if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES}) - endif() - endif() - if(CHARSET_LIBRARIES) - list(APPEND LIBXML2_LIBRARIES ${CHARSET_LIBRARIES}) - if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${CHARSET_LIBRARIES}) - endif() - endif() if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB") + if(TARGET Iconv::Iconv) + target_link_libraries(LibXml2::LibXml2 INTERFACE "Iconv::Iconv") + endif() endif() cmake_policy(POP) endif() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 0483b7f92820bc..228b43572206ce 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.12", - "port-version": 2, + "port-version": 3, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 5327c1ce6ac962..23374c7cc4943a 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.5.2", + "version": "4.5.3", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -54,6 +54,18 @@ } ] }, + "cudnn": { + "description": "cuDNN support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "cudnn" + ] + } + ] + }, "dnn": { "description": "Enable dnn module", "dependencies": [ diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 665ec01e62364b..481f17651e451a 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -12,17 +12,17 @@ index f6a2da5..10aa531 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 3cb10a1..fc81377 100644 +index 303d4f4..b727937 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -276,7 +276,6 @@ if(MSVC) +@@ -284,7 +284,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") - endif() + set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake index c7f9fc2..a1f657b 100644 --- a/cmake/OpenCVGenConfig.cmake diff --git a/ports/opencv3/0006-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch index 013c8adebb2799..13048d030750c3 100644 --- a/ports/opencv3/0006-fix-uwp.patch +++ b/ports/opencv3/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index bcbca83..872f05f 100644 +index 5501b99..578b00e 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1186,7 +1186,7 @@ function(ocv_add_perf_tests) +@@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 741570731c59cb..618f2f17013222 100644 --- a/ports/opencv3/portfile.cmake +++ b/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.14") +set(OPENCV_VERSION "3.4.15") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 b8373ead40549e3d487227947c6bd00f6eba368e48bb9356d41cb0f3bfabfb0b10b6e64712febc11ab1e5a1901b1db8b83b63ba492f4e3816c15fa7ddaaf7e69 + SHA512 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -116,7 +116,7 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 30f4f25e40908a9d823304197c475dc0f1ae2b24ec5b1ce0484b39959b88897d1291b5b0e12530db24af96d664e90137582e4b03e4dca7fde1319044bdec9b77 + SHA512 639f5f869d68014fcc5041f5fe890c98635610d8b26c9964721e2fbe74ce8a12aef8f305364ff024fe0086bf2e7252c4fdd00a5de08854fdcd285c0f4916125a HEAD_REF master PATCHES 0007-fix-hdf5.patch @@ -351,7 +351,7 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(protobuf CONFIG) +find_dependency(Protobuf CONFIG) if(protobuf_FOUND) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 5bf690492155a9..6c88ac069601ee 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv3", - "version": "3.4.14", - "port-version": 2, + "version": "3.4.15", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index ed32c5d31e6c9c..b681c066c1c6fc 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a0c62e..118b318 100644 +index 49abe01..b51bcde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -610,7 +610,7 @@ endif() +@@ -616,7 +616,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,17 +12,17 @@ index 5a0c62e..118b318 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 40a058d..04f50fb 100644 +index 6e56a2e..11034db 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -278,7 +278,6 @@ if(MSVC) +@@ -286,7 +286,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") - endif() + set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake index 838852c..04906b3 100644 --- a/cmake/OpenCVGenConfig.cmake diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index 5ec18320fd3760..bc7b21de56d9e7 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,9 +1,9 @@ diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index 3a79631..b8ac4d5 100644 +index 534fcf0..a02460c 100644 --- 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 videoio plugin support") + set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building and using of videoio plugins") mark_as_advanced(VIDEOIO_PLUGIN_LIST VIDEOIO_ENABLE_PLUGINS) diff --git a/ports/opencv4/0006-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch index 983170e60abcc9..02589858331b12 100644 --- a/ports/opencv4/0006-fix-uwp.patch +++ b/ports/opencv4/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 224953a..3b3a3b2 100644 +index 7c48aad..0d261b0 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1200,7 +1200,7 @@ function(ocv_add_perf_tests) +@@ -1205,7 +1205,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch index ead184c4077906..d5a3f624cace47 100644 --- a/ports/opencv4/0008-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 118b318..b6e661d 100644 +index b51bcde..15edc92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -795,7 +795,7 @@ if(WITH_OPENVX) +@@ -803,7 +803,7 @@ if(WITH_OPENVX) endif() if(WITH_QUIRC) diff --git a/ports/opencv4/0009-fix-qt-integration.patch b/ports/opencv4/0009-fix-qt-integration.patch deleted file mode 100644 index 4496c5f275a9f2..00000000000000 --- a/ports/opencv4/0009-fix-qt-integration.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f479935cda5eb38a4a4a9e909b6f4f82a0c7533d Mon Sep 17 00:00:00 2001 -From: Christoph Rackwitz -Date: Thu, 8 Apr 2021 12:59:06 +0200 -Subject: [PATCH] fix for #19870 - -HAVE_QT and HAVE_WIN32UI can both be true at the same time -if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt ---- - modules/highgui/src/window.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp -index 406871b7e8f8..d2cf1e1e4826 100644 ---- a/modules/highgui/src/window.cpp -+++ b/modules/highgui/src/window.cpp -@@ -93,7 +93,9 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu - break; - - case cv::WND_PROP_VSYNC: -- #if defined (HAVE_WIN32UI) -+ #if defined (HAVE_QT) -+ // nothing -+ #elif defined (HAVE_WIN32UI) - cvSetPropVsync_W32(name, (prop_value != 0)); - #else - // not implemented yet for other toolkits -@@ -191,7 +193,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) - break; - - case cv::WND_PROP_VSYNC: -- #if defined (HAVE_WIN32UI) -+ #if defined (HAVE_QT) -+ return -1; -+ #elif defined (HAVE_WIN32UI) - return cvGetPropVsync_W32(name); - #else - return -1; diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 5e7b0037025a7c..72d389d52e4425 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,13 +6,13 @@ 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.2") +set(OPENCV_VERSION "4.5.3") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec + SHA512 efd2214f29b1eb2e1ae55280f9fc2f64af7c2e91154264c43d0d4186dd5b8f81e86942dff612d08cd9eaa834421457fe765760181160168cd4c52839a0739758 HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -22,7 +22,6 @@ vcpkg_from_github( 0005-fix-eigen.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch - 0009-fix-qt-integration.patch 0010-fix-uwp-tiff-imgcodecs.patch ) @@ -48,6 +47,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "contrib" WITH_CONTRIB "cuda" WITH_CUBLAS "cuda" WITH_CUDA + "cudnn" WITH_CUDNN "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG "gdcm" WITH_GDCM @@ -119,9 +119,9 @@ endif() if("cuda" IN_LIST FEATURES) vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.zip" - FILENAME "opencv-cache/nvidia_optical_flow/a73cd48b18dcc0cc8933b30796074191-edb50da3cf849840d680249aa6dbef248ebce2ca.zip" - SHA512 12d655ac9fcfc6df0186daa62f7185dadd489f0eeea25567d78c2b47a9840dcce2bd03a3e9b3b42f125dbaf3150f52590ea7597dc1dc8acee852dc0aed56651e + URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + FILENAME "opencv-cache/nvidia_optical_flow/a73cd48b18dcc0cc8933b30796074191-edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + SHA512 12d655ac9fcfc6df0186daa62f7185dadd489f0eeea25567d78c2b47a9840dcce2bd03a3e9b3b42f125dbaf3150f52590ea7597dc1dc8acee852dc0aed56651e ) endif() @@ -141,7 +141,7 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b + SHA512 5b48e2aedcf8c64fcfe80fad243c455c1bb9bfd10741c5ba03679ef26b28f61767fec632a9a9828a87a90542488354ebbbe8c65845bf2ae55b15a721c147a30a HEAD_REF master PATCHES 0007-fix-hdf5.patch @@ -411,7 +411,7 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(protobuf CONFIG) +find_dependency(Protobuf CONFIG) if(protobuf_FOUND) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 2e4209af165164..7edc329f4801cc 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.2", - "port-version": 1, + "version": "4.5.3", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -47,7 +46,6 @@ "description": "CUDA support for opencv", "dependencies": [ "cuda", - "cudnn", { "name": "opencv4", "default-features": false, @@ -57,6 +55,19 @@ } ] }, + "cudnn": { + "description": "cuDNN support for opencv", + "dependencies": [ + "cudnn", + { + "name": "opencv4", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, "dnn": { "description": "Enable dnn module", "dependencies": [ diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL index 46e451828aad6e..bdf5f4251f3b2f 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/CONTROL +++ b/scripts/test_ports/vcpkg-ci-opencv/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-opencv Version: 1 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/microsoft/vcpkg Description: Port to force features of certain ports within CI -Build-Depends: opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,lapack,openexr,opengl,openmp,png,qt,sfm,tiff,vtk,webp](!uwp&!(windows&(arm|arm64))), opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,jpeg,png,tiff,webp](uwp|(windows&(arm|arm64))) +Build-Depends: opencv[cuda,cudnn,halide,ovis,tbb](windows&x64&!static&!uwp), opencv[gdcm,ipp,jasper,lapack,openexr,opengl,openmp,qt,sfm,vtk](!uwp&!(windows&(arm|arm64))), opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,jpeg,png,quirc,tiff,webp] diff --git a/versions/baseline.json b/versions/baseline.json index 48e9a0a6961a2c..94f34acba5d7a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3290,7 +3290,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 9 + "port-version": 10 }, "libics": { "baseline": "1.6.4", @@ -3786,7 +3786,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 2 + "port-version": 3 }, "libxmlmm": { "baseline": "0.6.0", @@ -4617,7 +4617,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.2", + "baseline": "4.5.3", "port-version": 0 }, "opencv2": { @@ -4625,12 +4625,12 @@ "port-version": 6 }, "opencv3": { - "baseline": "3.4.14", - "port-version": 2 + "baseline": "3.4.15", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.2", - "port-version": 1 + "baseline": "4.5.3", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 8569e1f65afcfd..63631614f331b5 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59948ca7f6b4427c2ea93be7a1558843cdd8cde3", + "version-string": "1.16", + "port-version": 10 + }, { "git-tree": "1350957315a151eb58fa91c61c3fa754126135a1", "version-string": "1.16", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index ea8950c96acbcf..455ba947736e3c 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "091644d055f6ab14ab96001c90418be9f5c4d6e3", + "version-semver": "2.9.12", + "port-version": 3 + }, { "git-tree": "f86cd2ab2c75dcd8e97ee18191b343f0b31bfb7c", "version-semver": "2.9.12", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index d12fa045f16ccf..c648300620d9ec 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b13218917e1efe74e37b28a13cfc8cc7572241e", + "version": "4.5.3", + "port-version": 0 + }, { "git-tree": "d3815d0156fdd054436e6abc00d13129cb1bc347", "version": "4.5.2", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 7410ce9634142c..69366e64d78559 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673", + "version": "3.4.15", + "port-version": 0 + }, { "git-tree": "c91b306c8fc5cbdffa178a247051d306240c55ad", "version": "3.4.14", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index e3d7ac5a1cf6ec..befb61c69fe7b8 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad", + "version": "4.5.3", + "port-version": 0 + }, { "git-tree": "e659d7d78204aee895e5f222f7cf9beb90df8a31", "version": "4.5.2",