From 450de5f3c61e072323d5ed705909782ea70ed5ea Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 22 Jan 2021 21:13:33 +0100 Subject: [OpenCV] update to v4.5 and to v3.4.12 (#15162) * [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * [OpenCV] update to v4.5, draft * Restore CI tests on arm architectures, they will have to work! * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * update patches * restore ci tests for all opencv4 configs * add port versions to baseline * [OpenCV contrib] fix glog integration * [OpenCV4] fix target processor detection * update version refs * [OpenCV3] fix target processor detection * fix also ocv3 * remove vtk feature from opencv-ci testing * remove qt5-tools from baseline, it works locally Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- scripts/ci.baseline.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4d376c7b..a44f6881e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -366,7 +366,7 @@ gdal:x64-windows-static-md=fail geos:arm-uwp=fail geos:x64-uwp=fail -# Port geotrans source ftp://ftp.nga.mil server +# Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download geotrans:x64-linux = skip geotrans:x64-windows = skip @@ -893,9 +893,9 @@ memorymodule:arm-uwp=fail memorymodule:x64-linux=fail memorymodule:x64-osx=fail memorymodule:x64-uwp=fail -# Due to static crt. +# Due to static crt. mesa:x64-windows-static=fail -# Missing dependent libraries. +# Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail meschach:arm-uwp=fail @@ -1136,8 +1136,6 @@ opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md=skip opencv3:x86-windows = skip -opencv4:arm64-windows = fail -opencv4:arm-uwp = fail opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail openexr:arm64-windows=fail @@ -1802,7 +1800,6 @@ open62541:x64-windows-static-md=fail pngpp:x64-windows-static-md=fail portmidi:x64-windows-static-md=fail pthreads:x64-windows-static-md=fail -qt5-tools:x64-windows-static-md=fail quantlib:x64-windows-static-md=fail readosm:x64-windows-static-md=fail sentencepiece:x64-windows-static-md=fail -- cgit v1.2.3