Merge branch 'OSGeo:master' into master

a0x8o · Mar 19, 2024 · 97f3cf0 · 97f3cf0
2 parents 594e989 + 141def5
commit 97f3cf0
Show file tree

Hide file tree

Showing 825 changed files with 19,645 additions and 5,094 deletions.
diff --git a/.clang-format b/.clang-format
@@ -65,7 +65,9 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        4
 UseTab:          Never
-
+# Add line breaks
+SeparateDefinitionBlocks: Always
+EmptyLineBeforeAccessModifier: LogicalBlock
 ---
 Language: Json
 BasedOnStyle: llvm
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -196,4 +196,5 @@ cb5dc009cf60be71f12b2718017da4621c92c561
 a11bca1150f65804c78b1f3e7ad2f0ef3e47035b
 9ea22d57af187eb018a4fc84577381be0817fe95
 5247bbb4b27c7bf7cd6074deeeac087c1a4144b8
-d7e5c0055c176ff6e70da7aa47a29654ece08ce1
+d7e5c0055c176ff6e70da7aa47a29654ece08ce1
+c39127b8dca9228e728a56dd93fc8ebf7c212060
diff --git a/.github/workflows/android_cmake.yml b/.github/workflows/android_cmake.yml
@@ -24,7 +24,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Cache
         uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1

diff --git a/.github/workflows/android_cmake/start.sh b/.github/workflows/android_cmake/start.sh
@@ -79,6 +79,8 @@ PKG_CONFIG_LIBDIR=/tmp/install/lib/pkgconfig cmake .. \
  -DCMAKE_ANDROID_NDK=$ANDROID_NDK \
  -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
  -DCMAKE_SYSTEM_VERSION=24 \
+ -DCMAKE_C_FLAGS=-Werror \
+ -DCMAKE_CXX_FLAGS=-Werror \
  "-DCMAKE_PREFIX_PATH=/tmp/install;$NDK_TOOLCHAIN/sysroot/usr/" \
  -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER \
  -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=NEVER \

diff --git a/.github/workflows/asan/build.sh b/.github/workflows/asan/build.sh
@@ -8,7 +8,7 @@ if [ "$NPROC" = "" ]; then
   NPROC=3
 fi
 
-SANITIZE_FLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
+SANITIZE_FLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
 SANITIZE_LDFLAGS="-fsanitize=undefined -fsanitize=address -shared-libasan -lstdc++"
 
 cmake ${GDAL_SOURCE_DIR:=..} \
@@ -18,11 +18,12 @@ cmake ${GDAL_SOURCE_DIR:=..} \
     -DCMAKE_C_FLAGS="${SANITIZE_FLAGS}" \
     -DCMAKE_CXX_FLAGS="${SANITIZE_FLAGS}" \
     -DCMAKE_SHARED_LINKER_FLAGS="${SANITIZE_LDFLAGS}" \
-    -DCMAKE_SHARED_LINKER_FLAGS="${SANITIZE_LDFLAGS}" \
+    -DCMAKE_EXE_LINKER_FLAGS="${SANITIZE_LDFLAGS}" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DUSE_CCACHE=ON \
     -DGDAL_USE_GEOTIFF_INTERNAL=ON \
     -DGDAL_USE_TIFF_INTERNAL=ON \
+    -DGDAL_USE_LIBKML=OFF -DOGR_ENABLE_DRIVER_LIBKML=OFF \
     -DFileGDB_ROOT=/usr/local/FileGDB_API
 make -j$NPROC
 
diff --git a/.github/workflows/asan/test.sh b/.github/workflows/asan/test.sh
@@ -4,13 +4,14 @@ set -ex
 
 . ../scripts/setdevenv.sh
 
-export LD_LIBRARY_PATH=/usr/lib/llvm-10/lib/clang/10.0.0/lib/linux:${LD_LIBRARY_PATH}
-export PATH=/usr/lib/llvm-10/bin:${PATH}
+export LD_LIBRARY_PATH=/usr/lib/llvm-14/lib/clang/14.0.0/lib/linux:${LD_LIBRARY_PATH}
+export PATH=/usr/lib/llvm-14/bin:${PATH}
 export SKIP_MEM_INTENSIVE_TEST=YES
 export SKIP_VIRTUALMEM=YES
 export LD_PRELOAD=$(clang -print-file-name=libclang_rt.asan-x86_64.so)
 export ASAN_OPTIONS=allocator_may_return_null=1:symbolize=1:suppressions=$PWD/../autotest/asan_suppressions.txt
 export LSAN_OPTIONS=detect_leaks=1,print_suppressions=0,suppressions=$PWD/../autotest/lsan_suppressions.txt
+export PYTHONMALLOC=malloc
 
 gdalinfo autotest/gcore/data/byte.tif
 python3 -c "from osgeo import gdal; print('yes')"
@@ -44,6 +45,8 @@ find -L \
         ! -name ogr_gpsbabel.py `# new-delete-type-mismatch error in gpsbabel binary that we can't suppress` \
         ! -name "__init__.py" \
         ! -path 'ogr/data/*' \
+        ! -name test_gdal_merge.py \
+        ! -name test_gdal_retile.py \
     -print \
     -exec ./pytest_wrapper.sh {} \; \
     | tee ./test-output.txt

diff --git a/.github/workflows/clang_static_analyzer.yml b/.github/workflows/clang_static_analyzer.yml
@@ -24,7 +24,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Run
         run: docker run --rm -v $PWD:$PWD ubuntu:22.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_common/before_install.sh && sh ./ci/travis/csa_common/install.sh && sh ./ci/travis/csa_common/script.sh"
diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
@@ -31,7 +31,7 @@ jobs:
       cache-name: cmake-ubuntu-focal
     steps:
     - name: Checkout GDAL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Setup cache
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       id: cache
@@ -214,6 +214,7 @@ jobs:
         export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install-gdal/lib
         $GITHUB_WORKSPACE/install-gdal/bin/gdalinfo --version
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3/dist-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
+        PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3/dist-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py
     - name: CMake with rpath
       run: |
         export PATH=$CMAKE_DIR:/usr/local/bin:/usr/bin:/bin # Avoid CMake config from brew etc.
@@ -310,7 +311,7 @@ jobs:
         run: |
           git config --global core.autocrlf false
       - name: Checkout GDAL
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Install development packages
         uses: msys2/setup-msys2@cc11e9188b693c2b100158c3322424c4cc1dadea # v2.22.0
         with:
@@ -403,7 +404,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
     - name: populate JAVA_HOME
       shell: pwsh
@@ -505,7 +506,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
       with:
         activate-environment: gdalenv
@@ -572,7 +573,7 @@ jobs:
       with:
         xcode-version: 14.3
     - name: Checkout GDAL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Setup cache
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       id: cache
@@ -652,7 +653,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
       with:
         activate-environment: gdalenv

diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -24,7 +24,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Install Requirements
         run: |
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Detect tabulations
         run: ./scripts/detect_tabulations.sh
@@ -81,15 +81,15 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   doxygen:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Install Requirements
         run: |
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Install Requirements
         run: |
@@ -125,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up Python
       uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
       with:
@@ -142,7 +142,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Install requirements
         run: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,11 +41,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+      uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -149,6 +149,6 @@ jobs:
         key: ${{ steps.restore-cache.outputs.cache-primary-key }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+      uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -35,7 +35,7 @@ jobs:
       CACHE_NUMBER: 0
 
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
     - name: Support longpaths
       run: git config --system core.longpaths true

diff --git a/.github/workflows/coverity_scan.yml b/.github/workflows/coverity_scan.yml
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Login to GHCR
         if: env.CONTAINER_REGISTRY == 'ghcr.io'

diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_build.yml
@@ -23,7 +23,7 @@ jobs:
     container: ghcr.io/osgeo/proj-docs
 
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Setup environment
       shell: bash -l {0}
       run: |

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
@@ -63,19 +63,22 @@ jobs:
             id: alpine
             container: alpine
             build_script: build.sh
+            os: ubuntu-22.04
 
           - name: Alpine, gcc 32-bit
             id: alpine_32bit
             container: alpine_32bit
             build_script: build.sh
             test_script: test.sh
             travis_branch: alpine_32bit
+            os: ubuntu-22.04
 
           - name: Fedora Rawhide, clang++
             id: fedora_rawhide
             travis_branch: sanitize
             container: fedora_rawhide
             build_script: build.sh
+            os: ubuntu-22.04
 
           - name: Ubuntu 22.04, gcc
             id: ubuntu_22.04
@@ -84,13 +87,16 @@ jobs:
             before_test_script: services.sh
             build_script: build.sh
             test_script: test.sh
+            os: ubuntu-22.04
 
-          - name: Ubuntu 20.04, clang ASAN
+          - name: Ubuntu 22.04, clang ASAN
             id: asan
             travis_branch: sanitize
-            container: ubuntu_20.04
+            container: ubuntu_22.04
             build_script: build.sh
             test_script: test.sh
+            # We force the host OS to be 20.04 to avoid "AddressSanitizer:DEADLYSIGNAL"
+            os: ubuntu-20.04
 
           - name: Ubuntu 20.04, gcc
             id: ubuntu_20.04
@@ -99,6 +105,7 @@ jobs:
             use_avx2: true
             build_script: build.sh
             test_script: test.sh
+            os: ubuntu-22.04
 
           - name: Ubuntu 20.04, coverage
             id: coverage
@@ -107,22 +114,25 @@ jobs:
             before_test_script: services.sh
             build_script: build.sh
             test_script: test.sh
+            os: ubuntu-22.04
 
           - name: Ubuntu 20.04, benchmarks
             id: benchmarks
             travis_branch: ubuntu_2004
             container: ubuntu_20.04
             build_script: build.sh
             test_script: test.sh
+            os: ubuntu-22.04
 
           - name: Ubuntu 20.04, Intel compiler
             id: icc
             container: icc
             build_script: build.sh
+            os: ubuntu-22.04
 
     name: ${{ matrix.name }}
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     defaults:
       run:
@@ -143,11 +153,11 @@ jobs:
           echo "CONTAINER_NAME_FULL=${CONTAINER_REGISTRY}/${CONTAINER_REGISTRY_USER,,}/${CONTAINER_NAME}:${CONTAINER_TAG_CLEAN}"  >>${GITHUB_ENV}
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Login to Docker Hub
         if: env.CONTAINER_REGISTRY == 'docker.io'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -20,12 +20,12 @@ permissions:
 jobs:
 
   macos_build:
-    # FIXME: Python tests fail with "ModuleNotFoundError: No module named '_gdal'" with macos-12
-    runs-on: macos-11
+    # Arm64
+    runs-on: macos-14
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
 
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
         with:

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+        uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
         with:
           sarif_file: results.sarif