diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-17 04:26:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 19:26:38 -0800 |
| commit | f89336d703bf3ffd2aa4f832f214b42a11c7d044 (patch) | |
| tree | 891f90e6a3e714c4af552984425a2987cfe0d352 /scripts/test_ports | |
| parent | 31eda3e931f30a480d90eac5f5ffa9fa9944121d (diff) | |
| download | vcpkg-f89336d703bf3ffd2aa4f832f214b42a11c7d044.tar.gz vcpkg-f89336d703bf3ffd2aa4f832f214b42a11c7d044.zip | |
[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>
Diffstat (limited to 'scripts/test_ports')
| -rw-r--r-- | scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 | ||||
| -rw-r--r-- | scripts/test_ports/vcpkg-ci-paraview/CONTROL | 4 |
2 files changed, 4 insertions, 4 deletions
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)
|