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

Fix missing ffmpeg for desktop Linux CI platforms

Browse Source 
What's done:
- ffmpeg build added to OpenSuse platforms
- installing of yasm moved to packages install file in
  order to get rid of OS checkings

Change-Id: I256f19a03e7f01d27923b083b63d9a6b6a5f29b4
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit e5cf7b2d58)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Artem Dyomin
2023-01-20 14:58:01 +01:00
committed by Qt Cherry-pick Bot
parent 394f69b2cd
commit 397f2dadd4
18 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/unix/install-ffmpeg.sh
View File

@@ -143,10 +143,6 @@ build_ffmpeg_android() {
}
if [ "$os" == "linux" ]; then
if [ -f /etc/redhat-release ]
then sudo yum -y install yasm
else sudo apt install yasm
fi
build_ffmpeg
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"