[proj4] Upgrade version to 6.1.1 and remove patches. (#7917)

* [proj4]Upgrade version to 6.1.1 and remove useless patches.

* [libgeotiff]Fix build errors using proj4 6.1.1.

* [libspatialite]Fix build errors using proj4 6.1.1.

* [gdal]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [libgeotiff]Re-fix build errors using proj4 6.1.1.

* [vtk]Fix build errors using proj4 6.1.1.

* [proj4]Fix find sqlite binary failure.

* [proj4]Disable build tools when building proj4 in arm/uwp.

* [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.

* add back dl libs

* [gdal]Fix dependent port proj library name.

* [proj4]Set Windows library name to "proj" and revert fix-proj-name changes.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [proj4]Fix feature database on triplet arm/uwp.

* [gdal]Remove useless flag PROJ_STATIC.

* [proj4]Fix build error on x64-windows-static.

* [liblas]Use find_library to get proj4/sqlite3 libraries.

* [proj4]Fix sqlite dependency.

* [proj4]Fix arm/uwp dependency.

* [proj4]Fix linux build: configure error.

* [proj4]Disable export proj4 namespace.

* [liblas]Delete proj dependency.

* [libspatialite]Fix linux build.

* [libspatialite]Fix linux command.

* [libspatialite]Fix configure error.

* [proj4]fix static cmake tools path.

* [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake.
[proj4]Revert changes about namespace.
[liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

* [vtk]Fix using latest proj4 issue.

* [proj4]Delete missing patch.

3 files changed, 25 insertions, 6 deletions

diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL
index 2e8d4836c..42a973875 100644
--- a/ports/libgeotiff/CONTROL
+++ b/ports/libgeotiff/CONTROL
@@ -1,5 +1,5 @@
 Source: libgeotiff
-Version: 1.4.2-9
+Version: 1.4.2-10
 Homepage: https://download.osgeo.org/geotiff/libgeotiff
 Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
 Build-Depends: tiff, proj4, zlib, libjpeg-turbo
diff --git a/ports/libgeotiff/fix-proj4.patch b/ports/libgeotiff/fix-proj4.patch
new file mode 100644
index 000000000..d6e8bce8a
--- /dev/null
+++ b/ports/libgeotiff/fix-proj4.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 617978c..baf45bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,8 +146,11 @@ IF(WITH_PROJ4)
+     endif ()
+ 
+     IF(PROJ4_FOUND)
+-        ADD_DEFINITIONS(-DHAVE_LIBPROJ=1)
++        ADD_DEFINITIONS(-DHAVE_LIBPROJ=1 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1)
+         INCLUDE_DIRECTORIES(${PROJ4_INCLUDE_DIR})
++        IF(NOT WIN32)
++            LIST(APPEND PROJ4_LIBRARIES ${CMAKE_DL_LIBS})
++        ENDIF()
+     ENDIF()
+ ENDIF()
+ 
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake
index 1e4bb3370..174bed122 100644
--- a/ports/libgeotiff/portfile.cmake
+++ b/ports/libgeotiff/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         cmakelists.patch
         geotiff-config.patch
+        fix-proj4.patch
 )
 
 # Delete FindPROJ4.cmake
@@ -24,11 +25,11 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DWITH_TIFF=ON
-        -DWITH_PROJ4=ON
-        -DWITH_ZLIB=ON
-        -DWITH_JPEG=ON
-        -DWITH_UTILITIES=ON
+        -DWITH_TIFF=1
+        -DWITH_PROJ4=1
+        -DWITH_ZLIB=1
+        -DWITH_JPEG=1
+        -DWITH_UTILITIES=1
 )
 
 vcpkg_install_cmake()
@@ -55,6 +56,7 @@ endif()
 
 vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/GeoTIFF)
+
 file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-config-version.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
 file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
 file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends-release.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)