mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 22:41:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] Add support for arm64 on macOS (#18182)

Browse Source 
* [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>
This commit is contained in:
Martin Vejdarski 2021-06-03 23:56:43 +02:00 committed by GitHub
parent 04b6a4b927
commit c4fedf081d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ffmpeg/portfile.cmake
View File

@ -29,7 +29,7 @@ if (SOURCE_PATH MATCHES " ")
endif() 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 # ffmpeg nasm build gives link error on x86, so fall back to yasm
vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) 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) get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY)
set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}")
endforeach(GAS_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() endif()
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

4
ports/ffmpeg/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "ffmpeg", "name": "ffmpeg",
"version-string": "4.4", "version": "4.4",
"port-version": 1, "port-version": 2,
"description": [ "description": [
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "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." "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

@ -1978,7 +1978,7 @@
}, },
"ffmpeg": { "ffmpeg": {
"baseline": "4.4", "baseline": "4.4",
"port-version": 1 "port-version": 2
}, },
"ffnvcodec": { "ffnvcodec": {
"baseline": "10.0.26.0", "baseline": "10.0.26.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "998009397c4df3ca2b7d2451c9ec43c817fdc6c7",
"version": "4.4",
"port-version": 2
},
{ {
"git-tree": "5ae25637fccfc24bbaf8ab7fbf735191952595fd", "git-tree": "5ae25637fccfc24bbaf8ab7fbf735191952595fd",
"version-string": "4.4", "version-string": "4.4",