[ffmpeg] Set --disable-audiotoolbox when targeting iOS (microsoft#2…

…6978) * [ffmpeg] Set --disable-audiotoolbox when targeting iOS * [ffmpeg] Bump port version to 19 * Update ffmpeg.json Co-authored-by: Cheney Wang <[email protected]>
m-kuhn · Sep 27, 2022 · 97d3732 · 97d3732
1 parent 8ffbeac
commit 97d3732
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
@@ -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.

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
@@ -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."

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2278,7 +2278,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 18
+      "port-version": 19
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "81adf5d3e80f0e54a7e968950860fed901186e85",
+      "version": "4.4.1",
+      "port-version": 19
+    },
     {
       "git-tree": "65fe58cd3c36c19b6ad4b104b9ff57c506009e9a",
       "version": "4.4.1",