From 801f40c6883e40792ed4dc13547dcd9c4c2e2701 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 13 Aug 2021 22:57:28 +0200 Subject: [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 --- scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL index 46e451828..bdf5f4251 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] -- cgit v1.2.3