mirror of https://github.com/qt/qt5.git
macOS, FFmpeg: Don't use patchelf 0.18 for Android FFmpeg patching
At the time of writing, homebrew ships patchelf version 0.18.0. This version of patchelf has a bug specific to Androd binaries. The macOS 14 arm64 host currently uses this version of patchelf. This causes an issue during runtime linking in Qt Multimedia applications on Android. This patch modifies the macOS 14 arm64 host to use patchelf v0.17.2 that we compile from source. It also adds warnings to the provisioning log should someone try to use v0.18.0 in the future. Fixes: QTBUG-136930 Pick-to: 6.8 Change-Id: Id66b560e6a1d4300a54017e9c3366720dc291944 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit61046109cf
) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit14dcdd32d7
)
This commit is contained in:
parent
ea9b62813f
commit
c0cadc1d04
|
@ -31,6 +31,12 @@ if ! command -v patchelf; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Get patchelf version
|
||||
patchelf_version=$(patchelf --version 2>/dev/null | awk '{print $2}')
|
||||
if [[ "$patchelf_version" == "0.18.0" ]]; then
|
||||
echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
|
||||
fi
|
||||
|
||||
ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
|
||||
stub_prefix="Qt6FFmpegStub-"
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2
|
||||
# See patchelf bugreport: https://github.com/NixOS/patchelf/issues/576.
|
||||
patchelf_version="0.17.2"
|
||||
|
||||
url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz"
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
set -ex
|
||||
|
||||
brew install patchelf
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
|
||||
|
|
Loading…
Reference in New Issue