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.

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

gdk-pixbuf: use libpng version range, bump deps, fix conflicts #23143

Merged
merged 10 commits into from
Aug 21, 2024
12 changes: 6 additions & 6 deletions recipes/gdk-pixbuf/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("glib/2.78.1", transitive_headers=True, transitive_libs=True)
self.requires("glib/2.78.3", transitive_headers=True, transitive_libs=True)
if self.options.with_libpng:
self.requires("libpng/1.6.40")
self.requires("libpng/[>=1.6 <2]")
if self.options.with_libtiff:
self.requires("libtiff/4.6.0")
if self.options.with_libjpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/3.0.1")
self.requires("libjpeg-turbo/3.0.2")
elif self.options.with_libjpeg == "libjpeg":
self.requires("libjpeg/9e")
elif self.options.with_libjpeg == "mozjpeg":
self.requires("mozjpeg/4.1.3")
self.requires("mozjpeg/4.1.5")

def validate(self):
if self.options.shared and not self.dependencies["glib"].options.shared:
Expand All @@ -86,12 +86,12 @@ def validate(self):
)

def build_requirements(self):
self.tool_requires("meson/1.2.3")
self.tool_requires("meson/1.3.0")
# FIXME: unify libgettext and gettext??
# INFO: gettext provides msgfmt, which is required to build the .mo files
self.tool_requires("gettext/0.21")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.0.3")
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("glib/<host_version>")
if self.options.with_introspection:
self.tool_requires("gobject-introspection/1.72.0")
Expand Down
Loading