diff options
| author | Martin Vejdarski <extrulm@gmail.com> | 2021-06-03 23:56:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 14:56:43 -0700 |
| commit | c4fedf081dcd0931e2aaab5ab1afa21e31a94e6d (patch) | |
| tree | 450871f29fb2cbfe2dd11497adff92a3c0dd9aae | |
| parent | 04b6a4b9272ea7e52f963648e2575c116fe177aa (diff) | |
| download | vcpkg-c4fedf081dcd0931e2aaab5ab1afa21e31a94e6d.tar.gz vcpkg-c4fedf081dcd0931e2aaab5ab1afa21e31a94e6d.zip | |
[ffmpeg] Add support for arm64 on macOS (#18182)
* [FFmpeg] Add support for arm64 on macOS
* [ffmpeg] x-add-version
* [ffmpeg] Rename version-string to version
* [ffmpeg] x-add-version
* minor fixes
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 77cad0710..56447a98f 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -29,7 +29,7 @@ if (SOURCE_PATH MATCHES " ") endif() -if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") # ffmpeg nasm build gives link error on x86, so fall back to yasm vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) @@ -493,6 +493,8 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") endforeach(GAS_PATH) + elseif(VCPKG_TARGET_IS_OSX) # VCPKG_TARGET_ARCHITECTURE = arm64 + set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64") endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 3ac2bfccb..09bb81a89 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", - "version-string": "4.4", - "port-version": 1, + "version": "4.4", + "port-version": 2, "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 1c2e036a8..01a7eb9a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1978,7 +1978,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 1 + "port-version": 2 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 4b613ade2..535f83e55 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "998009397c4df3ca2b7d2451c9ec43c817fdc6c7", + "version": "4.4", + "port-version": 2 + }, + { "git-tree": "5ae25637fccfc24bbaf8ab7fbf735191952595fd", "version-string": "4.4", "port-version": 1 |