Skip to content

Commit

Permalink
chore: use ffmpeg 7.0.2 for windows build
Browse files Browse the repository at this point in the history
Signed-off-by: Gustav Grusell <[email protected]>
  • Loading branch information
grusell committed Sep 21, 2024
1 parent deb84c7 commit 241f9d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -44,4 +45,4 @@ jobs:
with:
action: build
meson-version: 0.63.1
setup-options: -Dbuildtype=release
setup-options: -Dbuildtype=release
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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']
Expand Down

0 comments on commit 241f9d2

Please sign in to comment.