Skip to content

Commit

Permalink
Try to build newer ffmpeg
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanSavenko committed Aug 18, 2024
1 parent 4c52268 commit 2cc7023
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/prebuilts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
VCMI_BUILD_PLATFORM: x64

- name: Remove old packages
run: rm -rf ~/.conan/data/ffmpeg/4.4.3/_/_/package
run: rm -rf ~/.conan/data/ffmpeg

- name: Setup Python
uses: actions/setup-python@v5
Expand Down
15 changes: 9 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ def configure(self):
self.options["ffmpeg"].postproc = False
self.options["ffmpeg"].swresample = True
self.options["ffmpeg"].with_asm = False
self.options["ffmpeg"].with_libaom = False
self.options["ffmpeg"].with_libsvtav1 = False
self.options["ffmpeg"].with_libdav1d = False
self.options["ffmpeg"].with_zlib = False
self.options["ffmpeg"].with_bzip2 = False
self.options["ffmpeg"].with_lzma = False
Expand All @@ -124,7 +127,7 @@ def configure(self):
# H3:SoD - .bik and .smk
# H3:HD - ogg container / theora video / vorbis sound
# and for mods - webm container / vp8 or vp9 video / opus sound
# TODO: add av1 support for mods (likely require newer ffmpeg than 4.4.3
# TODO: add av1 support for mods (requires enabling libdav1d which currently fails to build via Conan)
self.options["ffmpeg"].enable_protocols = "file"
self.options["ffmpeg"].enable_demuxers = "bink,binka,ogg,smacker,webm_dash_manifest"
self.options["ffmpeg"].enable_parsers = "opus,vorbis,vp8,vp9,webp"
Expand All @@ -135,10 +138,10 @@ def configure(self):
self.options["ffmpeg"].with_sdl = False

#optionally, for testing - enable ffplay/ffprobe binaries in conan package:
#self.options["ffmpeg"].with_programs = True
#self.options["ffmpeg"].avfilter = True
#self.options["ffmpeg"].with_sdl = True
#self.options["ffmpeg"].enable_filters = "aresample,scale"
self.options["ffmpeg"].with_programs = True
self.options["ffmpeg"].avfilter = True
self.options["ffmpeg"].with_sdl = True
self.options["ffmpeg"].enable_filters = "aresample,scale"

self.options["sdl"].sdl2main = self.settings.os != "iOS"
self.options["sdl"].vulkan = False
Expand Down Expand Up @@ -232,7 +235,7 @@ def requirements(self):

# client
if self.options.with_ffmpeg:
self.requires("ffmpeg/[^4.4]")
self.requires("ffmpeg/[^7.0]")

# launcher
if self.settings.os == "Android":
Expand Down

0 comments on commit 2cc7023

Please sign in to comment.