Skip to content

Update internal LibTIFF dependency to 4.7.0 #90

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

Merged
hattne merged 1 commit into from
Jun 20, 2025
Merged

Update internal LibTIFF dependency to 4.7.0 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 8 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ fetchcontent_declare(pcre2
URL_HASH MD5=88fe01e3f2ec144912ebecf7ef5cd595)

fetchcontent_declare(tiff
URL "http://downloads.sf.net/cbflib/tiff-4.0.6_rev_3Nov16.tar.gz"
URL_HASH MD5=594d1811ce715f7d5ec586bf5e0c4732)
URL "https://download.osgeo.org/libtiff/tiff-4.7.0.tar.gz"
URL_HASH MD5=3a0fa4a270a4a192b08913f88d0cfbdd)


#
Expand Down Expand Up @@ -630,26 +630,22 @@ set(CBF_WITH_LIBTIFF ON CACHE BOOL
mark_as_advanced(CBF_WITH_LIBTIFF)

if(CBF_WITH_LIBTIFF)
# The first LibTIFF at https://gitlab.com/libtiff/libtiff with
# The first LibTIFF at https://download.osgeo.org/libtiff with
# native CMake support seems to be 4.0.5. The first version that
# builds on current MSYS2 is 4.0.9.
#
# 4.0.3-rev-29Sep13 appears to have CMakeLists.txt patched in but
# fails on MSYS2: multiple definition of ua_wcsicmp.
#
# 4.0.6_rev_3Nov16 fails on MSYS2: _FILE_OFFSET_BITS not defined
#
# 4.0.8 fails on MSYS2: _FILE_OFFSET_BITS
set(tiff-contrib OFF CACHE INTERNAL "Build TIFF contrib")
set(tiff-docs OFF CACHE INTERNAL "Build TIFF documentation")
set(tiff-tests OFF CACHE INTERNAL "Build TIFF tests")
set(tiff-tools OFF CACHE INTERNAL "Build TIFF tools")
fetchcontent_makeavailable(tiff)


# Always use tiffconf.h and tiffio.h from ${tiff_BUILD_DIR}/libtiff
# and ${tiff_SOURCE_DIR}/libtiff, respectively, rather than
# system-supplied headers.
target_include_directories(tiff PUBLIC
"$<BUILD_INTERFACE:${tiff_BINARY_DIR}/libtiff>"
"$<BUILD_INTERFACE:${tiff_SOURCE_DIR}/libtiff>")

else()
# find_package(TIFF) appears to miss the dependencies (Lerc, jbig,
# etc) for a static LibTIFF. pkg_check_modules(... IMPORTED_TARGET
Expand All @@ -661,7 +657,7 @@ else()
# cmake_pkg_config(), because e.g. Debian does not ship CMake config
# files in their dev packages.
find_package(PkgConfig REQUIRED)
pkg_check_modules(tiff REQUIRED IMPORTED_TARGET libtiff-4)
pkg_check_modules(tiff REQUIRED IMPORTED_TARGET libtiff-4>=4.0.10)
add_library(tiff ALIAS PkgConfig::tiff)
endif()

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ endif
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF ?= tiff-4.0.6_rev_3Nov16
TIFF ?= tiff-4.7.0
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL

Expand Down Expand Up @@ -782,7 +782,7 @@ PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
endif
REGEX_URL ?= https://github.com/PCRE2Project/pcre2/releases/download/$(REGEX)/$(REGEX).tar.gz
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
TIFF_URL ?= https://download.osgeo.org/libtiff/$(TIFF).tar.gz
HDF5_URL ?= https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/$(HDF5).tar.gz
ifneq ($(CBFLIB_DONT_USE_LOCAL_NUWEB),yes)
NUWEB_URL ?= http://downloads.sf.net/cbflib/$(NUWEB_DEP).tar.gz
Expand Down
4 changes: 2 additions & 2 deletions Makefile_LINUX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ endif
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF ?= tiff-4.0.6_rev_3Nov16
TIFF ?= tiff-4.7.0
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL

Expand Down Expand Up @@ -778,7 +778,7 @@ PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
endif
REGEX_URL ?= https://github.com/PCRE2Project/pcre2/releases/download/$(REGEX)/$(REGEX).tar.gz
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
TIFF_URL ?= https://download.osgeo.org/libtiff/$(TIFF).tar.gz
HDF5_URL ?= https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/$(HDF5).tar.gz
ifneq ($(CBFLIB_DONT_USE_LOCAL_NUWEB),yes)
NUWEB_URL ?= http://downloads.sf.net/cbflib/$(NUWEB_DEP).tar.gz
Expand Down
4 changes: 2 additions & 2 deletions Makefile_MINGW
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ endif
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF ?= tiff-4.0.6_rev_3Nov16
TIFF ?= tiff-4.7.0
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL

Expand Down Expand Up @@ -792,7 +792,7 @@ PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
endif
REGEX_URL ?= https://github.com/PCRE2Project/pcre2/releases/download/$(REGEX)/$(REGEX).tar.gz
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
TIFF_URL ?= https://download.osgeo.org/libtiff/$(TIFF).tar.gz
HDF5_URL ?= https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/$(HDF5).tar.gz
ifneq ($(CBFLIB_DONT_USE_LOCAL_NUWEB),yes)
NUWEB_URL ?= http://downloads.sf.net/cbflib/$(NUWEB_DEP).tar.gz
Expand Down
4 changes: 2 additions & 2 deletions Makefile_MSYS2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ endif
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF ?= tiff-4.0.6_rev_3Nov16
TIFF ?= tiff-4.7.0
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL

Expand Down Expand Up @@ -777,7 +777,7 @@ PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
endif
REGEX_URL ?= https://github.com/PCRE2Project/pcre2/releases/download/$(REGEX)/$(REGEX).tar.gz
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
TIFF_URL ?= https://download.osgeo.org/libtiff/$(TIFF).tar.gz
HDF5_URL ?= https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/$(HDF5).tar.gz
ifneq ($(CBFLIB_DONT_USE_LOCAL_NUWEB),yes)
NUWEB_URL ?= http://downloads.sf.net/cbflib/$(NUWEB_DEP).tar.gz
Expand Down
4 changes: 2 additions & 2 deletions Makefile_OSX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ endif
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF ?= tiff-4.0.6_rev_3Nov16
TIFF ?= tiff-4.7.0
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL

Expand Down Expand Up @@ -776,7 +776,7 @@ PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
endif
REGEX_URL ?= https://github.com/PCRE2Project/pcre2/releases/download/$(REGEX)/$(REGEX).tar.gz
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
TIFF_URL ?= https://download.osgeo.org/libtiff/$(TIFF).tar.gz
HDF5_URL ?= https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/$(HDF5).tar.gz
ifneq ($(CBFLIB_DONT_USE_LOCAL_NUWEB),yes)
NUWEB_URL ?= http://downloads.sf.net/cbflib/$(NUWEB_DEP).tar.gz
Expand Down
4 changes: 2 additions & 2 deletions m4/Makefile.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ endif
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF ?= tiff-4.0.6_rev_3Nov16
TIFF ?= tiff-4.7.0
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL

Expand Down Expand Up @@ -1151,7 +1151,7 @@ PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
endif
REGEX_URL ?= https://github.com/PCRE2Project/pcre2/releases/download/$(REGEX)/$(REGEX).tar.gz
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
TIFF_URL ?= https://download.osgeo.org/libtiff/$(TIFF).tar.gz
HDF5_URL ?= https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/$(HDF5).tar.gz
ifneq ($(CBFLIB_DONT_USE_LOCAL_NUWEB),yes)
NUWEB_URL ?= http://downloads.sf.net/cbflib/$(NUWEB_DEP).tar.gz
Expand Down