From c77c2f629dd522aaee8bdb6886abe9e345268798 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Thu, 8 Aug 2024 18:43:04 +0200 Subject: [PATCH] Update FFmpeg version to n7.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-127868 Pick-to: 6.5 Change-Id: I95f8f021cd23fdb35eb171d4609bf204878e105d Reviewed-by: Jøger Hansegård (cherry picked from commit f2535cdcef4db10f1e10785ac53d3cfae570873c) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2007bdb63498ca840055b2c49d91c33c2521f781) Reviewed-by: Artem Dyomin --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- coin/provisioning/common/unix/install-ffmpeg.sh | 4 ++-- coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 3c18ab7e..8cca2d63 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.1" +version="n7.0.2" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="6bfb65c18516e95249942f34ef664c94c0768722" +sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 84245568..85328dd5 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.1" +version="n7.0.2" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="6bfb65c18516e95249942f34ef664c94c0768722" +sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" 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 5c58b55e..d45fda55 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -6,9 +6,9 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version="n7.0.1" +$version="n7.0.2" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="6bfb65c18516e95249942f34ef664c94c0768722" +$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version"