diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2024-02-12 10:02:43 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-18 14:44:22 +0000 |
| commit | 82db8fadea63d580c92209bf7b294951657b8ef2 (patch) | |
| tree | adff73217505f97cbcfb6f03077940d566460624 | |
| parent | 3a9a48d165ecc6b143406801109e482abd15c5c9 (diff) | |
Update ffmpeg 6.0 => 6.1 for android targets on unix hosts
In n6.1, the target cpu is supposed to be x86-64 instead of x86_64.
Task-number: QTBUG-121343
Pick-to: 6.6 6.5
Change-Id: Id87a6eaaf73f093bbac66f245998cda6a3e992fc
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 85c2ab668bf390142220c35aa17ed76b79faba9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg-android.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 64a5bf8a..573fcc64 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.0" +version="n6.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="78435ec71cc2227017a99c030e858719b8c7c74d" +sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" @@ -38,7 +38,7 @@ build_ffmpeg_android() { if [ "$target_arch" == "x86_64" ]; then target_toolchain_arch="x86_64-linux-android" target_arch=x86_64 - target_cpu=x86_64 + target_cpu=x86-64 openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64" elif [ "$target_arch" == "x86" ]; then target_toolchain_arch="i686-linux-android" |