diff --git a/scripts/apple/ffmpeg-kit.sh b/scripts/apple/ffmpeg-kit.sh index 96af1364..d968e866 100755 --- a/scripts/apple/ffmpeg-kit.sh +++ b/scripts/apple/ffmpeg-kit.sh @@ -22,7 +22,7 @@ set_toolchain_paths "${LIB_NAME}" HOST=$(get_host) export CFLAGS="$(get_cflags ${LIB_NAME}) -I${LIB_INSTALL_BASE}/ffmpeg/include" export CXXFLAGS=$(get_cxxflags ${LIB_NAME}) -export LDFLAGS="$(get_ldflags ${LIB_NAME}) -F${LIB_INSTALL_BASE}/ffmpeg/framework -framework Foundation -framework CoreVideo -framework libavdevice" +export LDFLAGS="$(get_ldflags ${LIB_NAME}) -Wl,-ld_classic -F${LIB_INSTALL_BASE}/ffmpeg/framework -framework Foundation -framework CoreVideo -framework libavdevice" export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}" cd "${BASEDIR}"/apple 1>>"${BASEDIR}"/build.log 2>&1 || return 1 diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh index 20dedddf..3a1c406a 100755 --- a/scripts/apple/ffmpeg.sh +++ b/scripts/apple/ffmpeg.sh @@ -455,7 +455,7 @@ COMMON_LDFLAGS=$(get_common_ldflags) # UPDATE BUILD FLAGS export CFLAGS="${ARCH_CFLAGS} ${APP_CFLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_CFLAGS} ${MIN_VERSION_CFLAGS}${FFMPEG_CFLAGS} ${COMMON_INCLUDES}" export CXXFLAGS=$(get_cxxflags "${LIB_NAME}") -export LDFLAGS="${ARCH_LDFLAGS}${HIGH_PRIORITY_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}" +export LDFLAGS="${ARCH_LDFLAGS}${HIGH_PRIORITY_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} -Wl,-ld_classic ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}" echo -n -e "\n${LIB_NAME}: " @@ -542,6 +542,9 @@ ${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR --disable-nvenc \ --disable-vaapi \ --disable-vdpau \ + --enable-avfoundation \ + --enable-audiotoolbox \ + --enable-videotoolbox \ --enable-decoder=libvpx_vp9,opus \ --enable-demuxer=matroska,ogg \ --enable-encoder=hevc_videotoolbox,aac_at \