Merge branch 'OSGeo:master' into master

a0x8o · Oct 16, 2024 · c50ee84 · c50ee84
2 parents 143b24c + 5033ea2
commit c50ee84
Show file tree

Hide file tree

Showing 166 changed files with 6,137 additions and 1,316 deletions.
diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
@@ -623,7 +623,6 @@ jobs:
         rm -rf /opt/homebrew/lib/node_modules # conflicts with node@18 from brew
         brew update
         brew outdated
-        brew unlink python
         brew install --overwrite [email protected] [email protected]
         brew install postgresql || brew link postgresql
         brew install pkg-config freexl libxml2 libspatialite geos proj libgeotiff openjpeg giflib libaec postgis poppler doxygen unixodbc jpeg-turbo aom jpeg-xl libheif libarchive libkml boost

diff --git a/.github/workflows/doc_checks.yml b/.github/workflows/doc_checks.yml
@@ -56,10 +56,10 @@ jobs:
           ldconfig
           popd
 
-    - name: Update sphinx-rtd-theme
+    - name: Update components
       shell: bash -l {0}
       run: |
-          pip install -U "sphinx-rtd-theme>=3.0.0"
+          pip install -U "sphinx-rtd-theme>=3.0.0" "sphinxcontrib-spelling>=8.0.0"
 
     - name: Print versions
       shell: bash -l {0}

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,14 +25,24 @@ jobs:
       matrix:
         include:
           - name: alpine-small
+            arch: linux/amd64
 
           - name: alpine-normal
+            arch: linux/amd64
 
           - name: ubuntu-small
+            arch: linux/amd64
+
+          - name: ubuntu-small
+            arch: linux/arm64
+
+          - name: ubuntu-full
+            arch: linux/amd64
 
           - name: ubuntu-full
+            arch: linux/arm64
 
-    name: ${{ matrix.name }}
+    name: ${{ matrix.name }}-${{ matrix.arch }}
 
     runs-on: ubuntu-latest
 
@@ -43,5 +53,6 @@ jobs:
       - name: Build
         shell: bash -l {0}
         run: |
+          docker run --rm --privileged linuxkit/binfmt:v0.8
           cd docker/${{ matrix.name }}
-          ./build.sh --platform linux/amd64
+          ./build.sh --platform ${{ matrix.arch }}
diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -2,6 +2,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
   DERIVED -raster- (ro): Derived datasets using VRT pixel functions
   GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
+  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF (*.tif, *.tiff)
   GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
   COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
   NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)

diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -2,6 +2,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
   DERIVED -raster- (ro): Derived datasets using VRT pixel functions
   GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
+  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF (*.tif, *.tiff)
   GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
   COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
   NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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/|

diff --git a/Doxyfile b/Doxyfile
@@ -943,7 +943,8 @@ PREDEFINED             = HAVE_DLFCN_H \
                          CPLSTRING_METHOD_DLL= \
                          CPL_NO_RETURN= \
                          EXPERIMENTAL_CPL_WARN_UNUSED_RESULT= \
-                         CPL_MULTIPROC_PTHREAD
+                         CPL_MULTIPROC_PTHREAD \
+                         CPL_NON_FINAL=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.