diff options
| author | nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> | 2021-07-29 11:47:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 09:47:35 -0700 |
| commit | 5304f826b5736eea0aa4749ce49c84539badaf4a (patch) | |
| tree | 7107a64743a0c1d9b58c31351bfd6da0f18d4497 /versions | |
| parent | 8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb (diff) | |
| download | vcpkg-5304f826b5736eea0aa4749ce49c84539badaf4a.tar.gz vcpkg-5304f826b5736eea0aa4749ce49c84539badaf4a.zip | |
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)
[scripts-audit] vcpkg_copy_tools and friends
* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)
[vcpkg] Fix toolchain compatibility with cmake < 3.15
* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)
[cmake-guidelines] Minor update, for `if()`
* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)
[scripts-audit] vcpkg_check_linkage
* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)
[vcpkg.cmake] Fix variable case.
* [rollup:2021-07-26 6/6] PR #18839
[scripts-audit] z_vcpkg_get_cmake_vars
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 6 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 | ||||
| -rw-r--r-- | versions/v-/vcpkg-cmake.json | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 08d017fad..e441a4e15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1998,7 +1998,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -6569,8 +6569,8 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-06-25", - "port-version": 5 + "baseline": "2021-07-26", + "port-version": 0 }, "vcpkg-cmake-config": { "baseline": "2021-05-22", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0897dd09b..df25f3a82 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2", + "version": "4.4", + "port-version": 12 + }, + { "git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1", "version": "4.4", "port-version": 11 diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index c632ab855..02a8816c1 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ae2178d81ee39baf4c7e9fd6ed3f011b01a93635", + "version-date": "2021-07-26", + "port-version": 0 + }, + { "git-tree": "07c3e68ce9ae8f30bcc0b21def7a528dbb8ecb07", "version-date": "2021-06-25", "port-version": 5 |