aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorMatthias C. M. Troffaes <matthias.troffaes@gmail.com>2021-02-09 02:09:01 +0000
committerGitHub <noreply@github.com>2021-02-08 18:09:01 -0800
commitdf76decfd6c0dc77dc80bb5763fbdd93c9cb9060 (patch)
treeac70c0541ca5b1604c6490176bac0b4721e181c1 /versions
parent96a1f9c78dbedbbe81caed34a43b3022356588c5 (diff)
downloadvcpkg-df76decfd6c0dc77dc80bb5763fbdd93c9cb9060.tar.gz
vcpkg-df76decfd6c0dc77dc80bb5763fbdd93c9cb9060.zip
[ffmpeg] avfilter: fix dependencies and linux library ordering (#16000)
* [ffmpeg] avfilter: fix library ordering on linux and fix feature dependencies * [ffmpeg] bump port version * [ffmpeg] add OpenGL, Foundation, CoreGraphics, AppKit and CoreImage for osx (needed for avfilter) * [ffmpeg] update git-tree * [ffmpeg] restrict new osx dependencies to avfilter feature * [ffmpeg] update git-tree * [ffmpeg] remove avfilter dependencies Note this exposes a bug in upstream, will need fix in ffmpeg configure script itself. * [ffmpeg] improve macos framework dependencies * [ffmpeg] update git-tree * [ffmpeg] patch for filter dependencies in configure script * [ffmpeg] update git-tree * [ffmpeg] apple framework fix: securetransport is part of avformat and not avdevice * [ffmpeg] update git-tree
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/ffmpeg.json5
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 66c34cd4f..bf45e9335 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1910,7 +1910,7 @@
},
"ffmpeg": {
"baseline": "4.3.1",
- "port-version": 10
+ "port-version": 11
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index a2ddd9b00..2b34eb5c3 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "985bdde5191e69e38ecda3472663614fcd491052",
+ "version-string": "4.3.1",
+ "port-version": 11
+ },
+ {
"git-tree": "93395ca1a700faa1c8c6ce04ef4a6dfa26e9fade",
"version-string": "4.3.1",
"port-version": 10