From 5e4c16da8862432d3c3197c8484561918c33b537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= Date: Thu, 19 Dec 2024 08:13:43 +0100 Subject: [PATCH 1/2] Fix CMake project name for FFmpeg --- Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt index 9652cc3f9..40138c65c 100644 --- a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt +++ b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt @@ -1,4 +1,4 @@ -project(OpenSSL) +project(FFmpeg) include(ExternalProject) From 15931961f1eef47ae497e5f7d2317bae28809a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= Date: Tue, 10 Dec 2024 21:36:01 +0100 Subject: [PATCH 2/2] Disable VideoToolBox dependency for FFmpeg on iOS VideoToolBox requires a more recent iOS deployment target. --- Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt index 40138c65c..90dcccf4e 100644 --- a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt +++ b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt @@ -243,11 +243,15 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS") set (GAS_DIR ${SOURCE_DIR}) set (FFMPEG_CFG_FLAGS --target-os=darwin --sysroot=${CMAKE_OSX_SYSROOT} - --enable-pic - --enable-cross-compile + # External libraries: + --disable-videotoolbox + --disable-audiotoolbox + # Programs/docs --disable-doc --disable-programs - --disable-audiotoolbox) + # Compile options + --enable-pic + --enable-cross-compile) if ("armv7" STREQUAL "${CMAKE_OSX_ARCHITECTURES}") list (APPEND FFMPEG_CFG_FLAGS --arch=arm --cpu=cortex-a8)