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

Provisioning: Upgrade ffmeg version to fix make issue with SLES

Browse Source 
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.

Pick-to: 6.6
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>
This commit is contained in:
Heikki Halmet
2023-10-26 06:58:01 +00:00
parent f4f2ebae60
commit 4067395aee
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/provisioning/common/unix/install-ffmpeg.sh
View File

@@ -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,9 +11,12 @@ 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"
# 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"
@@ -96,4 +99,3 @@ elif [ "$os" == "macos-universal" ]; then
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
fi