diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-08-13 23:46:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 08:46:11 -0700 |
| commit | eb9cb291669f24b315d6001065e3b1e53e3701b4 (patch) | |
| tree | ac6ddb54ffe3799920c8f70b7bcbd01802775136 /versions | |
| parent | 7bdf2f8e853a476f96f3d1ba3be409b65822a29d (diff) | |
| download | vcpkg-eb9cb291669f24b315d6001065e3b1e53e3701b4.tar.gz vcpkg-eb9cb291669f24b315d6001065e3b1e53e3701b4.zip | |
[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature (#19358)
* [ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature
* Update the baseline version
* [opencv3] Update the feature dependency
* Update the baseline
* [opencv2] Update the feature dependency
* Update the baseline version
* Fix uwp build failures
* Update the baseline version
* Fix opencv2 version
* update the baseline version
* update the baseline version
* Un-edit git-tree.
* Update cuda feature
* Update the baseline
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 8 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv2.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv3.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv4.json | 5 |
5 files changed, 24 insertions, 4 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 95076c3d7..dcfb6a377 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2014,7 +2014,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 13 + "port-version": 14 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -4622,15 +4622,15 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 5 + "port-version": 6 }, "opencv3": { "baseline": "3.4.14", - "port-version": 1 + "port-version": 2 }, "opencv4": { "baseline": "4.5.2", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index d8746e3a6..4fb6cbd41 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76", + "version": "4.4", + "port-version": 14 + }, + { "git-tree": "26e3d87d6b3049b45355f36a34402b938d5b486d", "version": "4.4", "port-version": 13 diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 11fd9d437..d983d361d 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e85a45aa17a47da9f965b93cb0c6fc8273a7ca04", + "version": "2.4.13.7", + "port-version": 6 + }, + { "git-tree": "50a5602ecab15fd1c36f0619a5fdbd4792eb1b23", "version-string": "2.4.13.7", "port-version": 5 diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 2294e2eb7..7410ce963 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c91b306c8fc5cbdffa178a247051d306240c55ad", + "version": "3.4.14", + "port-version": 2 + }, + { "git-tree": "850be938a178de206c52be71229048d501bd61e8", "version": "3.4.14", "port-version": 1 diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index fa8a26c85..e3d7ac5a1 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e659d7d78204aee895e5f222f7cf9beb90df8a31", + "version": "4.5.2", + "port-version": 1 + }, + { "git-tree": "ac5c96fd5709b302c81b76814a3ccfd99dcdecdc", "version": "4.5.2", "port-version": 0 |