lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-10 17:06:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use single installation archive for FFmpeg provisioning on all platforms

Browse Source 
Fixes: QTBUG-125955
Pick-to: 6.8
Change-Id: Ibfa97e3d765eb3c4ff5613004bc881e49ddf10e9
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
This commit is contained in:
Pavel Dubsky
2024-06-26 00:21:07 +02:00
parent 5207b5eafa
commit 49c03849e3
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n7.0"
sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
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"

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

@@ -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"

14
coin/provisioning/common/windows/install-ffmpeg.ps1
View File

@@ -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
function GetFfmpegDefaultConfiguration {