upgrade GDAL to 3.10.0

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.10.0] 2024
+
+### Added
+ - GDAL 3.10.0
+
 ## [3.9.2] 2024-08-18
 
 ### Added

deps/libgdal.sh

@@ -5,7 +5,7 @@ set -eu
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$DIR/libgdal"
 
-GDAL_VERSION=3.9.2
+GDAL_VERSION=3.10.0
 GDAL_VERSION_SUFFIX=
 dir_gdal=./gdal
 dir_formats_gyp=./gyp-formats

deps/libgdal/gdal/.flake8

@@ -1,21 +1,37 @@
 [flake8]
 max_line_length = 88
 ignore =
-    C408 # Unnecessary dict/list/tuple call - rewrite as a literal
-    E203 # whitespace before ':' - doesn't work well with black
-    E225 # missing whitespace around operator - let black worry about that
-    E262 # inline comment should start with '# '
-    E265 # block comment should start with '# '
-    E266 # too many leading '#' for block comment
-    E302 # expected 2 blank lines, found 1
-    E402 # module level import not at top of file
-    E501 # line too long - let black handle that
-    E711 # comparison to None should be
-    E712 # comparison to False/True should be
-    E741 # ambiguous variable name
-    F405 # may be undefined, or defined from star imports
-    W291 # trailing
-    W503 # line break occurred before a binary operator - let black worry about that
-    W504 # line break occurred adter a binary operator - let black worry about that
+    # Unnecessary dict/list/tuple call - rewrite as a literal
+    C408 
+    # whitespace before ':' - doesn't work well with black
+    E203 
+    # missing whitespace around operator - let black worry about that
+    E225 
+    # inline comment should start with '# '
+    E262 
+    # block comment should start with '# '
+    E265 
+    # too many leading '#' for block comment
+    E266 
+    # expected 2 blank lines, found 1
+    E302 
+    # module level import not at top of file
+    E402 
+    # line too long - let black handle that
+    E501 
+    # comparison to None should be
+    E711 
+    # comparison to False/True should be
+    E712 
+    # ambiguous variable name
+    E741 
+    # may be undefined, or defined from star imports
+    F405 
+    # trailing
+    W291 
+    # line break occurred before a binary operator - let black worry about that
+    W503 
+    # line break occurred adter a binary operator - let black worry about that
+    W504 
 per-file-ignores =
     .cmake-format.py:F821

deps/libgdal/gdal/.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
                 autotest/ogr/data/
               )
     -   repo: https://github.com/pycqa/flake8
-        rev: 3.9.2
+        rev: 7.0.0
         hooks:
         -   id: flake8
             exclude: >
@@ -36,7 +36,8 @@ repos:
                 autotest/cpp/data/|
                 autotest/gdrivers/data/|
                 swig/|
-                third_party/|
+                third_party/fast_float/|
+                third_party/LercLib/|
                 autotest/ogr/data/|
                 alg/internal_libqhull/|
                 apps/argparse/|
@@ -57,5 +58,8 @@ repos:
                 ogr/ogrsf_frmts/geojson/libjson/|
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|
                 ogr/ogrsf_frmts/pmtiles/pmtiles/|
-                ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load
+                ogr/ogrsf_frmts/ods/ods_formula_parser.cpp|
+                ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load|
+                ogr/swq_parser.cpp|
+                ogr/swq_parser.hpp
               )

deps/libgdal/gdal/.readthedocs.yaml

@@ -0,0 +1,42 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: "ubuntu-24.04"
+  tools:
+    python: "3.12"
+
+  jobs:
+    post_checkout:
+      - (git --no-pager log --pretty="tformat:%s -- %b" -1 | paste -s -d " " | grep -viqP "skip ci|ci skip") || exit 183
+    pre_build:
+      - ./doc/rtd/pre_build.sh
+      - cd doc && make doxygen generated_rst_files
+
+  apt_packages:
+    - ant
+    - cmake
+    - doxygen
+    - g++
+    - libproj-dev
+    - make
+    - openjdk-11-jdk-headless
+    - patchelf
+    - swig
+    - unzip
+
+formats:
+  - htmlzip
+  - pdf
+
+python:
+  install:
+      - requirements: doc/requirements.txt
+
+sphinx:
+  configuration: doc/source/conf.py
+  fail_on_warning: true

deps/libgdal/gdal/.travis.yml

@@ -1,9 +1,13 @@
 # This is the config file for building GDAL and running its autotest suite
 # with Travis-ci.org
 
+# FIXME: Travis-CI builds are disabled
 branches:
-  except:
-  - /^(cherry-pick-)?backport-\d+-to-/
+  only:
+    - disabled_disabled
+#branches:
+#  except:
+#  - /^(cherry-pick-)?backport-\d+-to-/
 
 matrix:
   fast_finish: true

deps/libgdal/gdal/CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: Please cite this software using these metadata or in the CITATION file.
 type: software
 title: GDAL
-version: 3.9.2
-date-released: 2024-08-13
+version: 3.10.0
+date-released: 2024-11-01
 doi: 10.5281/zenodo.5884351
 abstract: GDAL is a translator library for raster and vector geospatial data
   formats that is released under an MIT style Open Source License by the Open

deps/libgdal/gdal/CMakeLists.txt

@@ -1,5 +1,6 @@
 # CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
-cmake_minimum_required(VERSION 3.16...3.28)
+include(cmake/helpers/GdalCMakeMinimumRequired.cmake)
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
 
 project(gdal LANGUAGES C CXX)
 include(CTest)
@@ -35,24 +36,8 @@ define_property(
   PROPERTY PLUGIN_OUTPUT_DIR
   BRIEF_DOCS "Plugin modules build directories"
   FULL_DOCS "Plugin modules build directories")
-#
-# check compiler and set preferences.
-if (NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-
-if (NOT CMAKE_C_STANDARD)
-    set(CMAKE_C_STANDARD 99)
-    set(CMAKE_C_STANDARD_REQUIRED ON)
-endif()
 
-#
-if (MSVC)
-  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
-  add_definitions(-DNOMINMAX)
-endif ()
-#
+include(GdalCAndCXXStandards)
 include(CheckCompilerMachineOption)
 include(CheckCompilerSIMDFeature)
 include(Ccache)

deps/libgdal/gdal/VERSION

@@ -1 +1 @@
-3.9.2
+3.10.0

deps/libgdal/gdal/alg/CMakeLists.txt

@@ -36,8 +36,14 @@ add_library(
   rasterfill.cpp
   thinplatespline.cpp
   gdal_simplesurf.cpp
-  viewshed.cpp
+  viewshed/combiner.cpp
+  viewshed/cumulative.cpp
+  viewshed/progress.cpp
+  viewshed/util.cpp
+  viewshed/viewshed.cpp
+  viewshed/viewshed_executor.cpp
   gdalgenericinverse.cpp
+  gdal_interpolateatpoint.cpp
 )
 
 add_dependencies(alg generate_gdal_version_h)
@@ -51,11 +57,15 @@ target_compile_options(alg PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${GDAL_CXX_WARNING_
 target_compile_options(alg PRIVATE $<$<COMPILE_LANGUAGE:C>:${GDAL_C_WARNING_FLAGS}>)
 
 target_include_directories(
-  alg PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/marching_squares> $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>
+  alg PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/marching_squares>
               $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>)
 set_property(TARGET alg PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:alg>)
 
+if (GDAL_ENABLE_DRIVER_GTIFF)
+  target_include_directories(alg PRIVATE $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>)
+endif()
+
 if (GDAL_USE_GEOS)
   target_compile_definitions(alg PRIVATE -DHAVE_GEOS=1)
   gdal_target_link_libraries(alg PRIVATE ${GEOS_TARGET})

deps/libgdal/gdal/alg/armadillo_headers.h

@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef ARMADILLO_HEADERS_H