From 14a3750ee5d892bc5c55744b1f433e1abe34bd0b Mon Sep 17 00:00:00 2001 From: Tejas Date: Fri, 29 Mar 2024 22:34:44 -0700 Subject: [PATCH] Build ffmpeg for windows using Universal CRT runtime. --- .github/workflows/build-ffmpeg.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 0303b2b8a..b63be775e 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -271,6 +271,7 @@ jobs: if: ${{ matrix.os_type == 'windows' }} uses: msys2/setup-msys2@v2 with: + msystem: ucrt64 update: true install: >- wget @@ -280,19 +281,19 @@ jobs: shell: msys2 {0} run: | # download working binutils - wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.40-4-any.pkg.tar.zst + wget https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-binutils-2.40-4-any.pkg.tar.zst # install dependencies - pacman -U --noconfirm mingw-w64-x86_64-binutils-2.40-4-any.pkg.tar.zst - pacman -Syu --noconfirm --ignore=mingw-w64-x86_64-binutils \ + pacman -U --noconfirm mingw-w64-ucrt-x86_64-binutils-2.40-4-any.pkg.tar.zst + pacman -Syu --noconfirm --ignore=mingw-w64-ucrt-x86_64-binutils \ diffutils \ git \ make \ pkg-config \ - mingw-w64-x86_64-cmake \ - mingw-w64-x86_64-gcc \ - mingw-w64-x86_64-onevpl \ - mingw-w64-x86_64-nasm + mingw-w64-ucrt-x86_64-cmake \ + mingw-w64-ucrt-x86_64-gcc \ + mingw-w64-ucrt-x86_64-onevpl \ + mingw-w64-ucrt-x86_64-nasm - name: Initialize Submodules # libx265 has issues when using the recursive method of the first checkout action