From 48ea5892d20f0695df102e409ad4f44a9e4ad832 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Mon, 10 Oct 2022 22:40:12 +0200 Subject: [PATCH] bump dependencies --- recipes/opencv/2.x/conanfile.py | 6 +++--- recipes/opencv/3.x/conanfile.py | 16 ++++++++-------- recipes/opencv/4.x/conanfile.py | 24 ++++++++++++------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/recipes/opencv/2.x/conanfile.py b/recipes/opencv/2.x/conanfile.py index 49082ca596f055..175420ede91f73 100644 --- a/recipes/opencv/2.x/conanfile.py +++ b/recipes/opencv/2.x/conanfile.py @@ -76,15 +76,15 @@ def configure(self): def requirements(self): self.requires("zlib/1.2.12") if self.options.with_jpeg: - self.requires("libjpeg/9d") + self.requires("libjpeg/9e") if self.options.with_png: - self.requires("libpng/1.6.37") + self.requires("libpng/1.6.38") if self.options.with_jasper: self.requires("jasper/2.0.33") if self.options.with_openexr: self.requires("openexr/2.5.7") if self.options.with_tiff: - self.requires("libtiff/4.3.0") + self.requires("libtiff/4.4.0") if self.options.with_eigen: self.requires("eigen/3.4.0") if self.options.with_tbb: diff --git a/recipes/opencv/3.x/conanfile.py b/recipes/opencv/3.x/conanfile.py index aa96384d550724..93b2622292a642 100644 --- a/recipes/opencv/3.x/conanfile.py +++ b/recipes/opencv/3.x/conanfile.py @@ -84,28 +84,28 @@ def configure(self): def requirements(self): self.requires("zlib/1.2.12") if self.options.with_jpeg == "libjpeg": - self.requires("libjpeg/9d") + self.requires("libjpeg/9e") elif self.options.with_jpeg == "libjpeg-turbo": - self.requires("libjpeg-turbo/2.1.2") + self.requires("libjpeg-turbo/2.1.4") if self.options.with_png: - self.requires("libpng/1.6.37") + self.requires("libpng/1.6.38") if self.options.with_jasper: self.requires("jasper/2.0.33") if self.options.with_openexr: self.requires("openexr/2.5.7") if self.options.with_tiff: - self.requires("libtiff/4.3.0") + self.requires("libtiff/4.4.0") if self.options.with_eigen: self.requires("eigen/3.3.9") if self.options.parallel == "tbb": self.requires("onetbb/2020.3") if self.options.with_webp: - self.requires("libwebp/1.2.2") + self.requires("libwebp/1.2.4") if self.options.contrib: - self.requires("freetype/2.11.1") - self.requires("harfbuzz/3.2.0") + self.requires("freetype/2.12.1") + self.requires("harfbuzz/5.3.0") self.requires("gflags/2.2.2") - self.requires("glog/0.5.0") + self.requires("glog/0.6.0") if self.options.get_safe("with_gtk"): self.requires("gtk/system") diff --git a/recipes/opencv/4.x/conanfile.py b/recipes/opencv/4.x/conanfile.py index dc6c82ea44df3d..6f6d6d31aeb8f3 100644 --- a/recipes/opencv/4.x/conanfile.py +++ b/recipes/opencv/4.x/conanfile.py @@ -123,7 +123,7 @@ def _has_with_ffmpeg_option(self): @property def _protobuf_version(self): - return "protobuf/3.17.1" + return "protobuf/3.21.4" def export_sources(self): self.copy("CMakeLists.txt") @@ -178,35 +178,35 @@ def configure(self): def requirements(self): self.requires("zlib/1.2.12") if self.options.with_jpeg == "libjpeg": - self.requires("libjpeg/9d") + self.requires("libjpeg/9e") elif self.options.with_jpeg == "libjpeg-turbo": - self.requires("libjpeg-turbo/2.1.2") + self.requires("libjpeg-turbo/2.1.4") if self.options.get_safe("with_jpeg2000") == "jasper": self.requires("jasper/2.0.33") elif self.options.get_safe("with_jpeg2000") == "openjpeg": - self.requires("openjpeg/2.4.0") + self.requires("openjpeg/2.5.0") if self.options.with_png: - self.requires("libpng/1.6.37") + self.requires("libpng/1.6.38") if self.options.with_openexr: self.requires("openexr/2.5.7") if self.options.get_safe("with_tiff"): - self.requires("libtiff/4.3.0") + self.requires("libtiff/4.4.0") if self.options.with_eigen: self.requires("eigen/3.3.9") if self.options.get_safe("with_ffmpeg"): - self.requires("ffmpeg/4.4") + self.requires("ffmpeg/5.0") if self.options.parallel == "tbb": self.requires("onetbb/2020.3") if self.options.with_ipp == "intel-ipp": self.requires("intel-ipp/2020") if self.options.with_webp: - self.requires("libwebp/1.2.2") + self.requires("libwebp/1.2.4") if self.options.get_safe("contrib_freetype"): - self.requires("freetype/2.11.1") - self.requires("harfbuzz/3.2.0") + self.requires("freetype/2.12.1") + self.requires("harfbuzz/5.3.0") if self.options.get_safe("contrib_sfm"): self.requires("gflags/2.2.2") - self.requires("glog/0.5.0") + self.requires("glog/0.6.0") if self.options.with_quirc: self.requires("quirc/1.1") if self.options.get_safe("with_gtk"): @@ -214,7 +214,7 @@ def requirements(self): if self.options.dnn: self.requires(self._protobuf_version) if self.options.with_ade: - self.requires("ade/0.1.1f") + self.requires("ade/0.1.2a") def validate(self): if self.options.shared and self._is_msvc and "MT" in msvc_runtime_flag(self):