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.

Sign up for GitHub

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

itk: security, conflicts, use libpng version range, bump deps #23135

Merged
merged 11 commits into from
Aug 23, 2024
Merged

itk: security, conflicts, use libpng version range, bump deps #23135

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9ede96a
itk: use libpng version range, bump deps
mayeut Mar 17, 2024
7eecc75
Merge branch 'master' into itk-bump-deps
mayeut Mar 20, 2024
8b8899b
Merge branch 'master' into itk-bump-deps
mayeut Apr 13, 2024
1ee008a
itk: bump deps
mayeut Apr 13, 2024
3c77f37
bump expat
mayeut Apr 13, 2024
5d70ee8
use version range for expat
mayeut Apr 15, 2024
c1fd28f
Merge branch 'master' into itk-bump-deps
mayeut Apr 17, 2024
ee3d834
Merge branch 'master' into itk-bump-deps
mayeut Apr 18, 2024
925ef9e
Merge branch 'master' into itk-bump-deps
mayeut May 7, 2024
53bf664
Merge branch 'master' into itk-bump-deps
AbrilRBS Aug 14, 2024
badb887
Validate out macos compilation for old versions, see https://discours…
AbrilRBS Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions recipes/itk/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ def requirements(self):
#self.requires("dcmtk/3.6.7")
self.requires("double-conversion/3.3.0")
self.requires("eigen/3.4.0")
self.requires("expat/2.5.0")
self.requires("expat/[>=2.6.2 <3]")
self.requires("fftw/3.3.10")
self.requires("gdcm/3.0.21")
self.requires("hdf5/1.14.1")
self.requires("gdcm/3.0.23")
self.requires("hdf5/1.14.3")
self.requires("libjpeg/9e")
self.requires("libpng/1.6.40")
self.requires("libtiff/4.5.1")
self.requires("openjpeg/2.5.0")
self.requires("libpng/[>=1.6 <2]")
self.requires("libtiff/4.6.0")
self.requires("openjpeg/2.5.2")
self.requires("onetbb/2021.9.0")
self.requires("zlib/[>=1.2.11 <2]")

Expand All @@ -93,6 +93,9 @@ def validate(self):
raise ConanInvalidConfiguration(
f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
)
if Version(self.version) < "5.2" and self.settings.os == "Macos":
raise ConanInvalidConfiguration(f"{self.ref} fails to compile in {self.settings.os}, fixed in 5.2.0")


def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
Loading