From 32c928cd80a37ac0d05162b0e3883d1930dba974 Mon Sep 17 00:00:00 2001
From: Pavel Dubsky <pavel.dubsky@qt.io>
Date: Wed, 26 Jun 2024 00:21:07 +0200
Subject: [PATCH] Use single installation archive for FFmpeg provisioning on
 all platforms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: QTBUG-125955
Pick-to: 6.5
Change-Id: Ibfa97e3d765eb3c4ff5613004bc881e49ddf10e9
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 49c03849e33581fb9a9edf47a23606abbf78a9d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 66bcdbd0b375a80a55213248938c1e28b498568b)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
---
 coin/provisioning/common/unix/install-ffmpeg.sh    |  2 +-
 .../provisioning/common/windows/install-ffmpeg.ps1 | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh
index 980f6daf..b78a5da2 100755
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -12,7 +12,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="n7.0"
-url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
+url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
 sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1
index a4f08bc3..9ce1b10e 100644
--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -6,20 +6,20 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
 
-$version = "n7.0"
-$ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843"
+$version="n7.0"
+$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+$sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
+$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
+$ffmpeg_name="FFmpeg-$version"
 
-$url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip"
-$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
-$download_location = "C:\Windows\Temp\" + $ffmpeg_name + ".zip"
+$download_location = "C:\Windows\Temp\$ffmpeg_name.tar.gz"
 $unzip_location = "C:\"
 
 Write-Host "Fetching FFmpeg $version..."
 
 Download $url_public $url_cached $download_location
 Verify-Checksum $download_location $sha1
-Extract-7Zip $download_location $unzip_location
+Extract-tar_gz $download_location $unzip_location
 Remove $download_location
 
 $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"