From 19454cbffd6c71fbaf30929b5635c9a427aac5aa Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Thu, 26 Oct 2023 06:58:01 +0000
Subject: [PATCH] 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>
---
 .../common/unix/install-ffmpeg.sh             | 53 ++++---------------
 1 file changed, 9 insertions(+), 44 deletions(-)

diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh
index 5d093db3..73204429 100755
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -1,43 +1,6 @@
 #!/usr/bin/env bash
-
-############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# 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
 set -ex
@@ -48,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"
@@ -132,4 +98,3 @@ elif [ "$os" == "macos-universal" ]; then
   SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
 
 fi
-