mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Fix ffmpeg build on windows CI
Ffmpeg was not compiled because of failed yasm installation on msys2. The installation failed due to checking pgp signatures. Current fix adds keys refreshing that fixes the problem (checked on CI and on local machine) Note, currently the ffmpeg build works with msvc and mingw, additional settings for llvm should be added in next commits. Build example: https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085 Pick-to: 6.4 Change-Id: Iff305e896bfb382c0c4030235cc2ad942cbbc002 Reviewed-by: Lars Knoll <lars@knoll.priv.no>
This commit is contained in:
@@ -71,7 +71,7 @@ if ((Test-Path $url_cache_prebuilt)) {
|
||||
|
||||
# install perl make and yasm
|
||||
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
|
||||
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make yasm`""
|
||||
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm perl make yasm`""
|
||||
Start-Sleep -s 60
|
||||
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user