fix: support for TIFF with CMYK and alpha channel (#408)

dasch-swiss · Jan 31, 2024 · c0cc033 · c0cc033
1 parent 93308c2
commit c0cc033
Show file tree

Hide file tree

Showing 50 changed files with 212 additions and 309 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@
 # License along with Sipi.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.27)
 cmake_policy(VERSION 3.18)
 if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
     cmake_policy(SET CMP0135 OLD)

diff --git a/Dockerfile.sipi-dev-env b/Dockerfile.sipi-dev-env
@@ -17,3 +17,4 @@ RUN apt-get update \
 ARG UID=1000
 RUN useradd -m -u ${UID} -s /bin/bash builder
 USER builder
+EXPOSE 1024
diff --git a/ext/bzip2/CMakeLists.txt b/ext/bzip2/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(bzip2_builder C CXX)
 include(ExternalProject)
 
@@ -7,11 +6,7 @@ include(ExternalProject)
 # since we also need this as a shared library, we need to compile with PIC - Position Independent Code
 # which may generate less efficient code
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 ExternalProject_Add(project_bzip2
         INSTALL_DIR ${COMMON_LOCAL}

diff --git a/ext/curl/CMakeLists.txt b/ext/curl/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(curl_builder C CXX)
 include(ExternalProject)
 
@@ -29,11 +28,7 @@ include(ExternalProject)
 #
 # get libcurl
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 ExternalProject_Add(project_curl
         DEPENDS ssl

diff --git a/ext/exiv2/CMakeLists.txt b/ext/exiv2/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(exiv2_builder C CXX)
 include(ExternalProject)
 

diff --git a/ext/expat/CMakeLists.txt b/ext/expat/CMakeLists.txt
@@ -1,13 +1,7 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(expat_builder C CXX)
 include(ExternalProject)
 
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
-
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 ExternalProject_Add(project_expat
         INSTALL_DIR ${COMMON_LOCAL}

diff --git a/ext/fmt/CMakeLists.txt b/ext/fmt/CMakeLists.txt
@@ -1,15 +1,11 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(libfmt_builder C CXX)
 include(ExternalProject)
 
 #
 # get fmt
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 ExternalProject_Add(
         project_fmt

diff --git a/ext/gettext/CMakeLists.txt b/ext/gettext/CMakeLists.txt
@@ -1,15 +1,11 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(gettext_builder C CXX)
 include(ExternalProject)
 
 #
 # get gettext
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 ExternalProject_Add(
         project_gettext

diff --git a/ext/jansson/CMakeLists.txt b/ext/jansson/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(libjansson_builder C CXX)
 include(ExternalProject)
 
@@ -7,11 +6,8 @@ set(JANSSON_INSTALL_LIB_DIR "lib/${BITS}")
 #
 # get jansson
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 ExternalProject_Add(
         project_jansson

diff --git a/ext/jbigkit/CMakeLists.txt b/ext/jbigkit/CMakeLists.txt
@@ -1,15 +1,11 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(jbigkit_builder C CXX)
 include(ExternalProject)
 
 #
 # get JBIG
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 
 ExternalProject_Add(

diff --git a/ext/jpeg/CMakeLists.txt b/ext/jpeg/CMakeLists.txt
@@ -1,15 +1,11 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(jpeg_builder C CXX)
 include(ExternalProject)
 
 #
 # get libjpeg 1.4.1
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 
 ExternalProject_Add(project_jpeg

diff --git a/ext/kakadu/CMakeLists.txt b/ext/kakadu/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(kakadu_builder C CXX)
 include(ExternalProject)
 
@@ -10,11 +9,8 @@ message(STATUS ${CONFIGURE_LIBDIR})
 message(STATUS "VENDOR=${COMMON_VENDOR}")
 message(STATUS "KDU_MAKE=${KDU_MAKE}")
 
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 ExternalProject_Add(
         project_kakadu

diff --git a/ext/lcms2/CMakeLists.txt b/ext/lcms2/CMakeLists.txt
@@ -1,15 +1,11 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(lcms2_builder C CXX)
 include(ExternalProject)
 
 #
 # get lcms2
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 ExternalProject_Add(project_lcms2
         INSTALL_DIR ${COMMON_LOCAL}

diff --git a/ext/lua/CMakeLists.txt b/ext/lua/CMakeLists.txt
@@ -1,16 +1,12 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(liblua_builder C CXX)
 include(ExternalProject)
 
 
 #
 # get lua
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 
 ExternalProject_Add(project_lua

diff --git a/ext/luarocks/CMakeLists.txt b/ext/luarocks/CMakeLists.txt
@@ -1,15 +1,11 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(libluarocks_builder C CXX)
 include(ExternalProject)
 
 #
 # get luarocks
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
 
 ExternalProject_Add(project_luarocks
         DEPENDS lua

diff --git a/ext/openjpeg200/CMakeLists.txt b/ext/openjpeg200/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(liboj2_builder C CXX)
 include(ExternalProject)
 

diff --git a/ext/openssl/CMakeLists.txt b/ext/openssl/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.16)
 project(ssl_builder C CXX)
 include(ExternalProject)
 
@@ -12,11 +11,7 @@ else()
     set(CONF_ARCHOPT "")
 endif()
 
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 
 ExternalProject_Add(project_ssl

diff --git a/ext/png/CMakeLists.txt b/ext/png/CMakeLists.txt
@@ -1,31 +1,29 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(libpng_builder C CXX)
 include(ExternalProject)
 
 #
 # get png
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
+
+set(LibPngVersion "1.6.41")
 
 ExternalProject_Add(project_png
         DEPENDS zlib
         DEPENDS xz
         INSTALL_DIR ${COMMON_LOCAL}
-        URL https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/libpng-1.6.37.tar.gz/download
+        URL https://sourceforge.net/projects/libpng/files/libpng16/${LibPngVersion}/libpng-${LibPngVersion}.tar.gz/download
         ${timestamp_policy}
         DOWNLOAD_DIR ${COMMON_SRCS}/downloads
-        SOURCE_DIR ${COMMON_SRCS}/libpng-1.6.37
+        SOURCE_DIR ${COMMON_SRCS}/libpng-${LibPngVersion}
         CMAKE_ARGS  ${SHARED_OPTION}
         -DCMAKE_PREFIX_PATH=${COMMON_LOCAL}
         -DCMAKE_INSTALL_PREFIX=${COMMON_LOCAL}
         -DCMAKE_INSTALL_LIBDIR=${CONFIGURE_LIBDIR}
         -DPNG_ARM_NEON:BOOL=on
         -DPNG_TESTS:BOOL=OFF
-        -DPNG_BUILD_ZLIB:BOOL=ON
+        -DPNG_BUILD_ZLIB:BOOL=OFF
+        -DZLIB_ROOT:BOOL=ON
         -DZLIB_INCLUDE_DIR=${CONFIGURE_INCDIR}
         -DZLIB_LIBRARY=${CONFIGURE_LIBDIR}/libz${CMAKE_STATIC_LIBRARY_SUFFIX}
 )

diff --git a/ext/shttp/CMakeLists.txt b/ext/shttp/CMakeLists.txt
@@ -1,15 +1,10 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(libshttps_builder C CXX)
 include(ExternalProject)
 
 #
 # httplib
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 
 ExternalProject_Add(project_shttps

diff --git a/ext/sqlite3/CMakeLists.txt b/ext/sqlite3/CMakeLists.txt
@@ -1,15 +1,10 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(sqlite_builder C CXX)
 include(ExternalProject)
 
 #https://www.sqlite.org/2020/sqlite-autoconf-3310000.tar.gz
 # get sqlite3
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 
 ExternalProject_Add(project_sqlite3

diff --git a/ext/tiff/CMakeLists.txt b/ext/tiff/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(tiff_builder C CXX)
 include(ExternalProject)
 
@@ -14,11 +13,7 @@ else()
     set(CMAKE_CREATE_SHARED "-DBUILD_SHARED_LIBS=OFF")
 endif()
 
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 set(LibTiffVersion "4.1.0")
 

diff --git a/ext/webp/CMakeLists.txt b/ext/webp/CMakeLists.txt
@@ -1,16 +1,11 @@
 # https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.1.0.tar.gz
-cmake_minimum_required(VERSION 3.14.5)
 project(libwebp_builder C CXX)
 include(ExternalProject)
 
 #
 # libwebp
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 
 ExternalProject_Add(project_webp

diff --git a/ext/xz/CMakeLists.txt b/ext/xz/CMakeLists.txt
@@ -1,15 +1,10 @@
-cmake_minimum_required(VERSION 3.14.5)
 project(libxz_builder C CXX)
 include(ExternalProject)
 
 #
 # libxyz
 #
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24.0)
-    set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
-else()
-    unset(timestamp_policy)
-endif()
+set(timestamp_policy DOWNLOAD_EXTRACT_TIMESTAMP OLD)
 
 
 ExternalProject_Add(project_xz