From 213bc668f39d3aba203a9cdcd5865ea49b6ca74a Mon Sep 17 00:00:00 2001 From: Stella Smith Date: Fri, 22 Mar 2024 19:11:09 -0300 Subject: [PATCH 1/2] bump libtiff dependencies --- recipes/libtiff/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libtiff/all/conanfile.py b/recipes/libtiff/all/conanfile.py index d4918b7ef9fb6..e7c9ec4441a98 100644 --- a/recipes/libtiff/all/conanfile.py +++ b/recipes/libtiff/all/conanfile.py @@ -67,7 +67,7 @@ def requirements(self): if self.options.libdeflate: self.requires("libdeflate/1.19") if self.options.lzma: - self.requires("xz_utils/5.4.5") + self.requires("xz_utils/5.6.1") if self.options.jpeg == "libjpeg": self.requires("libjpeg/9e") elif self.options.jpeg == "libjpeg-turbo": From 75d4b79ccbfda089bc97d48f091cf39701ed526f Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 22 Nov 2024 13:25:33 +0100 Subject: [PATCH 2/2] Use version ranges for xz_utils --- recipes/libtiff/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libtiff/all/conanfile.py b/recipes/libtiff/all/conanfile.py index e7c9ec4441a98..52a5afb9847a5 100644 --- a/recipes/libtiff/all/conanfile.py +++ b/recipes/libtiff/all/conanfile.py @@ -67,7 +67,7 @@ def requirements(self): if self.options.libdeflate: self.requires("libdeflate/1.19") if self.options.lzma: - self.requires("xz_utils/5.6.1") + self.requires("xz_utils/[>=5.4.5 <6]") if self.options.jpeg == "libjpeg": self.requires("libjpeg/9e") elif self.options.jpeg == "libjpeg-turbo":