From f89336d703bf3ffd2aa4f832f214b42a11c7d044 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Sun, 17 Jan 2021 04:26:38 +0100 Subject: [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (#15089) * [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 * 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 * fix regressions * Update ports/gdcm/CONTROL * use more compact logic syntax * add new versions to baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 ++-- scripts/test_ports/vcpkg-ci-paraview/CONTROL | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/test_ports') diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL index 3456988cf..46e451828 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: 1 +Port-Version: 2 Homepage: https://github.com/microsoft/vcpkg Description: Port to force features of certain ports within CI -Build-Depends: opencv[nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,openexr,opengl,openmp,png,qt,sfm,tiff,vtk] +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))) diff --git a/scripts/test_ports/vcpkg-ci-paraview/CONTROL b/scripts/test_ports/vcpkg-ci-paraview/CONTROL index d4816dbf3..137750842 100644 --- a/scripts/test_ports/vcpkg-ci-paraview/CONTROL +++ b/scripts/test_ports/vcpkg-ci-paraview/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-paraview Version: 1 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/microsoft/vcpkg Description: Port to force features of certain ports within CI -Build-Depends: paraview[vtkm, tools] +Build-Depends: paraview[core,vtkm,tools](!(x86&windows)), paraview[core,tools](x86&windows) -- cgit v1.2.3