From 96b569059725b7aa4416cd2e266d1fe4454f30eb Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 12 Sep 2023 23:12:57 +0300 Subject: [PATCH] gst-plugins-base: bump deps --- recipes/gst-plugins-base/all/conanfile.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/recipes/gst-plugins-base/all/conanfile.py b/recipes/gst-plugins-base/all/conanfile.py index 9330593a6958c4..63c0f09c203034 100644 --- a/recipes/gst-plugins-base/all/conanfile.py +++ b/recipes/gst-plugins-base/all/conanfile.py @@ -83,11 +83,11 @@ def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("gstreamer/1.22.3", transitive_headers=True) - self.requires("glib/2.77.2", transitive_headers=True, force=True) # FIXME: remove force - self.requires("zlib/1.2.13") + self.requires("gstreamer/1.22.6", transitive_headers=True) + self.requires("glib/2.78.3", transitive_headers=True, force=True) # FIXME: remove force + self.requires("zlib/[>=1.2.11 <2]") if self.options.get_safe("with_libalsa"): - self.requires("libalsa/1.2.7.2") + self.requires("libalsa/1.2.10") if self.options.get_safe("with_xorg"): self.requires("xorg/system", transitive_headers=True) if self.options.with_gl: @@ -99,7 +99,7 @@ def requirements(self): self.requires("egl/system", transitive_headers=True) if self.options.get_safe("with_wayland"): self.requires("wayland/1.22.0", transitive_headers=True) - self.requires("wayland-protocols/1.31") + self.requires("wayland-protocols/1.33") if self.options.with_graphene: self.requires("graphene/1.10.8") if self.options.with_libpng: @@ -107,7 +107,7 @@ def requirements(self): if self.options.with_libjpeg == "libjpeg": self.requires("libjpeg/9e") elif self.options.with_libjpeg == "libjpeg-turbo": - self.requires("libjpeg-turbo/3.0.0") + self.requires("libjpeg-turbo/3.0.2") if self.options.with_ogg: self.requires("ogg/1.3.5") if self.options.with_opus: @@ -117,7 +117,8 @@ def requirements(self): if self.options.with_vorbis: self.requires("vorbis/1.3.7") if self.options.with_pango: - self.requires("pango/1.50.14") + self.requires("pango/1.51.0") + self.requires("fontconfig/2.15.0", override=True) def validate(self): if not self.dependencies["glib"].options.shared and self.options.shared: @@ -132,11 +133,11 @@ def validate(self): raise ConanInvalidConfiguration("OpenGL support with Wayland requires 'with_egl' turned on!") def build_requirements(self): - self.tool_requires("meson/1.2.1") + self.tool_requires("meson/1.3.1") if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str): - self.tool_requires("pkgconf/1.9.5") + self.tool_requires("pkgconf/2.1.0") if self.settings.os == "Windows": - self.tool_requires("winflexbison/2.5.24") + self.tool_requires("winflexbison/2.5.25") else: self.tool_requires("bison/3.8.2") self.tool_requires("flex/2.6.4")