Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[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>
This commit is contained in:
Alexandre Bique 2021-07-28 00:48:31 +02:00 committed by GitHub
parent 9f8a74d7c2
commit db4d9760aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/ffmpeg/portfile.cmake
View File

@ -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")

2
ports/ffmpeg/vcpkg.json
View File

@ -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."

2
versions/baseline.json
View File

@ -1998,7 +1998,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 10
"port-version": 11
},
"ffnvcodec": {
"baseline": "10.0.26.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1",
"version": "4.4",
"port-version": 11
},
{
"git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9",
"version": "4.4",