lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-10 04:58:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

FFmpeg: Move required provisioning packages into common files

Browse Source 
The packages required for FFmpeg provisioning may change between FFmpeg
versions, as is the case when upgrading to FFmpeg n8.1. It is a
time-waster to manually go through all hosts to make sure they all
have the correct packages. Additionally we have no way of knowing
whether a package is used by FFmpeg and/or something else.

This patch moves the list of required FFmpeg packages into some common
files, and refactors each host to read these files. This way we can
modify provisioning in one place.

Change-Id: I31d409595b7da231b1f845c18095e77f7af51b0a
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
(cherry picked from commit 8adbc25578)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Nils Petter Skålerud
2026-04-22 10:09:15 +02:00
committed by Qt Cherry-pick Bot
parent eda1772188
commit 61a32c365c
31 changed files with 123 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/macos/ffmpeg_required_brew_packages.txt Normal file
View File

@@ -0,0 +1,2 @@
diffutils
yasm

6
coin/provisioning/common/macos/install-ffmpeg-macos.sh
View File

@@ -41,7 +41,11 @@ build_ffmpeg() {
popd
}
brew install yasm
# Install required packages through Brew
required_ffmpeg_packages=()
while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../macos/ffmpeg_required_brew_packages.txt"
brew install "${required_ffmpeg_packages[@]}"
export MACOSX_DEPLOYMENT_TARGET=12
fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"