search

InsightSoftwareConsortium / ITK

Insight Toolkit (ITK) -- Official Repository. ITK builds on a proven, spatially-oriented architecture for processing, segmentation, and registration of scientific images in two, three, or more dimensions.
https://itk.org
Apache License 2.0
1.43k stars 666 forks source link

Update libtiff v4.4.0 #4953

Open blowekamp opened 4 days ago

blowekamp commented 4 days ago

The third-party libtiff is rather old and out dated.

blowekamp commented 4 days ago

@dzenanz The current ITK/Modules/ThirdParty/TIFF does not have a sub-tree. How does one initialize using sub-trees and the UpdateFromUpstream infrastructure?

dzenanz commented 4 days ago

For vanilla initializing subtrees: add a remote of the library you want to add (libtiff), fetch, then merge with main repository.

For starting a new subtree using UpdateFromUpstream infrastructure: I don't know, I have never done that. I have only made changes to existing third-party libaries and their update scripts.

@bradking should be able to advise, or maybe even get it started for us?

blowekamp commented 4 days ago

For reference this was the last update to the library: 54c790a509c33b3ee176ae5bfef7292d959c3c30

There are a lot of upstream changes, and not many local changes. So starting with a fresh upstream is reasonable IMHO.

bradking commented 4 days ago

I'll take a look at importing a new tiff.

dzenanz commented 4 days ago

Linking some related and possibly related issues:

4777

2959

4102

bradking commented 3 days ago

As a first step, #4957 rebuilds the existing tiff 4.0.3 import with our modern history structure. That will make the update to a newer tiff version much easier.

hjmjohnson commented 1 day ago

FYI: Initial 10-minute attempt to update to v4.7.0. I don't have time to continue working on this at the moment.

Some file names have changed, so we need to update the updater script.

0001-ENH-Update-to-latest-v4.7.0-libtiff-codebase.patch

blowekamp commented 1 day ago

FYI: Initial 10-minute attempt to update to v4.7.0. I don't have time to continue working on this at the moment.

Some file names have changed, so we need to update the updater script.

0001-ENH-Update-to-latest-v4.7.0-libtiff-codebase.patch

Yes, lots of changes have happened in the last 10 year. They also add CMake instrastructure. I had not had the change to determine if it was usable or not yet.

bradking commented 1 day ago

For reference, VTK has imported tiff 4.6.0 and uses the upstream's CMake code with some patches.

blowekamp commented 1 day ago

These look like the changes VTK made: https://gitlab.kitware.com/third-party/tiff/-/compare/v4.6.0...for%2Fvtk-20231025-4.6.0?page=2&straight=true

It appears VTK make their third party changes in a separate repository, then form the sub-tree via a script which is then merged into the main-line of the VTK repo.

bradking commented 1 day ago

Yes, VTK's approach has the advantage that the changes from upstream are recorded independently from VTK. It has the disadvantage that an extra repository is needed with VTK-specific tags.

With the tiff 4.0.3 re-import done, I'll move on to an actual update in ITK.

blowekamp commented 22 hours ago

Yes, VTK's approach has the advantage that the changes from upstream are recorded independently from VTK. It has the disadvantage that an extra repository is needed with VTK-specific tags.

With the tiff 4.0.3 re-import done, I'll move on to an actual update in ITK.

Awesome, I just started to make changes in to libtiff library to get it to configure, but I'll leave it to you!

bradking commented 20 hours ago

@blowekamp I don't know how soon I'll be able to get to it, so if you've made progress, go ahead and continue. I can help structure the history once you have something working.