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: bump dependencies #13906

Merged
merged 2 commits into from
Nov 11, 2022
Merged

ffmpeg: bump dependencies #13906

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
805db8f
bump dependencies
SpaceIm Oct 31, 2022
4ba3165
bump openssl
SpaceIm Nov 2, 2022
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
14 changes: 7 additions & 7 deletions recipes/ffmpeg/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def configure(self):

def requirements(self):
if self.options.with_zlib:
self.requires("zlib/1.2.12")
self.requires("zlib/1.2.13")
if self.options.with_bzip2:
self.requires("bzip2/1.0.8")
if self.options.with_lzma:
Expand All @@ -273,9 +273,9 @@ def requirements(self):
if self.options.with_zeromq:
self.requires("zeromq/4.3.4")
if self.options.with_sdl:
self.requires("sdl/2.0.20")
self.requires("sdl/2.24.1")
if self.options.with_libx264:
self.requires("libx264/20191217")
self.requires("libx264/cci.20220602")
if self.options.with_libx265:
self.requires("libx265/3.4")
if self.options.with_libvpx:
Expand All @@ -285,9 +285,9 @@ def requirements(self):
if self.options.with_libfdk_aac:
self.requires("libfdk_aac/2.0.2")
if self.options.with_libwebp:
self.requires("libwebp/1.2.3")
self.requires("libwebp/1.2.4")
if self.options.with_ssl == "openssl":
self.requires("openssl/1.1.1q")
self.requires("openssl/1.1.1s")
if self.options.get_safe("with_libalsa"):
self.requires("libalsa/1.2.7.2")
if self.options.get_safe("with_xcb") or self.options.get_safe("with_vaapi"):
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.221")
self.requires("vulkan-loader/1.3.231.1")

def validate(self):
if self.options.with_ssl == "securetransport" and not is_apple_os(self):
Expand All @@ -319,7 +319,7 @@ def validate(self):
def build_requirements(self):
if self.settings.arch in ("x86", "x86_64"):
self.build_requires("yasm/1.3.0")
self.build_requires("pkgconf/1.7.4")
self.build_requires("pkgconf/1.9.3")
if self._settings_build.os == "Windows" and not tools.get_env("CONAN_BASH_PATH"):
self.build_requires("msys2/cci.latest")

Expand Down