From a3fb39e7c5f86c15e5e30f97e97f52193636ce66 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Fri, 8 Oct 2021 13:52:02 -0700 Subject: [PATCH] devops: build FFMPEG using MacOS 11 (#9402) --- browser_patches/ffmpeg/BUILD_NUMBER | 2 +- browser_patches/ffmpeg/build-mac.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/browser_patches/ffmpeg/BUILD_NUMBER b/browser_patches/ffmpeg/BUILD_NUMBER index 49bc2728c7..9540e56f97 100644 --- a/browser_patches/ffmpeg/BUILD_NUMBER +++ b/browser_patches/ffmpeg/BUILD_NUMBER @@ -1 +1 @@ -1005 +1006 diff --git a/browser_patches/ffmpeg/build-mac.sh b/browser_patches/ffmpeg/build-mac.sh index 02da3180aa..aa301ccfc2 100755 --- a/browser_patches/ffmpeg/build-mac.sh +++ b/browser_patches/ffmpeg/build-mac.sh @@ -24,6 +24,17 @@ fi trap "cd $(pwd -P)" EXIT cd "$(dirname $0)" +SCRIPT_FOLDER="$(pwd -P)" +source "${SCRIPT_FOLDER}/../utils.sh" + +CURRENT_HOST_OS_VERSION=$(getMacVersion) +# As of Oct 2021, we build FFMPEG for Mac with Xcode 13 to align toolchains. +if [[ "${CURRENT_HOST_OS_VERSION}" == "11."* ]]; then + selectXcodeVersionOrDie "13" +else + echo "ERROR: ${CURRENT_HOST_OS_VERSION} is not supported" + exit 1 +fi source ./CONFIG.sh