diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-08-13 22:57:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 13:57:28 -0700 |
| commit | 801f40c6883e40792ed4dc13547dcd9c4c2e2701 (patch) | |
| tree | c4d07b3833fa000208d2d0cf86284182f5cddb84 /versions | |
| parent | bdc8687f7cd7e107d2192dc1a60504c84f57c395 (diff) | |
| download | vcpkg-801f40c6883e40792ed4dc13547dcd9c4c2e2701.tar.gz vcpkg-801f40c6883e40792ed4dc13547dcd9c4c2e2701.zip | |
[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 <lirui09@beyondsoft.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 14 | ||||
| -rw-r--r-- | versions/l-/libiconv.json | 5 | ||||
| -rw-r--r-- | versions/l-/libxml2.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv3.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv4.json | 5 |
6 files changed, 32 insertions, 7 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 48e9a0a69..94f34acba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3290,7 +3290,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 9 + "port-version": 10 }, "libics": { "baseline": "1.6.4", @@ -3786,7 +3786,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 2 + "port-version": 3 }, "libxmlmm": { "baseline": "0.6.0", @@ -4617,7 +4617,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.2", + "baseline": "4.5.3", "port-version": 0 }, "opencv2": { @@ -4625,12 +4625,12 @@ "port-version": 6 }, "opencv3": { - "baseline": "3.4.14", - "port-version": 2 + "baseline": "3.4.15", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.2", - "port-version": 1 + "baseline": "4.5.3", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 8569e1f65..63631614f 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "59948ca7f6b4427c2ea93be7a1558843cdd8cde3", + "version-string": "1.16", + "port-version": 10 + }, + { "git-tree": "1350957315a151eb58fa91c61c3fa754126135a1", "version-string": "1.16", "port-version": 9 diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index ea8950c96..455ba9477 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "091644d055f6ab14ab96001c90418be9f5c4d6e3", + "version-semver": "2.9.12", + "port-version": 3 + }, + { "git-tree": "f86cd2ab2c75dcd8e97ee18191b343f0b31bfb7c", "version-semver": "2.9.12", "port-version": 2 diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index d12fa045f..c64830062 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5b13218917e1efe74e37b28a13cfc8cc7572241e", + "version": "4.5.3", + "port-version": 0 + }, + { "git-tree": "d3815d0156fdd054436e6abc00d13129cb1bc347", "version": "4.5.2", "port-version": 0 diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 7410ce963..69366e64d 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673", + "version": "3.4.15", + "port-version": 0 + }, + { "git-tree": "c91b306c8fc5cbdffa178a247051d306240c55ad", "version": "3.4.14", "port-version": 2 diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index e3d7ac5a1..befb61c69 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad", + "version": "4.5.3", + "port-version": 0 + }, + { "git-tree": "e659d7d78204aee895e5f222f7cf9beb90df8a31", "version": "4.5.2", "port-version": 1 |