diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-10-02 12:45:16 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-11-02 19:36:21 +0000 |
| commit | 5c90f2227875c5ba6b9bbaa81101032b5d816ff6 (patch) | |
| tree | 7325de632e0d7afe0d1abd1b89f04221586e9fe6 | |
| parent | 11f878bc1928fcf00088959156aa5f0d605633f2 (diff) | |
Coin: Fix install-ffmpeg calls for android
There is a specialized script to install FFmpeg for Android. Use it
instead of common install-ffmpeg.sh (which does not work for "android"
parameter).
Task-number: QTBUG-110805
Task-number: QTBUG-114954
Task-number: QTBUG-113980
Pick-to: 6.5
Change-Id: I2409e0f8ffe0f8b28eadce4738c2551fe00a7fbf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 185b7219a4f8b65e3dab71d14eeaacbb3d4fed76)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh index 74bed65f..a3252c08 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh @@ -3,4 +3,4 @@ #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "android" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh index 280b2870..409ac134 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "android" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" |