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

Improve the script fix_ffmpeg_dependencies

Browse Source 
* add FFmpeg stubs to the 'Required.private' section.
  This will make the logic more robust after integration this
  in qt multimedia.
* add some script comments.
* fix shellcheck.
* add validity checks.

Pick-to: 6.8
Change-Id: I28639d21c7210109e52ff98ce682da51f8744287
Reviewed-by: Jøger Hansegård <jogerh@gmail.com>
Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
(cherry picked from commit a442e4893f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Artem Dyomin
2024-10-29 09:59:22 +01:00
committed by Nils Petter Skålerud
parent 144715f585
commit ea84dba313
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/common/unix/install-patchelf.sh
View File

@@ -4,6 +4,7 @@
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2
patchelf_version="0.17.2"
url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz"