From 1f206b91fa92d86339236f002a81d06e16d3cc19 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 13 Apr 2024 10:20:31 +0200 Subject: [PATCH 1/3] gdcm: bump deps fix conflict with opencv --- recipes/gdcm/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/gdcm/all/conanfile.py b/recipes/gdcm/all/conanfile.py index 5a0b267df427d..88af580126ae8 100644 --- a/recipes/gdcm/all/conanfile.py +++ b/recipes/gdcm/all/conanfile.py @@ -57,8 +57,8 @@ def layout(self): def requirements(self): self.requires("charls/2.4.2") - self.requires("expat/2.5.0") - self.requires("openjpeg/2.5.0") + self.requires("expat/2.6.0") + self.requires("openjpeg/2.5.2") if self.options.with_zlibng: self.requires("zlib-ng/2.1.6") else: From b54631b4903e2f01018f0d4a12c9e3277408cf80 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 13 Apr 2024 13:00:42 +0200 Subject: [PATCH 2/3] bump expat --- recipes/gdcm/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gdcm/all/conanfile.py b/recipes/gdcm/all/conanfile.py index 88af580126ae8..360d1dd4c6dae 100644 --- a/recipes/gdcm/all/conanfile.py +++ b/recipes/gdcm/all/conanfile.py @@ -57,7 +57,7 @@ def layout(self): def requirements(self): self.requires("charls/2.4.2") - self.requires("expat/2.6.0") + self.requires("expat/2.6.2") self.requires("openjpeg/2.5.2") if self.options.with_zlibng: self.requires("zlib-ng/2.1.6") From 3f31def72ac37eadb526e9c909cba86828a46b19 Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 15 Apr 2024 21:04:23 +0200 Subject: [PATCH 3/3] use version range for expat --- recipes/gdcm/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gdcm/all/conanfile.py b/recipes/gdcm/all/conanfile.py index 360d1dd4c6dae..226e90aa0ee71 100644 --- a/recipes/gdcm/all/conanfile.py +++ b/recipes/gdcm/all/conanfile.py @@ -57,7 +57,7 @@ def layout(self): def requirements(self): self.requires("charls/2.4.2") - self.requires("expat/2.6.2") + self.requires("expat/[>=2.6.2 <3]") self.requires("openjpeg/2.5.2") if self.options.with_zlibng: self.requires("zlib-ng/2.1.6")