tiff: update to 4.5.0 with upstreamed patch

release notes:
- http://www.simplesystems.org/libtiff/releases/v4.5.0.html
This commit is contained in:
Rudi Heitbaum 2022-12-16 04:59:05 +00:00
parent fbe6bcbf4d
commit 3202b30c2a
2 changed files with 2 additions and 72 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="tiff"
PKG_VERSION="4.4.0"
PKG_SHA256="917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed"
PKG_VERSION="4.5.0"
PKG_SHA256="c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464"
PKG_LICENSE="OSS"
PKG_SITE="http://www.remotesensing.org/libtiff/"
PKG_URL="http://download.osgeo.org/libtiff/${PKG_NAME}-${PKG_VERSION}.tar.gz"

View File

@ -1,70 +0,0 @@
From 1ab0e2696a368a556b793a0941b5365e4d9f56ef Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@codelibre.net>
Date: Sun, 29 May 2022 11:18:42 +0100
Subject: [PATCH] Add options for disabling tools, tests, contrib and docs
---
CMakeLists.txt | 33 +++++++++++++++++++++------
1 files changed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 770b0fac..d1dd275e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,10 +42,16 @@ message(STATUS "libtiff build date: ${BUILD_DATE}")
set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
+option(tiff-tools "build TIFF tools" ON)
+option(tiff-tests "build TIFF tests" ON)
+option(tiff-contrib "build TIFF contrib" ON)
+option(tiff-docs "build TIFF documentation" ON)
+option(tiff-deprecated "build TIFF deprecated features" OFF)
# Disable deprecated features to ensure clean build
-add_definitions(-DTIFF_DISABLE_DEPRECATED)
-
+if (tiff-deprecated)
+ add_definitions(-DTIFF_DISABLE_DEPRECATED)
+endif()
# Project definition
set(CMAKE_C_STANDARD 99)
@@ -135,12 +141,20 @@ include(Release)
# Process subdirectories
add_subdirectory(port)
add_subdirectory(libtiff)
-add_subdirectory(tools)
-add_subdirectory(test)
-add_subdirectory(contrib)
+if(tiff-tools)
+ add_subdirectory(tools)
+endif()
+if(tiff-tests)
+ add_subdirectory(test)
+endif()
+if(tiff-contrib)
+ add_subdirectory(contrib)
+endif()
add_subdirectory(build)
-add_subdirectory(man)
-add_subdirectory(html)
+if(tiff-docs)
+ add_subdirectory(man)
+ add_subdirectory(html)
+endif()
# pkg-config support
include(PkgConfig)
@@ -153,6 +167,11 @@ message(STATUS " Documentation directory: ${LIBTIFF_DOCDIR}")
message(STATUS " C compiler: ${CMAKE_C_COMPILER}")
message(STATUS " C++ compiler: ${CMAKE_CXX_COMPILER}")
message(STATUS " Build shared libraries: ${BUILD_SHARED_LIBS}")
+message(STATUS " Build tools: ${tiff-tools}")
+message(STATUS " Build tests: ${tiff-tests}")
+message(STATUS " Build contrib: ${tiff-contrib}")
+message(STATUS " Build docs: ${tiff-docs}")
+message(STATUS " Build deprecated features: ${tiff-deprecated}")
message(STATUS " Enable linker symbol versioning: ${HAVE_LD_VERSION_SCRIPT}")
message(STATUS " Support Microsoft Document Imaging: ${mdi}")
message(STATUS " Use win32 IO: ${USE_WIN32_FILEIO}")