Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: support ffmpeg MacOS arm64 builds (#11075)

Browse source 
Drive-by's:
- support ffmpeg build on MacOS 12
- rename ffmpeg executable for Ubuntu arm64 to `ffmpeg-linux`
This commit is contained in:
Andrey Lushnikov 2021-12-22 14:43:13 -08:00 committed by GitHub
parent 0514ecc1af
commit 3dc22245d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
browser_patches/checkout_build_archive_upload.sh
View file

@ -60,6 +60,13 @@ elif [[ "$BUILD_FLAVOR" == "ffmpeg-mac" ]]; then
EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.6" EXPECTED_HOST_OS_VERSION="11.6"
BUILD_BLOB_NAME="ffmpeg-mac.zip" BUILD_BLOB_NAME="ffmpeg-mac.zip"
elif [[ "$BUILD_FLAVOR" == "ffmpeg-mac-arm64" ]]; then
BROWSER_NAME="ffmpeg"
EXTRA_BUILD_ARGS="--mac"
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.6"
EXPECTED_ARCH="arm64"
BUILD_BLOB_NAME="ffmpeg-mac-arm64.zip"
elif [[ "$BUILD_FLAVOR" == "ffmpeg-linux" ]]; then elif [[ "$BUILD_FLAVOR" == "ffmpeg-linux" ]]; then
BROWSER_NAME="ffmpeg" BROWSER_NAME="ffmpeg"
EXTRA_BUILD_ARGS="--linux" EXTRA_BUILD_ARGS="--linux"

2
browser_patches/ffmpeg/BUILD_NUMBER
View file

@ -1 +1 @@
1006 1007

1
browser_patches/ffmpeg/EXPECTED_BUILDS
View file

@ -1,4 +1,5 @@
ffmpeg-mac.zip ffmpeg-mac.zip
ffmpeg-mac-arm64.zip
ffmpeg-linux.zip ffmpeg-linux.zip
ffmpeg-linux-arm64.zip ffmpeg-linux-arm64.zip
ffmpeg-win64.zip ffmpeg-win64.zip

6
browser_patches/ffmpeg/build-mac.sh
View file

@ -29,11 +29,11 @@ source "${SCRIPT_FOLDER}/../utils.sh"
CURRENT_HOST_OS_VERSION=$(getMacVersion) CURRENT_HOST_OS_VERSION=$(getMacVersion)
# As of Oct 2021, we build FFMPEG for Mac with Xcode 13 to align toolchains. # As of Oct 2021, we build FFMPEG for Mac with Xcode 13 to align toolchains.
if [[ "${CURRENT_HOST_OS_VERSION}" == "11."* ]]; then if [[ "${CURRENT_HOST_OS_VERSION}" == "10."* ]]; then
selectXcodeVersionOrDie "13"
else
echo "ERROR: ${CURRENT_HOST_OS_VERSION} is not supported" echo "ERROR: ${CURRENT_HOST_OS_VERSION} is not supported"
exit 1 exit 1
else
selectXcodeVersionOrDie "13"
fi fi
source ./CONFIG.sh source ./CONFIG.sh

4
browser_patches/ffmpeg/build.sh
View file

@ -69,8 +69,8 @@ elif [[ "$1" == --cross-compile-win64 ]]; then
elif [[ "$1" == "--cross-compile-linux-arm64" ]]; then elif [[ "$1" == "--cross-compile-linux-arm64" ]]; then
ensure_docker_or_die ensure_docker_or_die
time docker run --init --rm -v"${PWD}":/host ${dockerflags} ubuntu:18.04 bash /host/crosscompile-from-linux.sh --linux-arm64 /host/output/ffmpeg-linux-arm64 time docker run --init --rm -v"${PWD}":/host ${dockerflags} ubuntu:18.04 bash /host/crosscompile-from-linux.sh --linux-arm64 /host/output/ffmpeg-linux
cd output && zip ffmpeg.zip ffmpeg-linux-arm64 "${LICENSE_FILE}" cd output && zip ffmpeg.zip ffmpeg-linux "${LICENSE_FILE}"
else else
echo "ERROR: unsupported platform - $1" echo "ERROR: unsupported platform - $1"
exit 1 exit 1