diff options
| author | omartijn <44672243+omartijn@users.noreply.github.com> | 2021-07-01 18:24:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 09:24:59 -0700 |
| commit | 6d47a2faecfc1b057b18b4b2c2b549384c24a9f9 (patch) | |
| tree | 0cd265d1e32ddaf387a6ec468af573ad3ae81191 /versions | |
| parent | fad4d8eecc5c21aa13ccd6a6ad61fa84121e65fc (diff) | |
| download | vcpkg-6d47a2faecfc1b057b18b4b2c2b549384c24a9f9.tar.gz vcpkg-6d47a2faecfc1b057b18b4b2c2b549384c24a9f9.zip | |
[ffmpeg] multi arch support (#18635)
* Expand Architecture list with escape chars
This expands the architecture lists with escape characters. When
building FAT binaries for macos using multiple architectures in the
values they need to be escaped otherwise they are passed on to CMake
incorrectly #14932
* Adding the architecture fix to vcpkg-cmake port
updating port vcpkg-cmake version
* updated version in baseline
* Allow building ffmpeg for multiple architectures on macOS
Since ffmpeg does _not_ support multi-arch builds due to their use of
autotools and config.h which then includes the wrong platform-dependent
functions, we must perform two separate builds and join them using lipo
* fixup! Allow building ffmpeg for multiple architectures on macOS
* fixup! Allow building ffmpeg for multiple architectures on macOS
Co-authored-by: Sander Cox <sander@paralleldimension.nl>
Co-authored-by: Martijn Otto <martijn@resolume.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index e9d829418..863913d43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 5 + "port-version": 6 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a39b1d79a..14c7c2f68 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", + "version": "4.4", + "port-version": 6 + }, + { "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94", "version": "4.4", "port-version": 5 |