From 6c486f07f2da8a8f05cb75c6ac660de3d347fa81 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 5 Apr 2022 10:15:44 +0200 Subject: [PATCH] CI Win FFmpeg: use MSYS2 pkg instead of ext. build 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 --- .github/scripts/Windows/prepare_msys.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index cee915e93..950b67b83 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -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 )