diff options
| author | Alexandre Bique <bique.alexandre@gmail.com> | 2021-07-28 00:48:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 15:48:31 -0700 |
| commit | db4d9760aaebc8445308c8d3a425cc01bb47c459 (patch) | |
| tree | a768ca2bbc8c5136a9b12a3fb72be029763f2443 | |
| parent | 9f8a74d7c2cc41664d76ea30b49063554acb03b8 (diff) | |
| download | vcpkg-db4d9760aaebc8445308c8d3a425cc01bb47c459.tar.gz vcpkg-db4d9760aaebc8445308c8d3a425cc01bb47c459.zip | |
[ffmpeg] fix cross compilation on mac arm64 to x86_64 (#18737)
* [ffmpeg] fix cross compilation on mac arm64 to x86_64
* Bump port-version
* Bump port-version again.
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 654370f45..0ec2789d0 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -585,6 +585,9 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU endif() endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if(VCPKG_TARGET_IS_OSX) + set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=x86_64 --extra-ldflags=-arch --extra-ldflags=x86_64 --extra-cflags=-arch --extra-cflags=x86_64 --extra-cxxflags=-arch --extra-cxxflags=x86_64") + endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") else() message(FATAL_ERROR "Unsupported architecture") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 3dccdeb5d..5a001e069 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 10, + "port-version": 11, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index e9f6f6ec4..5ccb76584 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1998,7 +1998,7 @@ }, "ffmpeg": { "baseline": "4.4", - "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 95b846ba5..0897dd09b 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1", + "version": "4.4", + "port-version": 11 + }, + { "git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9", "version": "4.4", "port-version": 10 |