Skip to content

Commit 0b4f749

Browse files
authored
leptonica: use version ranges for dependencies to avoid conflicts (#28815)
* Use version ranges for leptonica dependencies Signed-off-by: Uilian Ries <[email protected]> * Add link directories for leptonica 1.82 Signed-off-by: Uilian Ries <[email protected]> --------- Signed-off-by: Uilian Ries <[email protected]>
1 parent b618986 commit 0b4f749

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

recipes/leptonica/all/conanfile.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,19 @@ def requirements(self):
7070
if self.options.with_gif:
7171
self.requires("giflib/5.2.1")
7272
if self.options.with_jpeg == "libjpeg":
73-
self.requires("libjpeg/9e")
73+
self.requires("libjpeg/[>=9e]")
7474
elif self.options.with_jpeg == "libjpeg-turbo":
75-
self.requires("libjpeg-turbo/3.0.2")
75+
self.requires("libjpeg-turbo/[>=3.0.2 <4]")
7676
elif self.options.with_jpeg == "mozjpeg":
77-
self.requires("mozjpeg/4.1.5")
77+
self.requires("mozjpeg/[>=4.1.5 <5]")
7878
if self.options.with_png:
7979
self.requires("libpng/[>=1.6 <2]")
8080
if self.options.with_tiff:
81-
self.requires("libtiff/4.6.0")
81+
self.requires("libtiff/[>=4.6.0 <5]")
8282
if self.options.with_openjpeg:
83-
self.requires("openjpeg/2.5.2")
83+
self.requires("openjpeg/[>=2.5.2 <3]")
8484
if self.options.with_webp:
85-
self.requires("libwebp/1.3.2")
85+
self.requires("libwebp/[>=1.3.2 <2]")
8686

8787
def build_requirements(self):
8888
if self.options.with_webp or self.options.with_openjpeg:
@@ -177,7 +177,7 @@ def _patch_sources(self):
177177
replace_in_file(self, cmakelists_src, "if (WEBP_FOUND)", "if(0)")
178178
replace_in_file(self, cmake_configure, "if (WEBP_FOUND)", "if(0)")
179179
if Version(self.version) < "1.85.0":
180-
if Version(self.version) >= "1.83.0" and self.options.with_webp:
180+
if self.options.with_webp:
181181
replace_in_file(self, cmakelists_src,
182182
"if (WEBP_FOUND)",
183183
"if (WEBP_FOUND)\n"

0 commit comments

Comments
 (0)