devops: support --full flag for ffmpeg compilation (#11076)
- This flag installs dependencies using brew on MacOS - This flag is a noop on other platforms
This commit is contained in:
Родитель
3dc22245d8
Коммит
13b1e52d95
|
@ -56,13 +56,13 @@ if [[ "$BUILD_FLAVOR" == "winldd-win64" ]]; then
|
|||
# ===========================
|
||||
elif [[ "$BUILD_FLAVOR" == "ffmpeg-mac" ]]; then
|
||||
BROWSER_NAME="ffmpeg"
|
||||
EXTRA_BUILD_ARGS="--mac"
|
||||
EXTRA_BUILD_ARGS="--mac --full"
|
||||
EXPECTED_HOST_OS="Darwin"
|
||||
EXPECTED_HOST_OS_VERSION="11.6"
|
||||
BUILD_BLOB_NAME="ffmpeg-mac.zip"
|
||||
elif [[ "$BUILD_FLAVOR" == "ffmpeg-mac-arm64" ]]; then
|
||||
BROWSER_NAME="ffmpeg"
|
||||
EXTRA_BUILD_ARGS="--mac"
|
||||
EXTRA_BUILD_ARGS="--mac --full"
|
||||
EXPECTED_HOST_OS="Darwin"
|
||||
EXPECTED_HOST_OS_VERSION="11.6"
|
||||
EXPECTED_ARCH="arm64"
|
||||
|
|
|
@ -91,7 +91,11 @@ for dependency in ${REQUIERED_BUILD_TOOLS[@]}; do
|
|||
done
|
||||
|
||||
if [[ ${#missing_build_tools[@]} != 0 ]]; then
|
||||
die "ERROR: missing dependencies! Please run: brew install ${missing_build_tools[@]}"
|
||||
if [[ "$1" == "--full" ]]; then
|
||||
brew install ${missing_build_tools[@]}
|
||||
else
|
||||
die "ERROR: missing dependencies! Please run: brew install ${missing_build_tools[@]}"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Cleanup
|
||||
|
|
|
@ -21,7 +21,7 @@ trap "cd $(pwd -P)" EXIT
|
|||
cd "$(dirname $0)"
|
||||
|
||||
if [[ ("$1" == "-h") || ("$1" == "--help") ]]; then
|
||||
echo "usage: $(basename $0) [--mac|--linux|--cross-compile-win64]"
|
||||
echo "usage: $(basename $0) [--mac|--linux|--cross-compile-win64] [--full]"
|
||||
echo
|
||||
echo "Build ffmpeg for the given platform"
|
||||
echo
|
||||
|
@ -54,7 +54,7 @@ function ensure_docker_or_die() {
|
|||
}
|
||||
|
||||
if [[ "$1" == "--mac" ]]; then
|
||||
bash ./build-mac.sh
|
||||
bash ./build-mac.sh $2
|
||||
cd output && zip ffmpeg.zip ffmpeg-mac "${LICENSE_FILE}"
|
||||
elif [[ "$1" == "--linux" ]]; then
|
||||
ensure_docker_or_die
|
||||
|
|
Загрузка…
Ссылка в новой задаче