From 5c90f2227875c5ba6b9bbaa81101032b5d816ff6 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Mon, 2 Oct 2023 12:45:16 +0200 Subject: [PATCH] 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 (cherry picked from commit 185b7219a4f8b65e3dab71d14eeaacbb3d4fed76) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh | 2 +- .../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"