fix apple platforms build errors

arthenica · Nov 6, 2021 · 24ec14a · 24ec14a
1 parent 431e95f
commit 24ec14a
Show file tree

Hide file tree

Showing 42 changed files with 359 additions and 141 deletions.
diff --git a/README.md b/README.md
@@ -177,6 +177,8 @@ burning subtitles, video stabilisation, pipe operations and concurrent command e
 `FFmpegKit` is licensed under the `LGPL v3.0`. However, if source code is built using the optional `--enable-gpl` flag
 or prebuilt binaries with `-gpl` postfix are used, then `FFmpegKit` is subject to the `GPL v3.0` license.
 
+See the [License](https://github.com/tanersener/ffmpeg-kit/wiki/License) wiki page for the details.
+
 ### 14. Patents
 
 It is not clearly explained in their documentation, but it is believed that `FFmpeg`, `kvazaar`, `x264` and `x265`

diff --git a/ios.sh b/ios.sh
@@ -19,7 +19,6 @@ source "${BASEDIR}"/scripts/function-${FFMPEG_KIT_BUILD_TYPE}.sh
 
 # SET DEFAULTS SETTINGS
 enable_default_ios_architectures
-enable_main_build
 
 # SELECT XCODE VERSION USED FOR BUILDING
 XCODE_FOR_FFMPEG_KIT=$(ls ~/.xcode.for.ffmpeg.kit.sh 2>>"${BASEDIR}"/build.log)
@@ -28,7 +27,7 @@ if [[ -f ${XCODE_FOR_FFMPEG_KIT} ]]; then
 fi
 
 # DETECT IOS SDK VERSION
-DETECTED_IOS_SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>>${BASEDIR}/build.log)"
+export DETECTED_IOS_SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>>${BASEDIR}/build.log)"
 echo -e "\nINFO: Using SDK ${DETECTED_IOS_SDK_VERSION} by Xcode provided at $(xcode-select -p)\n" 1>>"${BASEDIR}"/build.log 2>&1
 echo -e "INFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
 
@@ -45,6 +44,9 @@ if [[ -z ${BUILD_VERSION} ]]; then
   exit 1
 fi
 
+# MAIN BUILDS ENABLED BY DEFAULT
+enable_main_build
+
 # PROCESS LTS BUILD OPTION FIRST AND SET BUILD TYPE: MAIN OR LTS
 for argument in "$@"; do
   if [[ "$argument" == "-l" ]] || [[ "$argument" == "--lts" ]]; then
@@ -163,33 +165,31 @@ fi
 disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARMV7}"
 disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARMV7S}"
 disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_I386}"
+disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64E}"
+disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_X86_64_MAC_CATALYST}"
+disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64_MAC_CATALYST}"
+disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64_SIMULATOR}"
 
 # CHECK SOME RULES FOR .framework BUNDLES
 
-# 1. DISABLE arm64-mac-catalyst WHEN arm64 IS ENABLED IN framework BUNDLES
-if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_MAC_CATALYST}]} -eq 1 ]]; then
-  echo -e "INFO: Disabled arm64-mac-catalyst architecture which can not co-exist with arm64 in the same framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
+# 1. DISABLE arm64-mac-catalyst IN framework BUNDLES
+if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_MAC_CATALYST}]} -eq 1 ]]; then
+  echo -e "INFO: Disabled arm64-mac-catalyst architecture which cannot exist in a framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
   disable_arch "arm64-mac-catalyst"
 fi
 
-# 2. DISABLE arm64-simulator WHEN arm64 IS ENABLED IN framework BUNDLES
-if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_SIMULATOR}]} -eq 1 ]]; then
-  echo -e "INFO: Disabled arm64-simulator architecture which can not co-exist with arm64 in the same framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
-  disable_arch "arm64-simulator"
+# 2. DISABLE x86-64-mac-catalyst IN framework BUNDLES
+if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then
+  echo -e "INFO: Disabled x86-64-mac-catalyst architecture which cannot exist in a framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
+  disable_arch "x86-64-mac-catalyst"
 fi
 
-# 3. DISABLE arm64-simulator WHEN arm64-mac-catalyst IS ENABLED IN framework BUNDLES
-if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_MAC_CATALYST}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_SIMULATOR}]} -eq 1 ]]; then
-  echo -e "INFO: Disabled arm64-simulator architecture which can not co-exist with arm64-mac-catalyst in the same framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
+# 3. DISABLE arm64-simulator WHEN arm64 IS ENABLED IN framework BUNDLES
+if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_SIMULATOR}]} -eq 1 ]]; then
+  echo -e "INFO: Disabled arm64-simulator architecture which cannot co-exist with arm64 in the same framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
   disable_arch "arm64-simulator"
 fi
 
-# 4. DISABLE x86-64-mac-catalyst WHEN x86-64 IS ENABLED IN framework BUNDLES
-if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then
-  echo -e "INFO: Disabled x86-64-mac-catalyst architecture which can not co-exist with x86-64 in the same framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1
-  disable_arch "x86-64-mac-catalyst"
-fi
-
 echo -e "\nBuilding ffmpeg-kit ${BUILD_TYPE_ID}shared library for iOS\n"
 echo -e -n "INFO: Building ffmpeg-kit ${BUILD_VERSION} ${BUILD_TYPE_ID}for iOS: " 1>>"${BASEDIR}"/build.log 2>&1
 echo -e "$(date)\n" 1>>"${BASEDIR}"/build.log 2>&1

diff --git a/macos.sh b/macos.sh
@@ -19,7 +19,6 @@ source "${BASEDIR}"/scripts/function-${FFMPEG_KIT_BUILD_TYPE}.sh
 
 # SET DEFAULTS SETTINGS
 enable_default_macos_architectures
-enable_main_build
 
 # SELECT XCODE VERSION USED FOR BUILDING
 XCODE_FOR_FFMPEG_KIT=$(ls ~/.xcode.for.ffmpeg.kit.sh 2>>"${BASEDIR}"/build.log)
@@ -28,7 +27,7 @@ if [[ -f ${XCODE_FOR_FFMPEG_KIT} ]]; then
 fi
 
 # DETECT MACOS SDK VERSION
-DETECTED_MACOS_SDK_VERSION="$(xcrun --sdk macosx --show-sdk-version 2>>${BASEDIR}/build.log)"
+export DETECTED_MACOS_SDK_VERSION="$(xcrun --sdk macosx --show-sdk-version 2>>${BASEDIR}/build.log)"
 echo -e "\nINFO: Using SDK ${DETECTED_MACOS_SDK_VERSION} by Xcode provided at $(xcode-select -p)\n" 1>>"${BASEDIR}"/build.log 2>&1
 echo -e "\nINFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
 
@@ -45,6 +44,9 @@ if [[ -z ${BUILD_VERSION} ]]; then
   exit 1
 fi
 
+# MAIN BUILDS ENABLED BY DEFAULT
+enable_main_build
+
 # PROCESS LTS BUILD OPTION FIRST AND SET BUILD TYPE: MAIN OR LTS
 for argument in "$@"; do
   if [[ "$argument" == "-l" ]] || [[ "$argument" == "--lts" ]]; then
@@ -154,6 +156,9 @@ if [[ -n ${DISPLAY_HELP} ]]; then
   exit 0
 fi
 
+# DISABLE NOT SUPPORTED ARCHITECTURES
+disable_macos_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64}"
+
 echo -e "\nBuilding ffmpeg-kit ${BUILD_TYPE_ID}shared library for macOS\n"
 echo -e -n "INFO: Building ffmpeg-kit ${BUILD_VERSION} ${BUILD_TYPE_ID}for macOS: " 1>>"${BASEDIR}"/build.log 2>&1
 echo -e "$(date)\n" 1>>"${BASEDIR}"/build.log 2>&1

diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh
@@ -476,6 +476,7 @@ ${SED_INLINE} "s/\$version/$FFMPEG_VERSION/g" "${BASEDIR}"/src/"${LIB_NAME}"/ffb
   --ranlib="${RANLIB}" \
   --strip="${STRIP}" \
   --nm="${NM}" \
+  --extra-ldflags="$(get_min_version_cflags)" \
   --disable-autodetect \
   --enable-cross-compile \
   --enable-pic \

diff --git a/scripts/apple/gnutls.sh b/scripts/apple/gnutls.sh
@@ -56,4 +56,8 @@ make -j$(get_cpu_count) || return 1
 make install || return 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gnutls_package_config "3.6.15.1" || return 1
+if [[ ${FFMPEG_KIT_BUILD_TYPE} == "macos" ]]; then
+  create_gnutls_package_config "3.6.15.1" "-framework Security" || return 1
+else
+  create_gnutls_package_config "3.6.15.1" || return 1
+fi
diff --git a/scripts/apple/libaom.sh b/scripts/apple/libaom.sh
@@ -10,7 +10,7 @@ arm*)
   ASM_OPTIONS="-DCONFIG_RUNTIME_CPU_DETECT=0 -DARCH_ARM=1 -DENABLE_NEON=1 -DHAVE_NEON=1"
   ;;
 i386)
-  ASM_OPTIONS="-DARCH_X86=1 -DENABLE_SSE=1 -DHAVE_SSE=1 -DENABLE_SSE3=1 -DHAVE_SSE3=1"
+  ASM_OPTIONS="-DARCH_X86=1 -DENABLE_SSE=0 -DHAVE_SSE=0 -DENABLE_SSE3=0 -DHAVE_SSE3=0"
   ;;
 x86-64*)
   ASM_OPTIONS="-DARCH_X86_64=0 -DENABLE_SSE=0 -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSE4_1=0 -DENABLE_SSE4_2=0 -DENABLE_MMX=0"

diff --git a/scripts/apple/openh264.sh b/scripts/apple/openh264.sh
@@ -1,5 +1,22 @@
 #!/bin/bash
 
+get_local_asm_arch() {
+  case ${ARCH} in
+  armv7*)
+    echo "arm"
+    ;;
+  arm64*)
+    echo "arm64"
+    ;;
+  x86-64*)
+    echo "x86_64"
+    ;;
+  *)
+    echo "${ARCH}"
+    ;;
+  esac
+}
+
 # UPDATE BUILD FLAGS AND SET BUILD OPTIONS
 ASM_OPTIONS="OS=darwin"
 case ${ARCH} in
@@ -14,19 +31,22 @@ arm64*)
   ;;
 esac
 
+# ALWAYS CLEAN THE PREVIOUS BUILD
+make clean 2>/dev/null 1>/dev/null
+
+# DISCARD APPLE WORKAROUNDS
+git checkout "${BASEDIR}"/src/"${LIB_NAME}"/build || return 1
+git checkout "${BASEDIR}"/src/"${LIB_NAME}"/codec || return 1
+
 # MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES - EXCEPT x86-64
 ${SED_INLINE} 's/arm64 aarch64/arm64% aarch64/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/%86 x86_64,/%86 x86_64 x86-64%,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/filter-out arm64,/filter-out arm64%,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/CFLAGS += -DHAVE_NEON/#CFLAGS += -DHAVE_NEON/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm64)/ifneq (\$(filter arm64%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm)/ifneq (\$(filter armv%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-
-# ALWAYS CLEAN THE PREVIOUS BUILD
-make clean 2>/dev/null 1>/dev/null
 
 make -j$(get_cpu_count) \
-  ASM_ARCH="$(get_target_cpu)" \
+  ASM_ARCH="$(get_local_asm_arch)" \
   ARCH="${ARCH}" \
   CC="${CC}" \
   CFLAGS="$CFLAGS" \

diff --git a/scripts/apple/x265.sh b/scripts/apple/x265.sh
@@ -30,6 +30,18 @@ ${SED_INLINE} 's/lsr 16/lsr #16/g' ${BASEDIR}/src/x265/source/common/arm/blockco
 ${SED_INLINE} 's/function x265_/function _x265_/g' ${BASEDIR}/src/x265/source/common/arm/*.S
 ${SED_INLINE} 's/ x265_/ _x265_/g' ${BASEDIR}/src/x265/source/common/arm/pixel-util.S
 
+# fixing relocation errors
+${SED_INLINE} 's/sad12_mask:/sad12_mask_bytes:/g' ${BASEDIR}/src/x265/source/common/arm/sad-a.S
+${SED_INLINE} 's/g_lumaFilter:/g_lumaFilter_bytes:/g' ${BASEDIR}/src/x265/source/common/arm/ipfilter8.S
+${SED_INLINE} 's/g_chromaFilter:/g_chromaFilter_bytes:/g' ${BASEDIR}/src/x265/source/common/arm/ipfilter8.S
+${SED_INLINE} 's/\.text/.equ sad12_mask, .-sad12_mask_bytes\
+\
+.text/g' ${BASEDIR}/src/x265/source/common/arm/sad-a.S
+${SED_INLINE} 's/\.text/.equ g_lumaFilter, .-g_lumaFilter_bytes\
+.equ g_chromaFilter, .-g_chromaFilter_bytes\
+\
+.text/g' ${BASEDIR}/src/x265/source/common/arm/ipfilter8.S
+
 # WORKAROUND TO USE A CUSTOM BUILD FILE
 overwrite_file "${BASEDIR}"/tools/patch/cmake/x265/CMakeLists.txt "${BASEDIR}"/src/"${LIB_NAME}"/source/CMakeLists.txt || return 1