Skip to content

[builtins] Update libtiff to 4.7.2 #23848

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

Closed
dpiparo wants to merge 2 commits into from
Closed

[builtins] Update libtiff to 4.7.2 #23848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf71f4
[cmake] lzma, zlib, zstd, jpeg: prefixes visible in the parent scope
dpiparo Oct 27, 2026
dc6a454
[builtins] Update libtiff to 4.7.2 and simplify CMakeLists
dpiparo Oct 27, 2026
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
2 changes: 1 addition & 1 deletion README/ReleaseNotes/v642/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ The version of the following packages has been updated:
- libmathtext: 2016
- libpng: 1.6.59
- libjpeg-turbo: 3.2.0
- libtiff: 4.7.26
- libtiff: 4.7.2
- openssl: 3.5.9
- openui5: 1.152.0
- pcre: now pcre2, version 10.47
Expand Down
1 change: 1 addition & 0 deletions builtins/libjpeg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ set(JPEG_INCLUDE_DIRS ${ROOT_LIBJPEG_PREFIX}/include PARENT_SCOPE)
set(JPEG_LIBRARIES ${ROOT_LIBJPEG_LIBRARY} PARENT_SCOPE)
set(JPEG_FOUND TRUE PARENT_SCOPE)
set(JPEG_VERSION ${ROOT_LIBJPEG_VERSION} PARENT_SCOPE)
set(ROOT_LIBJPEG_PREFIX ${ROOT_LIBJPEG_PREFIX} PARENT_SCOPE)
20 changes: 6 additions & 14 deletions builtins/libtiff/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# For the list of contributors see $ROOTSYS/README/CREDITS.

# **PLEASE UPDATE ALSO THE FOLLOWING LINE WHEN UPDATING THE VERSION**
# 18 Sep 2024, https://github.com/libsdl-org/libtiff/releases/tag/v4.7.0
set(ROOT_LIBTIFF_VERSION 4.7.0)
set(ROOT_LIBTIFF_HASH "67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976")
# 3 Jul 2026, https://github.com/libsdl-org/libtiff/releases/tag/v4.7.2
set(ROOT_LIBTIFF_VERSION 4.7.2)
set(ROOT_LIBTIFF_HASH "dd030ae5d6483033bd88d840fc97e36adc3022b844d9d896a3b5a50f2d660d6f")

set(ROOT_LIBTIFF_PREFIX ${CMAKE_BINARY_DIR}/builtins/LIBTIFF-prefix)
if(MSVC)
Expand Down Expand Up @@ -39,16 +39,16 @@ if(builtin_lzma)
set(LZMA_ROOT_OPTION "-DLIBLZMA_ROOT=${ROOT_LZMA_PREFIX}")
endif()
if(builtin_jpeg)
set(JPEG_ROOT_OPTION "-DJPEG_ROOT=${ROOT_LIBJPEG_PREFIX}")
set(JPEG_ROOT_OPTION "-Dlibjpeg-turbo_ROOT=${ROOT_LIBJPEG_PREFIX}")
endif()

ExternalProject_Add(
BUILTIN_LIBTIFF
PREFIX ${ROOT_LIBTIFF_PREFIX}
URL ${lcgpackages}/tiff-${ROOT_LIBTIFF_VERSION}.tar.gz
URL https://root.cern/download/libtiff-${ROOT_LIBTIFF_VERSION}.tar.gz
URL_HASH SHA256=${ROOT_LIBTIFF_HASH}
CMAKE_ARGS -G ${CMAKE_GENERATOR}
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
-DCMAKE_POLICY_VERSION_MINIMUM=3.12
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_INSTALL_LIBDIR=<INSTALL_DIR>/lib
Expand All @@ -68,17 +68,9 @@ ExternalProject_Add(
-Dlibdeflate=OFF # if ON or unset, then you need to target link libs interface below
-Dpixarlog=OFF
-Dwebp=OFF
-DZLIB_LIBRARY=${ZLIB_LIBRARIES}
-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}
${ZLIB_ROOT_OPTION}
-DZSTD_LIBRARY=${ZSTD_LIBRARIES}
-DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIRS}
${ZSTD_ROOT_OPTION}
-DLIBLZMA_LIBRARY=${LZMA_LIBRARIES}
-DLIBLZMA_INCLUDE_DIR=${LZMA_INCLUDE_DIRS}
${LZMA_ROOT_OPTION}
-DJPEG_LIBRARY=${JPEG_LIBRARIES}
-DJPEG_INCLUDE_DIR=${JPEG_INCLUDE_DIRS}
${JPEG_ROOT_OPTION}
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_LIBTIFF_BUILD_COMMAND_FLAGS}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_LIBTIFF_BUILD_COMMAND_FLAGS} --target install
Expand Down
1 change: 1 addition & 0 deletions builtins/lzma/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ set(LIBLZMA_INCLUDE_DIRS ${LibLZMA_INCLUDE_DIR} PARENT_SCOPE)
set(LIBLZMA_LIBRARIES ${LIBLZMA_LIBRARIES} PARENT_SCOPE)
set(LibLZMA_FOUND TRUE PARENT_SCOPE)
set(LibLZMA_VERSION ${ROOT_LZMA_VERSION} PARENT_SCOPE)
set(ROOT_LZMA_PREFIX ${ROOT_LZMA_PREFIX} PARENT_SCOPE)
2 changes: 1 addition & 1 deletion builtins/zlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
set(ROOT_ZLIB_VERSION 1.3.2)
set(ROOT_ZLIB_HASH "bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16")

set(ROOT_ZLIB_PREFIX ${CMAKE_BINARY_DIR}/builtins/ZLIB-prefix PARENT_SCOPE)
set(ROOT_ZLIB_PREFIX ${CMAKE_BINARY_DIR}/builtins/ZLIB-prefix)

# Here we need two cases because the library has two different names on Linux/macOS and Windows
Expand Down Expand Up @@ -74,6 +73,7 @@ set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} PARENT_SCOPE)
set(ZLIB_LIBRARIES ${ROOT_ZLIB_LIBRARY} PARENT_SCOPE)
set(ZLIB_FOUND TRUE PARENT_SCOPE)
set(ZLIB_VERSION ${ROOT_ZLIB_VERSION} PARENT_SCOPE)
set(ROOT_ZLIB_PREFIX ${ROOT_ZLIB_PREFIX} PARENT_SCOPE)

# The following variables can be set by users to override the behaviour of FindZLIB.cmake,
# so packages executing their own find_package(ZLIB) will find the builtin library.
Expand Down
1 change: 1 addition & 0 deletions builtins/zstd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ set(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR} PARENT_SCOPE)
set(ZSTD_LIBRARIES ${ROOT_ZSTD_LIBRARY} PARENT_SCOPE)
set(ZSTD_FOUND TRUE PARENT_SCOPE)
set(ZSTD_VERSION ${ROOT_ZSTD_VERSION} PARENT_SCOPE)
set(ROOT_ZSTD_PREFIX ${ROOT_ZSTD_PREFIX} PARENT_SCOPE)
Loading