diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2023-10-26 06:58:01 +0000 |
|---|---|---|
| committer | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2024-01-27 14:57:31 +0000 |
| commit | 268cb978e2eb12685a2c315b455b3f2d8a8c9efb (patch) | |
| tree | aa6bb6057b7929653029c3c43c0fa5d1c79af333 /coin/provisioning | |
| parent | f0d618aa7a5a43a8c187938e07cf359a40c1e551 (diff) | |
Provisioning: Upgrade ffmeg version to fix make issue with SLES
Version points to commit:
c5039e158d20e85d4d8a2dee3160533d627b839a
This commit is the latest one in 6.0 branch. This way we'll get
fix also for https://fftrac-bg.ffmpeg.org/ticket/10405
Version should be changed to official release
when the next official release is available.
Task-number: QTQAINFRA-5912
Change-Id: I4e7acea5a54ce692334c7fe22ba074791c94cf03
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 4067395aeefc151610e05f62e30066e96b8198fe)
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/provisioning')
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index a2bec1b5..73204429 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2022 The Qt Company Ltd. +# 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 # This script will build and install FFmpeg static libs @@ -11,10 +11,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.0" -url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="78435ec71cc2227017a99c030e858719b8c7c74d" -url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz" +# Commit c5039e158d20e85d4d8a2dee3160533d627b839a is the latest one in 6.0 branch. +# When using the latest commit we will also get fix for https://fftrac-bg.ffmpeg.org/ticket/10405 +# Should be changed to official release as soon as possible! +version="c5039e158d20e85d4d8a2dee3160533d627b839a" +url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" +sha1="4e13a26d3be7ac4d69201a6aa0accd734b24b3c4" +url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" target_dir="$HOME" @@ -95,4 +98,3 @@ elif [ "$os" == "macos-universal" ]; then SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" fi - |