lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 18:19:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add provisioning of FFmpeg for Android and iOS with qtci-macos

Browse Source 
This patch adds FFmpeg provisioning for Android and iOS for
qtci-macos-12..15-arm..x86-64 by syncing with qtci-macos-13-x86_64
where this was already done.

Change-Id: I070514cbff12504db7c6fa77111e12d7e500ce30
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2728b7ac6f)
Reviewed-by: Nils Petter Skålerud <nils.petter.skalerud@qt.io>
This commit is contained in:
Jøger Hansegård
2024-10-21 19:43:01 +02:00
committed by Nils Petter Skålerud
parent 39b4307edf
commit 92f122511d
7 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
View File

@@ -5,3 +5,5 @@
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"

1
coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
View File

@@ -6,3 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
View File

@@ -5,3 +5,5 @@
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
View File

@@ -5,3 +5,5 @@
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
View File

@@ -5,3 +5,5 @@
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"

9
coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh Executable file
View File

@@ -0,0 +1,9 @@
#!/usr/bin/env bash
#Copyright (C) 2023 The Qt Company Ltd
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"

9
coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh Executable file
View File

@@ -0,0 +1,9 @@
#!/usr/bin/env bash
#Copyright (C) 2023 The Qt Company Ltd
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"