mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 13:59:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] Set --disable-audiotoolbox when targeting iOS (#26978)

Browse Source 
* [ffmpeg] Set --disable-audiotoolbox when targeting iOS

* [ffmpeg] Bump port version to 19

* Update ffmpeg.json

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
FW 2022-09-28 01:04:01 +02:00 committed by GitHub
parent 8ffbeacd58
commit 97d3732f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ffmpeg/portfile.cmake
View File

@ -460,6 +460,10 @@ if (VCPKG_TARGET_IS_OSX)
set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX
endif()
if(VCPKG_TARGET_IS_IOS)
set(OPTIONS "${OPTIONS} --disable-audiotoolbox") # disable AudioToolbox on iOS
endif()
set(OPTIONS_CROSS " --enable-cross-compile")
# ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling.

2
ports/ffmpeg/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "4.4.1",
"port-version": 18,
"port-version": 19,
"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

@ -2278,7 +2278,7 @@
},
"ffmpeg": {
"baseline": "4.4.1",
"port-version": 18
"port-version": 19
},
"ffnvcodec": {
"baseline": "11.1.5.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "81adf5d3e80f0e54a7e968950860fed901186e85",
"version": "4.4.1",
"port-version": 19
},
{
"git-tree": "65fe58cd3c36c19b6ad4b104b9ff57c506009e9a",
"version": "4.4.1",