diff options
| author | Charlie Barto <chbarto@microsoft.com> | 2021-07-08 11:04:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 11:04:14 -0700 |
| commit | 1559315ea69718224345930cbf435e9a24311f2c (patch) | |
| tree | 4a6a13364429a466a87097704e5fd85d6d55425c | |
| parent | 9b96f7fce0904fc3d625991464199c4a88903b86 (diff) | |
| download | vcpkg-1559315ea69718224345930cbf435e9a24311f2c.tar.gz vcpkg-1559315ea69718224345930cbf435e9a24311f2c.zip | |
[ avcpp ] Update version (#18436)
* remove avcpp patch that was accepted upstream.
revert port version
* update versions
| -rw-r--r-- | ports/avcpp/0001-remove-problematic-compound-literal.patch | 14 | ||||
| -rw-r--r-- | ports/avcpp/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/avcpp/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/a-/avcpp.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 4 |
5 files changed, 10 insertions, 21 deletions
diff --git a/ports/avcpp/0001-remove-problematic-compound-literal.patch b/ports/avcpp/0001-remove-problematic-compound-literal.patch deleted file mode 100644 index aa6c58cc2..000000000 --- a/ports/avcpp/0001-remove-problematic-compound-literal.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/avutils.h b/src/avutils.h -index 29c4ae0..3bfaf82 100644 ---- a/src/avutils.h -+++ b/src/avutils.h -@@ -42,7 +42,7 @@ namespace av { - // Basic FFmpeg constants - constexpr auto NoPts = static_cast<int64_t>(AV_NOPTS_VALUE); - constexpr auto TimeBase = static_cast<int>(AV_TIME_BASE); --constexpr auto TimeBaseQ = static_cast<AVRational>(AV_TIME_BASE_Q); -+constexpr auto TimeBaseQ = AVRational{1, AV_TIME_BASE}; - - - template<typename R, typename T> - diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index c472590ee..fcbf37585 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO h4tr3d/avcpp
- REF d1a39cf6e1ccfe78ababe5a65d02d57f1e65bea1
- SHA512 48eb3bdd8729c9f61c53b152f0bb7283b40d2c8f043a1d6bb4fb1fadb0ceebf754822eeb7fa85edcacbca267eea0999dd9e78e378b04984db6dc25f9a6fab7d0
+ REF fa9a1ef70bbf9e9f3963fbaa4540e8aac4ad8daa
+ SHA512 e0821d8e01e0fdb28d58564c87cafa7f9349b1b31dc90d4f2ea4c22c51fc16555f4a01f30d7575798138067921a011faa10e4d2ac2ac02acdf224546724e0338
HEAD_REF master
PATCHES
- 0001-remove-problematic-compound-literal.patch
0002-av_init_packet_deprecation.patch
)
diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json index 8a2495d98..9f1e06738 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "avcpp", - "version-date": "2021-05-06", - "port-version": 1, + "version-date": "2021-06-14", "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "homepage": "https://github.com/h4tr3d/avcpp", "dependencies": [ diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 56837510f..4b4edbcc8 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", + "version-date": "2021-06-14", + "port-version": 0 + }, + { "git-tree": "102cfc337c2a08e57246c399812a540315ae4531", "version-date": "2021-05-06", "port-version": 1 diff --git a/versions/baseline.json b/versions/baseline.json index 5c01f067d..61cd12944 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -221,8 +221,8 @@ "port-version": 0 }, "avcpp": { - "baseline": "2021-05-06", - "port-version": 1 + "baseline": "2021-06-14", + "port-version": 0 }, "avisynthplus": { "baseline": "3.7.0", |