From 241f9d215ab5f8c41a795c45572a736b1452619d Mon Sep 17 00:00:00 2001 From: Gustav Grusell Date: Sat, 21 Sep 2024 13:25:31 +0200 Subject: [PATCH] chore: use ffmpeg 7.0.2 for windows build Signed-off-by: Gustav Grusell --- .github/workflows/windows-build.yml | 7 ++++--- meson.build | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 8e4150f..bacd108 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -28,8 +28,9 @@ jobs: 7z x SDL2-devel-2.26.5-VC.zip -owinlibs curl https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.20.2-VC.zip -o SDL2_ttf-devel-2.20.2-VC.zip 7z x SDL2_ttf-devel-2.20.2-VC.zip -owinlibs - curl -L https://github.com/GyanD/codexffmpeg/releases/download/5.1.2/ffmpeg-5.1.2-full_build-shared.7z -o ffmpeg-5.1.2-full_build-shared.7z - 7z x ffmpeg-5.1.2-full_build-shared.7z -owinlibs + curl -L https://github.com/GyanD/codexffmpeg/releases/download/7.0.2/ffmpeg-7.0.2-full_build-shared.7z \ + -o ffmpeg-7.0.2-full_build-shared.7z + 7z x ffmpeg-7.0.2-full_build-shared.7z -owinlibs - name: Cache dependencies id: cache-dependencies-save if: steps.cache-dependencies-restore.outputs.cache-hit != 'true' @@ -44,4 +45,4 @@ jobs: with: action: build meson-version: 0.63.1 - setup-options: -Dbuildtype=release \ No newline at end of file + setup-options: -Dbuildtype=release diff --git a/meson.build b/meson.build index 93e1e37..1302761 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ if build_machine.system() == 'windows' # https://libsdl.org/release/SDL2-devel-2.26.5-VC.zip # https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.20.2-VC.zip -# https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-5.1.2-full_build-shared.7z +# https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-7.0.2-full_build-shared.7z cc = meson.get_compiler('cpp') @@ -34,7 +34,7 @@ if build_machine.system() == 'windows' sdl2_ttf_dir = meson.source_root() / 'winlibs' / 'SDL2_ttf-2.20.2' sdl2_ttf_dep = cc.find_library('sdl2_ttf', dirs: [sdl2_ttf_dir / 'lib' / 'x64']) - ffmpeg_dir = meson.source_root() / 'winlibs' / 'ffmpeg-5.1.2-full_build-shared' + ffmpeg_dir = meson.source_root() / 'winlibs' / 'ffmpeg-7.0.2-full_build-shared' # get_option('ffmpeg_install_dir') ffmpeg_inc = [ffmpeg_dir / 'include', sdl2_dir / 'include', sdl2_ttf_dir / 'include']