[libgeotiff] Upgrade to version 1.6.0 (#10408)

4 files changed, 35 insertions, 40 deletions

diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL
index f44192537..f6ca886cf 100644
--- a/ports/liblas/CONTROL
+++ b/ports/liblas/CONTROL
@@ -1,6 +1,7 @@
 Source: liblas
-Version: 1.8.1-4
-Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, libgeotiff
+Version: 1.8.1
+Port-Version: 5
+Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, boost-detail, libgeotiff
 Description: A C/C++ library for reading and writing the very common LAS LiDAR format.
 
 Feature: jpeg
@@ -9,4 +10,4 @@ Build-Depends: libjpeg-turbo
 
 Feature: zlib
 Build-Depends: zlib
-Description: Support zlib for compression
\ No newline at end of file
+Description: Support zlib for compression
diff --git a/ports/liblas/fix-BuildError.patch b/ports/liblas/fix-BuildError.patch
deleted file mode 100644
index 4f9d768dc..000000000
--- a/ports/liblas/fix-BuildError.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index beb83e2..6f216bd 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -155,7 +152,7 @@ endif()
- # Targets installation
- 
- install(TARGETS ${LIBLAS_UTILITIES}
--    RUNTIME DESTINATION ${LIBLAS_BIN_DIR}
-+    RUNTIME DESTINATION tools
-     LIBRARY DESTINATION ${LIBLAS_LIB_DIR}
-     ARCHIVE DESTINATION ${LIBLAS_LIB_DIR})
- 
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index c7f583d..ca9e602 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -5,13 +5,8 @@
- # Set where cmake will install liblas-config.cmake.  It's installed in
- # ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR} and ${PROJECT_ROOT_DIR}
- # is the relative path to the root from there.
--if (NOT WIN32)
--  set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
--  set (PROJECT_ROOT_DIR "../../..")
--else ()
--  set(INSTALL_CMAKE_DIR "cmake")
--  set (PROJECT_ROOT_DIR "..")
--endif ()
-+set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
-+set (PROJECT_ROOT_DIR "../../..")
- 
- # Now create the liblas-config files using the .in templates
- configure_file (liblas-config.cmake.in
diff --git a/ports/liblas/fix-geotiff.patch b/ports/liblas/fix-geotiff.patch
new file mode 100644
index 000000000..e812c3d91
--- /dev/null
+++ b/ports/liblas/fix-geotiff.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d246a88..d0bba6f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -248,7 +248,7 @@ endif()
+ # GeoTIFF support - required, default=ON
+ set(WITH_GEOTIFF TRUE CACHE BOOL "Choose if GeoTIFF support should be built")
+ 
+-find_package (GeoTIFF 1.3.0 )
++find_package (GeoTIFF CONFIG 1.3.0 )
+ if(GEOTIFF_FOUND)
+     set(WITH_GEOTIFF TRUE)
+     # Confirm required API is available
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index beb83e2..650bc0c 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -168,7 +168,6 @@ if(UNIX)
+     set (LIBLAS_UTILS_RPATH ${LIBLAS_UTILS_RPATH} ${LASZIP_LIBRARY_DIRS})
+   endif()
+   if(GEOTIFF_FOUND)
+-    get_filename_component(GEOTIFF_LIBRARY_DIRS ${GEOTIFF_LIBRARY} PATH)
+     set (LIBLAS_UTILS_RPATH ${LIBLAS_UTILS_RPATH} ${GEOTIFF_LIBRARY_DIRS})
+   endif()
+   if(GDAL_FOUND)
diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake
index f1416ec93..4f102ec83 100644
--- a/ports/liblas/portfile.cmake
+++ b/ports/liblas/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 set(VERSION 1.8.1)
                                               
 vcpkg_download_distfile(ARCHIVE
@@ -13,8 +11,8 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
-        fix-BuildError.patch
         fix-boost-headers.patch
+        fix-geotiff.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake)
@@ -43,7 +41,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS)
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+    vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS)
+endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)