scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 14:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI Win FFmpeg: use MSYS2 pkg instead of ext. build

Browse Source 
Use MSYS2 version instead of external builds from gyan.net. FFmpeg gets
installed as a dependency anyway and this causes crashes because of
binary incompatibility between those two. See failed run:

https://github.com/CESNET/UltraGrid/actions/runs/2076078289
This commit is contained in:
Martin Pulec
2022-04-05 10:15:44 +02:00
parent 6649f88416
commit 6c486f07f2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/scripts/Windows/prepare_msys.sh vendored
View File

@@ -38,6 +38,7 @@ PACMAN_INSTALL='pacman -Sy --needed --noconfirm --disable-download-timeout'
# Install MSYS2 packages
MSYS_REPO=mingw-w64-clang-x86_64
$PACMAN_INSTALL automake autoconf git make pkgconf ${MSYS_REPO}-toolchain ${MSYS_REPO}-cppunit unzip zip
$PACMAN_INSTALL ${MSYS_REPO}-ffmpeg
$PACMAN_INSTALL ${MSYS_REPO}-speexdsp
$PACMAN_INSTALL ${MSYS_REPO}-glew ${MSYS_REPO}-SDL2 ${MSYS_REPO}-SDL2_mixer ${MSYS_REPO}-SDL2_ttf ${MSYS_REPO}-freeglut
$PACMAN_INSTALL ${MSYS_REPO}-glm
@@ -89,9 +90,6 @@ $GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh
$GITHUB_WORKSPACE/.github/scripts/Windows/install_natpmp.sh
$GITHUB_WORKSPACE/.github/scripts/Windows/install_spout.sh
# Install FFMPEG
wget --no-verbose https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z && 7z x ffmpeg-release-full-shared.7z && cp -r ffmpeg-*build-shared/{bin,lib,include} /usr/local && rm -rf ffmpeg-* || exit 1
# Install GPUJPEG
( wget --no-verbose https://github.com/CESNET/GPUJPEG/releases/download/continuous/GPUJPEG.zip && unzip GPUJPEG.zip && cp -r GPUJPEG/* /usr/local || exit 1 )