diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-22 21:13:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 12:13:33 -0800 |
| commit | 450de5f3c61e072323d5ed705909782ea70ed5ea (patch) | |
| tree | e9024073aaa973fa389d128527ad74367d56e199 /versions | |
| parent | 42bb41fa2d5f84a6d598e5d44eab168d8f4ae601 (diff) | |
| download | vcpkg-450de5f3c61e072323d5ed705909782ea70ed5ea.tar.gz vcpkg-450de5f3c61e072323d5ed705909782ea70ed5ea.zip | |
[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>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 8 | ||||
| -rw-r--r-- | versions/o-/opencv3.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv4.json | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 58d1198f7..a76263660 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4217,12 +4217,12 @@ "port-version": 5 }, "opencv3": { - "baseline": "3.4.10", - "port-version": 5 + "baseline": "3.4.12", + "port-version": 0 }, "opencv4": { - "baseline": "4.3.0", - "port-version": 5 + "baseline": "4.5.0", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 31859a5aa..33d47557a 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a0dfe03c4db4fb9532b888399deee675750eef61", + "version-string": "3.4.12", + "port-version": 0 + }, + { "git-tree": "a761625dd5d17548aaa9611295ace23ca8bc27fc", "version-string": "3.4.10", "port-version": 5 diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index b326830fb..5a2934e9d 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "cdf704950d37ce677508db67c081f9aeda18b9cd", + "version-string": "4.5.0", + "port-version": 0 + }, + { "git-tree": "f6fbdfab1e9ac01652b51f2251715c2be05a6567", "version-string": "4.3.0", "port-version": 5 |