[gdal] Update to 3.6.3 (#30169)

* [gdal] Update to 3.6.3

* Fix poppler

ports/gdal/find-link-libraries.patch

@@ -58,7 +58,7 @@ index 3807ec0..8059eb4 100644
    endif()
  endif()
 +if(PC_Poppler_FOUND)
-+    set(Poppler_INCLUDE_DIR "${PC_Poppler_INCLUDE_DIRS}" CACHE STRING "")
++    find_path(Poppler_INCLUDE_DIR NAMES Object.h PATHS ${PC_Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH REQUIRED)
 +    set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "")
 +    if(NOT TARGET Poppler::Poppler)
 +        add_library(Poppler::Poppler INTERFACE IMPORTED)

ports/gdal/fix-find-package2.patch

@@ -1,29 +0,0 @@
-diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
-index dc23a2b987..245c0777c8 100644
---- a/cmake/helpers/CheckDependentLibraries.cmake
-+++ b/cmake/helpers/CheckDependentLibraries.cmake
-@@ -109,8 +109,9 @@ macro (gdal_check_package name purpose)
-   string(TOUPPER ${name} key)
-   set(_find_dependency "")
-   set(_find_dependency_args "")
--  find_package2(${name} QUIET OUT_DEPENDENCY _find_dependency)
--  if (NOT DEFINED ${key}_FOUND)
-+  if(FIND_PACKAGE2_${name}_ENABLED)
-+    find_package2(${name} QUIET OUT_DEPENDENCY _find_dependency)
-+  else()
-     set(_find_package_args)
-     if (_GCP_VERSION)
-       list(APPEND _find_package_args ${_GCP_VERSION})
-diff --git a/cmake/modules/DefineFindPackage2.cmake b/cmake/modules/DefineFindPackage2.cmake
-index 96acb527cd..855e5156f0 100644
---- a/cmake/modules/DefineFindPackage2.cmake
-+++ b/cmake/modules/DefineFindPackage2.cmake
-@@ -68,6 +68,8 @@ function(define_find_package2 pkgname include_file library_name)
-     else()
-         set_property(GLOBAL APPEND PROPERTY define_find_package_find_path_suffix "_unset_")
-     endif()
-+    set(FIND_PACKAGE2_${pkgname}_ENABLED TRUE CACHE BOOL "Use find_package2 for dependency ${pkgname}")
-+    mark_as_advanced(FIND_PACKAGE2_${pkgname}_ENABLED)
- endfunction()
- 
- function(find_package2 pkgname)

ports/gdal/libkml.patch

@@ -13,16 +13,16 @@ index 9418247..589b83d 100644
    if(${_comp} IN_LIST LibKML_FIND_COMPONENTS)
 @@ -99,21 +101,20 @@ find_package_handle_standard_args(LibKML
  if(LIBKML_FOUND)
-   set(LIBKML_INCLUDE_DIRS ${LIBKML_INCLUDE_DIR})
-   set(LIBKML_LIBRARIES ${LIBKML_BASE_LIBRARY})
+   set(LIBKML_INCLUDE_DIRS "${LIBKML_INCLUDE_DIR}")
+   set(LIBKML_LIBRARIES "${LIBKML_BASE_LIBRARY}")
 +  find_package(LibKML CONFIG REQUIRED)
    if(NOT TARGET LIBKML::LibKML)
 -    add_library(LIBKML::LibKML UNKNOWN IMPORTED)
 +    add_library(LIBKML::LibKML INTERFACE IMPORTED)
      set_target_properties(LIBKML::LibKML PROPERTIES
--                          INTERFACE_INCLUDE_DIRECTORIES ${LIBKML_INCLUDE_DIR}
+-                          INTERFACE_INCLUDE_DIRECTORIES "${LIBKML_INCLUDE_DIR}"
 -                          IMPORTED_LINK_INTERFACE_LANGUAGES "C++"
--                          IMPORTED_LOCATION ${LIBKML_BASE_LIBRARY})
+-                          IMPORTED_LOCATION "${LIBKML_BASE_LIBRARY}")
 +                          INTERFACE_LINK_LIBRARIES kmlbase)
    endif()
    foreach(_comp IN LISTS libkml_known_components)

ports/gdal/portfile.cmake

@@ -1,15 +1,12 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/gdal
     REF "v${VERSION}"
-    SHA512 65a4cbc14f2a972662435ebf4c3be60355f7d57da251590f75b65ded113dda2c89c4a047e3b337841cbaddcf3966c879f448c832687979017df8ab1aaddfbb88
+    SHA512 1bbaf3a6731a105241cc666afe9c9a0b82e9d46245435d597a7372f928e6966c0e746e94fdd86a8f24c3277912a8c19e76906ee88e5d946ac1c25dd7dd38fdf2
     HEAD_REF master
     PATCHES
         find-link-libraries.patch
         fix-gdal-target-interfaces.patch
-        fix-find-package2.patch
         libkml.patch
 )
 # `vcpkg clean` stumbles over one subdir

ports/gdal/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "gdal",
-  "version-semver": "3.6.2",
-  "port-version": 2,
+  "version-semver": "3.6.3",
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,

versions/baseline.json

@@ -2669,8 +2669,8 @@
       "port-version": 0
     },
     "gdal": {
-      "baseline": "3.6.2",
-      "port-version": 2
+      "baseline": "3.6.3",
+      "port-version": 0
     },
     "gdcm": {
       "baseline": "3.0.12",

versions/g-/gdal.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "145b046001c2cbbddc6e987df1f24cde16c32c99",
+      "version-semver": "3.6.3",
+      "port-version": 0
+    },
     {
       "git-tree": "11923340f9057d7e444b83e7a06afbf50e67e0d1",
       "version-semver": "3.6.2",