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

Decouple install-ffmpeg on linux and macos specific files

Browse Source 
The FFmpeg building flow has become too different on linux and macos.
Decoupling the logic makes it more simple to follow.

The CR also fixes nits and shellcheck warnings in install-ffmpeg.

Pick-to: 6.8
Change-Id: I28639d28c7210809e52ff18ce612da52f8754285
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 39ad0317d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Artem Dyomin
2024-10-28 14:52:03 +01:00
committed by Nils Petter Skålerud
parent 6d7ce3ee6e
commit a1427fbd4c
34 changed files with 196 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh
View File

@@ -1,3 +1,3 @@
#!/usr/bin/env bash
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"
source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static"