[FFMpeg] better iOS support

microsoft · Feb 18, 2024 · f1f3387 · f1f3387
1 parent 13bde2f
commit f1f3387
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
@@ -56,6 +56,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
     string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-dxva2 --enable-mediafoundation")
 elseif(VCPKG_TARGET_IS_OSX)
     string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox")
+elseif(VCPKG_TARGET_IS_IOS)
+    string(APPEND OPTIONS " --enable-avfoundation --enable-coreimage --enable-videotoolbox")
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
     string(APPEND OPTIONS " --target-os=android --enable-jni --enable-mediacodec")
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "QNX")
@@ -398,6 +400,8 @@ else()
         string(APPEND OPTIONS " --enable-schannel")
     elseif(VCPKG_TARGET_IS_OSX)
         string(APPEND OPTIONS " --enable-securetransport")
+    elseif(VCPKG_TARGET_IS_IOS)
+        string(APPEND OPTIONS " --enable-securetransport")
     endif()
 endif()
 

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "6.1.1",
+  "port-version": 1,
   "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
@@ -2638,7 +2638,7 @@
     },
     "ffmpeg": {
       "baseline": "6.1.1",
-      "port-version": 0
+      "port-version": 1
     },
     "ffnvcodec": {
       "baseline": "11.1.5.3",

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cde9944f0f87e8bf96b08bdfd42215b1ef77e26d",
+      "version": "6.1.1",
+      "port-version": 1
+    },
     {
       "git-tree": "1bb35d5c0d560a56e6429ca412c7bc5f3e55e930",
       "version": "6.1.1",