From 8d8d3116f1a78926c7da545e83ae96c656df6cc6 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Wed, 3 Aug 2022 18:08:51 +0200 Subject: [PATCH 1/4] [ffmpeg/5.1] Add version --- recipes/ffmpeg/all/conandata.yml | 3 +++ recipes/ffmpeg/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/ffmpeg/all/conandata.yml b/recipes/ffmpeg/all/conandata.yml index 13f029f130a72..8386cd3bd7bca 100644 --- a/recipes/ffmpeg/all/conandata.yml +++ b/recipes/ffmpeg/all/conandata.yml @@ -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" diff --git a/recipes/ffmpeg/config.yml b/recipes/ffmpeg/config.yml index bd4009285d1b8..c829a400b90aa 100644 --- a/recipes/ffmpeg/config.yml +++ b/recipes/ffmpeg/config.yml @@ -1,4 +1,6 @@ versions: + "5.1": + folder: "all" "5.0": folder: "all" "4.4.3": From bc337ef6503c3aa69e2504032b2ed5eca8ade33f Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Thu, 4 Aug 2022 00:20:58 +0200 Subject: [PATCH 2/4] Don't patch libx264.c from 5.1 --- recipes/ffmpeg/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ffmpeg/all/conanfile.py b/recipes/ffmpeg/all/conanfile.py index 2c5c98eb34d40..a10ab03826d05 100644 --- a/recipes/ffmpeg/all/conanfile.py +++ b/recipes/ffmpeg/all/conanfile.py @@ -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 tools.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 From 54e8ec7b32c9dd70a7e3aed183f4026d88e70b55 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sat, 31 Dec 2022 15:50:02 +0100 Subject: [PATCH 3/4] Bump sdl and vulkan-loader --- recipes/ffmpeg/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ffmpeg/all/conanfile.py b/recipes/ffmpeg/all/conanfile.py index a10ab03826d05..b2e69e9a2bf46 100644 --- a/recipes/ffmpeg/all/conanfile.py +++ b/recipes/ffmpeg/all/conanfile.py @@ -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: @@ -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): From 5eb8f4453f87bc7296e6e18cb89948d8c955590d Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Fri, 17 Feb 2023 10:04:09 +0100 Subject: [PATCH 4/4] Update recipes/ffmpeg/all/conanfile.py Co-authored-by: Chris Mc --- recipes/ffmpeg/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ffmpeg/all/conanfile.py b/recipes/ffmpeg/all/conanfile.py index b2e69e9a2bf46..dd365dc6cfc3d 100644 --- a/recipes/ffmpeg/all/conanfile.py +++ b/recipes/ffmpeg/all/conanfile.py @@ -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 and tools.Version(self.version) <= "5.0": + 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