[gdal] 3.11.4

Author: dirkvdb

vcpkg_overlay/ports/gdal/cmake-project-include.cmake

@@ -16,3 +16,12 @@ if(GDAL_USE_ARROW)
     find_package(Arrow REQUIRED)
     set(ARROW_USE_STATIC_LIBRARIES "${ARROW_BUILD_STATIC}" CACHE BOOL "")
 endif()
+
+if(GDAL_USE_SQLITE3)
+    # CMake find module with vcpkg cmake wrapper
+    find_package(SQLite3 REQUIRED)
+    # .. and inject into GDAL's FindSQLite3.cmake
+    set(SQLite3_LIBRARY "${SQLite3_LIBRARIES}")
+    set(SQLite3_FOUND FALSE)
+    set(SQLITE3_FOUND FALSE)
+endif()

vcpkg_overlay/ports/gdal/portfile.cmake

@@ -2,12 +2,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/gdal
     REF "v${VERSION}"
-    SHA512 02dfa7d57c37b0f0c5994cae6632286a8671039b5aa9853360c08df8210d93227e42b0f22e74e167dc888761e8118b1b2dd2fe365bdc6c75daf7283c4be89b4c
+    SHA512 84a9bd58e9992d2d447788727228410184ef31e881026aee1f48766ed8b25039ab1b09afe95c97b66d3a0751bab524dc9bb57ab2c78af53632b52ec8dcd6f4ad
     HEAD_REF master
     PATCHES
         find-link-libraries.patch
         fix-gdal-target-interfaces.patch
         libkml.patch
+        sqlite3.diff
         target-is-valid.patch
 )
 # `vcpkg clean` stumbles over one subdir
@@ -27,6 +28,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         cfitsio          GDAL_USE_CFITSIO
         curl             GDAL_USE_CURL
         expat            GDAL_USE_EXPAT
+        expat            OGR_ENABLE_DRIVER_XLSX
         freexl           GDAL_USE_FREEXL
         geos             GDAL_USE_GEOS
         core             GDAL_USE_GEOTIFF
@@ -42,6 +44,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         libxml2          GDAL_USE_LIBXML2
         mysql-libmariadb GDAL_USE_MYSQL 
         netcdf           GDAL_USE_NETCDF
+        netcdf           GDAL_ENABLE_DRIVER_NETCDF
+        pcraster         GDAL_ENABLE_DRIVER_PCRASTER
         odbc             GDAL_USE_ODBC
         openjpeg         GDAL_USE_OPENJPEG
         openssl          GDAL_USE_OPENSSL
@@ -55,6 +59,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         core             GDAL_USE_SHAPELIB_INTERNAL
         libspatialite    GDAL_USE_SPATIALITE
         sqlite3          GDAL_USE_SQLITE3
+        sqlite3          OGR_ENABLE_DRIVER_GPKG
         core             GDAL_USE_TIFF
         webp             GDAL_USE_WEBP
         core             GDAL_USE_ZLIB
@@ -88,15 +93,19 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON
         -DGDAL_USE_INTERNAL_LIBS=OFF
         -DGDAL_USE_EXTERNAL_LIBS=OFF
-        -DGDAL_BUILD_OPTIONAL_DRIVERS=ON
-        -DOGR_BUILD_OPTIONAL_DRIVERS=ON
+        -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF
+        -DOGR_BUILD_OPTIONAL_DRIVERS=OFF
+        -DGDAL_ENABLE_DRIVER_AAIGRID=ON
+        -DOGR_ENABLE_DRIVER_CSV=ON
         -DFIND_PACKAGE2_KEA_ENABLED=OFF
         -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb
         -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb
         -DMYSQL_LIBRARIES=unofficial::libmariadb
         -DGDAL_CHECK_PACKAGE_NetCDF_NAMES=netCDF
         -DGDAL_CHECK_PACKAGE_NetCDF_TARGETS=netCDF::netcdf
         -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull
+        -DGDAL_CHECK_PACKAGE_ZSTD_NAMES=zstd
+        -DGDAL_CHECK_PACKAGE_ZSTD_TARGETS=zstd::libzstd
         "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}"
         "-DQHULL_LIBRARY=${qhull_target}"
         "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
@@ -120,6 +129,7 @@ list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")"
 if (BUILD_APPS)
     vcpkg_copy_tools(
         TOOL_NAMES
+            gdal
             gdal_contour
             gdal_create
             gdal_footprint
@@ -172,6 +182,3 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDA
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT")
-
-# does not properly support multi config
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/packages/FindSQLite3.cmake")

vcpkg_overlay/ports/gdal/sqlite3.diff

@@ -0,0 +1,49 @@
+diff --git a/cmake/modules/packages/FindSQLite3.cmake b/cmake/modules/packages/FindSQLite3.cmake
+index 903465b3c9..5d3a067e50 100644
+--- a/cmake/modules/packages/FindSQLite3.cmake
++++ b/cmake/modules/packages/FindSQLite3.cmake
+@@ -77,7 +77,7 @@ if(SQLite3_INCLUDE_DIR AND SQLite3_LIBRARY)
+     cmake_push_check_state(RESET)
+     # check column metadata
+     set(CMAKE_REQUIRED_INCLUDES ${SQLite3_INCLUDE_DIR})
+-    if( ${SQLite3_LIBRARY} MATCHES "libsqlite3.a")
++    if(0)
+       if(PC_SQLITE3_STATIC_LDFLAGS)
+         set(CMAKE_REQUIRED_LIBRARIES ${PC_SQLITE3_STATIC_LDFLAGS})
+       else()
+@@ -111,15 +111,10 @@ if(SQLite3_INCLUDE_DIR AND SQLite3_LIBRARY)
+       endif()
+     else()
+         set(CMAKE_REQUIRED_LIBRARIES ${SQLite3_LIBRARY})
++        list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
++        list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} "")
+     endif()
+ 
+-    # Trick to force CMake to re-run if SQLite3_LIBRARY changes
+-    # Useful in development situations when switching/refreshing the library
+-    set_property(
+-        DIRECTORY
+-        APPEND
+-        PROPERTY CMAKE_CONFIGURE_DEPENDS "${SQLite3_LIBRARY}"
+-    )
+     # Invalidate cached variables if SQLite3_LIBRARY changes
+     file(TIMESTAMP "${SQLite3_LIBRARY}" SQLite3_LIBRARY_TIMESTAMP)
+     if( SQLite3_LIBRARY_TIMESTAMP_OLD_VAL AND
+@@ -179,6 +174,7 @@ if(SQLite3_FOUND)
+                           INTERFACE_INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIRS}"
+                           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                           IMPORTED_LOCATION "${SQLite3_LIBRARY}")
++  endif()
+     if(SQLite3_HAS_COLUMN_METADATA)
+         set_property(TARGET SQLite::SQLite3 APPEND PROPERTY
+                      INTERFACE_COMPILE_DEFINITIONS "SQLite3_HAS_COLUMN_METADATA")
+@@ -187,5 +183,9 @@ if(SQLite3_FOUND)
+         set_property(TARGET SQLite::SQLite3 APPEND PROPERTY
+                      INTERFACE_COMPILE_DEFINITIONS "SQLite3_HAS_RTREE")
+     endif()
++  get_target_property(definitions SQLite::SQLite3 INTERFACE_COMPILE_DEFINITIONS)
++  if(definitions)
++    list(REMOVE_DUPLICATES definitions)
++    set_target_properties(SQLite::SQLite3 PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${definitions}")
+   endif()
+ endif()

vcpkg_overlay/ports/gdal/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "gdal",
-  "version-semver": "3.10.3",
+  "version-semver": "3.11.4",
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
@@ -53,7 +53,7 @@
     "lzma",
     {
       "name": "netcdf",
-      "platform": "!uwp & !(windows & arm64) & !android & !ios"
+      "platform": "!android & !ios & !(windows & arm64) & !uwp"
     },
     "openjpeg",
     "openssl",
@@ -93,6 +93,7 @@
     },
     "cfitsio": {
       "description": "Enable cfitsio support",
+      "supports": "!(android & arm32)",
       "dependencies": [
         "cfitsio"
       ]
@@ -182,7 +183,10 @@
     "libspatialite": {
       "description": "Create or update SpatiaLite databases using libspatialite",
       "dependencies": [
-        "libspatialite"
+        {
+          "name": "libspatialite",
+          "default-features": false
+        }
       ]
     },
     "libxml2": {
@@ -312,10 +316,6 @@
         }
       ]
     },
-    "system-libraries": {
-      "$supports": "!windows",
-      "description": "This feature does nothing. It is retained for compatibility."
-    },
     "tools": {
       "description": "Builds gdal and ogr executables"
     },
@@ -330,6 +330,9 @@
       "dependencies": [
         "zstd"
       ]
+    },
+    "pcraster": {
+      "description": "Pcraster driver"
     }
   }
 }

vcpkg_overlay/vcpkg.just

@@ -1,13 +1,5 @@
 # detect the vcpkg triplet based on the system information
 windows_triplet := "x64-windows-static"
-vcpkg_version := "2025-09-03"
-vcpkg_tool_url := if os_family() == "windows" {
-    "https://github.com/microsoft/vcpkg-tool/releases/download/" + vcpkg_version + "/vcpkg.exe"
-} else if os() == "macos" {
-    "https://github.com/microsoft/vcpkg-tool/releases/download/" + vcpkg_version + "/vcpkg-macos"
-} else {
-    "https://github.com/microsoft/vcpkg-tool/releases/download/" + vcpkg_version + "/vcpkg-muslc"
-}
 
 VCPKG_DEFAULT_TRIPLET := if os_family() == "windows" {
     windows_triplet
@@ -27,7 +19,7 @@ in_git_repo := path_exists(join(justfile_directory(), ".git"))
 
 clone_vcpkg:
     - rm -rf '{{join(justfile_directory(), "build", "vcpkg")}}'
-    mkdir '{{join(justfile_directory(), "build")}}'
+    mkdir -p '{{join(justfile_directory(), "build")}}'
     git clone --depth 1 https://github.com/microsoft/vcpkg.git '{{join(justfile_directory(), "build", "vcpkg")}}'