[libgeotiff] Update to 1.7.1 (#23446)

* Update to 1.7.1

* Update versions

* CI
This commit is contained in:
Kai Pastor 2022-03-23 20:24:10 +01:00 committed by GitHub
parent 601d7f3205
commit ee2fa5303c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 61 deletions

View File

@ -1,21 +1,3 @@
diff --git a/libgeotiff/bin/CMakeLists.txt b/libgeotiff/bin/CMakeLists.txt
index 7b12341..b6b1d0c 100644
--- a/libgeotiff/bin/CMakeLists.txt
+++ b/libgeotiff/bin/CMakeLists.txt
@@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build")
FOREACH(utility ${GEOTIFF_UTILITIES})
ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE})
- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET})
+ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET})
ENDFOREACH()
ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE})
TARGET_LINK_LIBRARIES(geotifcp
- xtiff
${GEOTIFF_LIBRARY_TARGET}
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES})
diff --git a/libgeotiff/cmake/CMakeLists.txt b/libgeotiff/cmake/CMakeLists.txt
index 47a2b00..3809ba3 100644
--- a/libgeotiff/cmake/CMakeLists.txt

View File

@ -1,16 +0,0 @@
diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt
index b4a3cee..fd9f0a5 100644
--- a/libgeotiff/CMakeLists.txt
+++ b/libgeotiff/CMakeLists.txt
@@ -80,7 +80,11 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
IF(WIN32)
IF(MSVC)
+ IF(BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DBUILD_AS_DLL=1)
+ ELSE()
+ ADD_DEFINITIONS(-DBUILD_AS_DLL=0)
+ ENDIF()
ADD_DEFINITIONS(/DW4)
if (NOT (MSVC_VERSION VERSION_LESS 1400))
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)

View File

@ -1,14 +0,0 @@
diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in
index dc5b999..2ce07fd 100644
--- a/libgeotiff/cmake/project-config.cmake.in
+++ b/libgeotiff/cmake/project-config.cmake.in
@@ -23,6 +23,9 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
message (STATUS
"@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}")
+include(CMakeFindDependencyMacro)
+find_dependency(PROJ)
+
# Tell the user project where to find our headers and libraries
get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)

View File

@ -1,13 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/libgeotiff
REF 7da5bacae7814c65ebb78f0b64e1141fbcb3de1e #v1.7.0
SHA512 36047778fbbb4a533a7b65e7b32ab8c0955f59b95417b68b68e7ddd398191445e730e00271756213bf657cbf7cd5eb028b25d4b0741e5b309c78c207b4ec01c6
REF 1.7.1
SHA512 3c71a19f02a46a86d546777e2afe6bd715098779845967a5253ca949e0cacc0117c697cabd099611247e85e15cf1813733ae0ef445b136d7001f34667a4c8dd6
HEAD_REF master
PATCHES
cmakelists.patch
geotiff-config.patch
fix-staticbuild.patch
skip-doc-install.patch
)
@ -21,7 +19,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/libgeotiff"
OPTIONS
-DGEOTIFF_BIN_SUBDIR=bin
-DGEOTIFF_DATA_SUBDIR=share
-DWITH_TIFF=1
-DHAVE_TIFFOPEN=1
-DHAVE_TIFFMERGEFIELDINFO=1

View File

@ -1,16 +1,16 @@
diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt
index b4a3cee..f838a36 100644
index 54779a5..30ff29f 100644
--- a/libgeotiff/CMakeLists.txt
+++ b/libgeotiff/CMakeLists.txt
@@ -286,6 +286,7 @@ SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR})
@@ -262,6 +262,7 @@ SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR})
SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR})
SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR})
SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR})
+if(0)
# Install doc files
INSTALL(FILES
AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
@@ -294,6 +295,7 @@ INSTALL(FILES
@@ -269,6 +270,7 @@ INSTALL(FILES
# Install man pages
INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)

View File

@ -1,7 +1,6 @@
{
"name": "libgeotiff",
"version": "1.7.0",
"port-version": 1,
"version": "1.7.1",
"description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.",
"homepage": "https://github.com/OSGeo/libgeotiff",
"license": "MIT",

View File

@ -3553,8 +3553,8 @@
"port-version": 1
},
"libgeotiff": {
"baseline": "1.7.0",
"port-version": 1
"baseline": "1.7.1",
"port-version": 0
},
"libgit2": {
"baseline": "1.4.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5f9baab006dd2bd507b6b8f63d2226dc6ce97cd1",
"version": "1.7.1",
"port-version": 0
},
{
"git-tree": "91982f7018b13638993efc70c14bf0996105f0bc",
"version": "1.7.0",