Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 035ad8c

Browse files
committed
support iOS 14, fixes #553
1 parent b898574 commit 035ad8c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

build/ios-nettle.sh

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ if [[ ${RECONF_nettle} -eq 1 ]]; then
5656
autoreconf_library ${LIB_NAME}
5757
fi
5858

59+
${SED_INLINE} 's/exit(0)/return 0/g' ${BASEDIR}/src/${LIB_NAME}/configure
60+
${SED_INLINE} 's/exit (0)/return 0/g' ${BASEDIR}/src/${LIB_NAME}/configure
61+
5962
./configure \
6063
--prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME} \
6164
--enable-pic \

ios.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ if [[ -n ${MOBILE_FFMPEG_LTS_BUILD} ]] && [[ "${DETECTED_IOS_SDK_VERSION}" != "$
986986
fi
987987

988988
# DISABLE 32-bit architectures on newer IOS versions
989-
if [[ ${DETECTED_IOS_SDK_VERSION} == 11* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 12* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 13* ]]; then
989+
if [[ ${DETECTED_IOS_SDK_VERSION} == 11* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 12* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 13* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 14* ]]; then
990990
if [[ -z ${BUILD_FORCE} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARMV7}]} -eq 1 ]]; then
991991
echo -e "INFO: Disabled armv7 architecture which is not supported on SDK ${DETECTED_IOS_SDK_VERSION}\n" 1>>"${BASEDIR}/build.log" 2>&1
992992
disable_arch "armv7"
@@ -1009,7 +1009,7 @@ elif [[ ${DETECTED_IOS_SDK_VERSION} != 10* ]]; then
10091009
fi
10101010

10111011
# DISABLE x86-64-mac-catalyst architecture on IOS versions lower than 13
1012-
if [[ ${DETECTED_IOS_SDK_VERSION} != 13* ]] && [[ -z ${BUILD_FORCE} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then
1012+
if [[ ${DETECTED_IOS_SDK_VERSION} != 13* || ${DETECTED_IOS_SDK_VERSION} != 14* ]] && [[ -z ${BUILD_FORCE} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then
10131013
echo -e "INFO: Disabled x86-64-mac-catalyst architecture which is not supported on SDK ${DETECTED_IOS_SDK_VERSION}\n" 1>>"${BASEDIR}/build.log" 2>&1
10141014
disable_arch "x86-64-mac-catalyst"
10151015
fi

0 commit comments

Comments
 (0)