Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ffmpeg/5.1] Version bump #15830

Merged
merged 4 commits into from
Feb 20, 2023
Merged

[ffmpeg/5.1] Version bump #15830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d8d311
[ffmpeg/5.1] Add version
MartinDelille Aug 3, 2022
bc337ef
Don't patch libx264.c from 5.1
MartinDelille Aug 3, 2022
54e8ec7
Bump sdl and vulkan-loader
MartinDelille Dec 31, 2022
5eb8f44
Update recipes/ffmpeg/all/conanfile.py
MartinDelille Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/ffmpeg/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"5.1":
url: "https://ffmpeg.org/releases/ffmpeg-5.1.tar.bz2"
sha256: "32b56fb01ce90d452958ae25e91c9564abf49ed5453c127bec23c63e530aa8fa"
"5.0":
url: "https://ffmpeg.org/releases/ffmpeg-5.0.tar.bz2"
sha256: "c0130b8db2c763430fd1c6905288d61bc44ee0548ad5fcd2dfd650b88432bed9"
Expand Down
6 changes: 3 additions & 3 deletions recipes/ffmpeg/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def requirements(self):
if self.options.with_zeromq:
self.requires("zeromq/4.3.4")
if self.options.with_sdl:
self.requires("sdl/2.24.1")
self.requires("sdl/2.26.0")
if self.options.with_libx264:
self.requires("libx264/cci.20220602")
if self.options.with_libx265:
Expand All @@ -299,7 +299,7 @@ def requirements(self):
if self.options.get_safe("with_vdpau"):
self.requires("vdpau/system")
if self._version_supports_vulkan() and self.options.get_safe("with_vulkan"):
self.requires("vulkan-loader/1.3.231.1")
self.requires("vulkan-loader/1.3.236.0")

def validate(self):
if self.options.with_ssl == "securetransport" and not is_apple_os(self):
Expand Down Expand Up @@ -355,7 +355,7 @@ def _target_os(self):
return target_os

def _patch_sources(self):
if self._is_msvc and self.options.with_libx264 and not self.options["libx264"].shared:
if self._is_msvc and self.options.with_libx264 and not self.options["libx264"].shared and Version(self.version) <= "5.0":
# suppress MSVC linker warnings: https://trac.ffmpeg.org/ticket/7396
# warning LNK4049: locally defined symbol x264_levels imported
# warning LNK4049: locally defined symbol x264_bit_depth imported
Expand Down
2 changes: 2 additions & 0 deletions recipes/ffmpeg/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"5.1":
folder: "all"
"5.0":
folder: "all"
"4.4.3":
Expand Down