Skip to content

Commit

Permalink
Disable build of FFmpeg on iOS from toolchain since it cannot build
Browse files Browse the repository at this point in the history
ENABLE_FFMPEG is anyway set to OFF on iOS.

Seems CMAKE_OSX_DEPLOYMENT_TARGET has to be set to minimum iOS 13 in
order for FFmpeg to build.
  • Loading branch information
bear101 committed Nov 3, 2024
1 parent bc6f907 commit 7d28530
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Build TeamTalk Library
working-directory: ${{runner.workspace}}/TeamTalk5/Build
run: |
make CMAKE_EXTRA="-DFEATURE_WEBRTC=OFF -DCMAKE_OSX_ARCHITECTURES=${{ matrix.cmakearch }} -DCMAKE_OSX_SYSROOT=${{ matrix.cmakesysroot }} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-${{ matrix.cmakearch }}" BUILDDIR=build-${{ matrix.cmakearch }} ios-build
make CMAKE_EXTRA="-DFEATURE_WEBRTC=OFF -DTOOLCHAIN_FFMPEG=OFF -DCMAKE_OSX_ARCHITECTURES=${{ matrix.cmakearch }} -DCMAKE_OSX_SYSROOT=${{ matrix.cmakesysroot }} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-${{ matrix.cmakearch }}" BUILDDIR=build-${{ matrix.cmakearch }} ios-build
- name: Run CMake Install Target
working-directory: ${{runner.workspace}}/TeamTalk5/Build/build-${{ matrix.cmakearch }}
Expand Down
7 changes: 6 additions & 1 deletion Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,12 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
ExternalProject_Get_Property(gas-preprocessor SOURCE_DIR)
set (GAS_DIR ${SOURCE_DIR})

set (FFMPEG_CFG_FLAGS --target-os=darwin --sysroot=${CMAKE_OSX_SYSROOT} --enable-pic --disable-doc --disable-programs --enable-cross-compile)
set (FFMPEG_CFG_FLAGS --target-os=darwin --sysroot=${CMAKE_OSX_SYSROOT}
--enable-pic
--enable-cross-compile
--disable-doc
--disable-programs
--disable-audiotoolbox)

if ("armv7" STREQUAL "${CMAKE_OSX_ARCHITECTURES}")
list (APPEND FFMPEG_CFG_FLAGS --arch=arm --cpu=cortex-a8)
Expand Down

0 comments on commit 7d28530

Please sign in to comment.