antonlyap/ffmpeg-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

use LSMinimumSystemVersion instead of MinimumOSVersion in macOS bundles, fixes #174

Browse Source
This commit is contained in:
Taner Sener 2021-11-07 10:09:16 +00:00
parent d73c43cd2c
commit f52f6a1c56
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/function-apple.sh
View File

@ -400,7 +400,7 @@ create_ffmpeg_framework() {
done done
fi fi
build_info_plist "${FFMPEG_LIB_FRAMEWORK_RESOURCE_PATH}/Info.plist" "${FFMPEG_LIB}" "com.arthenica.ffmpegkit.${CAPITAL_CASE_FFMPEG_LIB_NAME}" "${FFMPEG_LIB_VERSION}" "${FFMPEG_LIB_VERSION}" build_info_plist "${FFMPEG_LIB_FRAMEWORK_RESOURCE_PATH}/Info.plist" "${FFMPEG_LIB}" "com.arthenica.ffmpegkit.${CAPITAL_CASE_FFMPEG_LIB_NAME}" "${FFMPEG_LIB_VERSION}" "${FFMPEG_LIB_VERSION}" "${ARCHITECTURE_VARIANT}"
echo -e "DEBUG: ${FFMPEG_LIB} framework built for $(get_apple_architecture_variant "${ARCHITECTURE_VARIANT}") platform successfully\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "DEBUG: ${FFMPEG_LIB} framework built for $(get_apple_architecture_variant "${ARCHITECTURE_VARIANT}") platform successfully\n" 1>>"${BASEDIR}"/build.log 2>&1
done done
@ -477,7 +477,7 @@ create_ffmpeg_kit_framework() {
# COPYING STRIP SCRIPT FOR SHARED LIBRARY # COPYING STRIP SCRIPT FOR SHARED LIBRARY
cp ${BASEDIR}/tools/release/apple/strip-frameworks.sh ${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH} 1>>${BASEDIR}/build.log 2>&1 cp ${BASEDIR}/tools/release/apple/strip-frameworks.sh ${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH} 1>>${BASEDIR}/build.log 2>&1
build_info_plist "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/Info.plist" "ffmpegkit" "com.arthenica.ffmpegkit.FFmpegKit" "${FFMPEG_KIT_VERSION}" "${FFMPEG_KIT_VERSION}" build_info_plist "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/Info.plist" "ffmpegkit" "com.arthenica.ffmpegkit.FFmpegKit" "${FFMPEG_KIT_VERSION}" "${FFMPEG_KIT_VERSION}" "${ARCHITECTURE_VARIANT}"
build_modulemap "${FFMPEG_KIT_FRAMEWORK_PATH}/Modules/module.modulemap" build_modulemap "${FFMPEG_KIT_FRAMEWORK_PATH}/Modules/module.modulemap"
echo -e "DEBUG: ffmpeg-kit framework built for $(get_apple_architecture_variant "${ARCHITECTURE_VARIANT}") platform successfully\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "DEBUG: ffmpeg-kit framework built for $(get_apple_architecture_variant "${ARCHITECTURE_VARIANT}") platform successfully\n" 1>>"${BASEDIR}"/build.log 2>&1
@ -864,16 +864,29 @@ build_info_plist() {
local FRAMEWORK_ID="$3" local FRAMEWORK_ID="$3"
local FRAMEWORK_SHORT_VERSION="$4" local FRAMEWORK_SHORT_VERSION="$4"
local FRAMEWORK_VERSION="$5" local FRAMEWORK_VERSION="$5"
local ARCHITECTURE_VARIANT="$6"
case ${FFMPEG_KIT_BUILD_TYPE} in case ${FFMPEG_KIT_BUILD_TYPE} in
ios) ios)
case ${ARCHITECTURE_VARIANT} in
"${ARCH_VAR_MAC_CATALYST}")
local MINIMUM_VERSION_KEY="LSMinimumSystemVersion"
;;
*)
local MINIMUM_VERSION_KEY="MinimumOSVersion"
;;
esac
local MINIMUM_OS_VERSION="${IOS_MIN_VERSION}" local MINIMUM_OS_VERSION="${IOS_MIN_VERSION}"
local SUPPORTED_PLATFORMS="iPhoneOS" local SUPPORTED_PLATFORMS="iPhoneOS"
;; ;;
tvos) tvos)
local MINIMUM_VERSION_KEY="MinimumOSVersion"
local MINIMUM_OS_VERSION="${TVOS_MIN_VERSION}" local MINIMUM_OS_VERSION="${TVOS_MIN_VERSION}"
local SUPPORTED_PLATFORMS="AppleTVOS" local SUPPORTED_PLATFORMS="AppleTVOS"
;; ;;
macos) macos)
local MINIMUM_VERSION_KEY="LSMinimumSystemVersion"
local MINIMUM_OS_VERSION="${MACOS_MIN_VERSION}" local MINIMUM_OS_VERSION="${MACOS_MIN_VERSION}"
local SUPPORTED_PLATFORMS="MacOSX" local SUPPORTED_PLATFORMS="MacOSX"
;; ;;
@ -902,7 +915,7 @@ build_info_plist() {
<string>${FRAMEWORK_VERSION}</string> <string>${FRAMEWORK_VERSION}</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>MinimumOSVersion</key> <key>${MINIMUM_VERSION_KEY}</key>
<string>${MINIMUM_OS_VERSION}</string> <string>${MINIMUM_OS_VERSION}</string>
<key>CFBundleSupportedPlatforms</key> <key>CFBundleSupportedPlatforms</key>
<array> <array>