From 13b1e52d95df416fdfa7846c8a840aad8df263af Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Wed, 22 Dec 2021 14:59:10 -0800 Subject: [PATCH] devops: support --full flag for ffmpeg compilation (#11076) - This flag installs dependencies using brew on MacOS - This flag is a noop on other platforms --- browser_patches/checkout_build_archive_upload.sh | 4 ++-- browser_patches/ffmpeg/build-mac.sh | 6 +++++- browser_patches/ffmpeg/build.sh | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index 4f4a308117..9b27c1f174 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -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" diff --git a/browser_patches/ffmpeg/build-mac.sh b/browser_patches/ffmpeg/build-mac.sh index aa674b8b43..e774a9549a 100755 --- a/browser_patches/ffmpeg/build-mac.sh +++ b/browser_patches/ffmpeg/build-mac.sh @@ -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 diff --git a/browser_patches/ffmpeg/build.sh b/browser_patches/ffmpeg/build.sh index ded9de7c99..929f788234 100755 --- a/browser_patches/ffmpeg/build.sh +++ b/browser_patches/ffmpeg/build.sh @@ -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