Commit Graph

5 Commits

Author SHA1 Message Date
Nils Petter Skålerud
61046109cf 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.10 6.9 6.8
Change-Id: Id66b560e6a1d4300a54017e9c3366720dc291944
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2025-08-31 16:38:39 +02:00
Artem Dyomin
a442e4893f Improve the script fix_ffmpeg_dependencies
* 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 6.9
Change-Id: I28639d21c7210109e52ff98ce682da51f8744287
Reviewed-by: Jøger Hansegård <jogerh@gmail.com>
Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
2025-04-01 04:35:41 +00:00
Tero Heikkinen
d197f06634 Provisioning: Fix ci-files01-hki to use correct URL
Replace ci-files01-hki.intra.qt.io
with    ci-files01-hki.ci.qt.io

Task-number: QTQAINFRA-6663
Pick-to: 6.8 6.5 5.15
Change-Id: Ia9a6b1fc5a23b6f1a393d6e4be8be41e2991e876
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-10-17 01:11:07 +03:00
Bartlomiej Moskal
64aee78df8 coin: Downgrade patchelf version on CI
Downgrade patchelf version from 0.18.0 to 0.17.2 on MacOs, Linux and
Windows.

It looks like there is a problem with 0.18.0 version, when modyfing the
Android libs. It causes an unresolved dependencies error when loading a
changed library.

Fixes: QTBUG-126861
Pick-to: 6.8
Change-Id: I5a95daae0a78aadede009535b2813483afcbc99d
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
2024-07-29 19:07:18 +02:00
Bartlomiej Moskal
62b60c4caa coin: Move install-patchelf script to unix directory
This patch prepare install-patchelf.sh script for use on MacOs

Pick-to: 6.8
Task-number: QTBUG-126861
Change-Id: Id16462a2819da748ecd0b04f1df57968e9d90c37
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
2024-07-29 19:07:14 +02:00