BRL-CAD
diff --git a/‎.clang-format
+3-1 b/‎.clang-format
+3-1
diff --git a/‎.git-blame-ignore-revs
+2-1 b/‎.git-blame-ignore-revs
+2-1
diff --git a/‎.github/ISSUE_TEMPLATE.md
-40 b/‎.github/ISSUE_TEMPLATE.md
-40
diff --git a/‎.github/ISSUE_TEMPLATE/10_bug_report.yml
+46 b/‎.github/ISSUE_TEMPLATE/10_bug_report.yml
+46
diff --git a/‎.github/ISSUE_TEMPLATE/20_feature_request.yml
+25 b/‎.github/ISSUE_TEMPLATE/20_feature_request.yml
+25
diff --git a/‎.github/ISSUE_TEMPLATE/config.yml
+10 b/‎.github/ISSUE_TEMPLATE/config.yml
+10
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
+8-5 b/‎.github/PULL_REQUEST_TEMPLATE.md
+8-5
diff --git a/‎.github/workflows/alpine/Dockerfile.ci
+64-19 b/‎.github/workflows/alpine/Dockerfile.ci
+64-19
diff --git a/‎.github/workflows/alpine/build.sh
+27-1 b/‎.github/workflows/alpine/build.sh
+27-1
diff --git a/‎.github/workflows/alpine_32bit/Dockerfile.ci
+75 b/‎.github/workflows/alpine_32bit/Dockerfile.ci
+75
@@ -65,7 +65,9 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        4
 UseTab:          Never
-
+# Add line breaks
+SeparateDefinitionBlocks: Always
+EmptyLineBeforeAccessModifier: LogicalBlock
 ---
 Language: Json
 BasedOnStyle: llvm
@@ -196,4 +196,5 @@ cb5dc009cf60be71f12b2718017da4621c92c561
 a11bca1150f65804c78b1f3e7ad2f0ef3e47035b
 9ea22d57af187eb018a4fc84577381be0817fe95
 5247bbb4b27c7bf7cd6074deeeac087c1a4144b8
-d7e5c0055c176ff6e70da7aa47a29654ece08ce1
+d7e5c0055c176ff6e70da7aa47a29654ece08ce1
+c39127b8dca9228e728a56dd93fc8ebf7c212060
@@ -0,0 +1,46 @@
+name: Bug report
+description: Create a bug report.
+labels:
+  - 'Bug'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report correctly. Do NOT use GitHub to post any questions or support requests! They will be closed immediately and ignored.
+
+        The GDAL project is made of contributions from various individuals and organizations, each with their own focus. The issue you are facing is not necessarily in the priority list of those contributors and consequently there is no guarantee that it will be addressed in a timely manner. If this bug report or feature request is high-priority for you, and you cannot address it yourself, we suggest engaging a GDAL developer or support organisation and financially sponsoring a fix.
+
+  - type: textarea
+    id: what
+    attributes:
+      label: What is the bug?
+      description: |
+        If you think there is an issue with coordinate order in GDAL 3.0, then it is likely an intended behavior. See https://github.com/OSGeo/gdal/issues/1974 for more explanations.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce the issue
+      description: |
+        Steps, code extract and/or sample datasets to reproduce the behavior.
+    validations:
+      required: true
+
+  - type: textarea
+    id: about-info
+    attributes:
+      label: Versions and provenance
+      description: |
+        Please indicate the operating system (e.g "Windows 11", or "Linux Ubuntu 22.04") and the GDAL version, for example by pasting the output of ``gdalinfo --version``. Please also indicate how you got the GDAL binary. For example: self-built, package coming from the Linux distribution, from OSGeo4W, from Conda-Forge, from vcpkg, etc.
+        Note that the GDAL project supports only the current version https://gdal.org/download.html#current-release so it should be used for testing. Or at least the newest easily available version for your platform.
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context about the problem here.
@@ -0,0 +1,25 @@
+name: Feature request
+description: Suggest a feature idea.
+labels:
+  - 'enhancement'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request correctly.
+
+  - type: textarea
+    id: what
+    attributes:
+      label: Feature description
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: Additional
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context  about the feature request here. Open source is community driven, please consider a way to support this work either by hiring developers, supporting the GDAL project, find someone to submit a pull request.
+        If the change required is important, you should consider writing a [GDAL RFC](https://gdal.org/development/rfc/index.html) or hiring someone to, and announce your work on the maiing list.
@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+
+contact_links:
+
+  - name: Question
+    url: https://gis.stackexchange.com/
+    about: >
+      Questions should go to the gdal-dev mailing list at https://lists.osgeo.org/mailman/listinfo/gdal-dev
+      or other support forums such as https://gis.stackexchange.com/.
+      GitHub issues are for bug reports and suggestions for new features.
@@ -7,17 +7,19 @@ should be formatted as "component/filename: Describe what the commit does (fixes
 so that anyone that parses 'git log' immediately knows what a commit is about.
 Do not hesitate to provide more context in the longer part of the commit message.
 
-GOOD: "GTiff: fix wrong color interpretation with -co ALPHA=YES (fixes #1234)
+For example:
+
+"GTiff: fix wrong color interpretation with -co ALPHA=YES (fixes #1234)
 
 When -co ALPHA=YES was used, but PHOTOMETRIC was not specified, the ExtraSample
 tag was wrongly set to unspecified.
 "
 
-BAD: "Fix crash", "fix #1234"
+The GDAL project requires specific code formatting for C/C++ and Python code.
+This is largely automated with the pre-commit tool.
+Consult how to [install and set it up](https://gdal.org/development/dev_practices.html#commit-hooks)
 
-In case you need several iterations to make continuous integration happy,
-please squash your commits in a single one at the end. See
-[Contributing](https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md)
+More generally, consult [development practices](https://gdal.org/development/dev_practices.html)
 -->
 
 ## What does this PR do?
@@ -27,6 +29,7 @@ please squash your commits in a single one at the end. See
 ## Tasklist
 
  - [ ] ADD YOUR TASKS HERE
+ - [ ] Make sure code is correctly formatted (cf [pre-commit configuration](https://gdal.org/development/dev_practices.html#commit-hooks))
  - [ ] Add test case(s)
  - [ ] Add documentation
  - [ ] Updated Python API documentation (swig/include/python/docs/)
 
@@ -1,30 +1,75 @@
 FROM alpine:edge
 
 RUN apk add \
-    linux-headers gnu-libiconv-dev \
-    g++ make ccache cmake \
-    proj-dev proj proj-util \
-    curl-dev tiff-dev \
-    zlib-dev zstd-dev xz-dev snappy-dev \
-    libjpeg-turbo-dev libpng-dev openjpeg-dev libwebp-dev expat-dev libkml-dev \
-    py3-numpy-dev python3-dev py3-setuptools py3-numpy py3-pip swig \
-    poppler-dev postgresql-dev \
-    openexr-dev libheif-dev xerces-c-dev geos-dev cfitsio-dev \
-    netcdf-dev libaec-dev hdf5-dev freexl-dev \
-    lz4-dev blosc-dev libdeflate-dev brotli-dev uriparser-dev \
+    apache-arrow-dev \
+    armadillo-dev \
+    basisu-dev \
+    blosc-dev \
+    brunsli-dev \
+    ccache \
+    cfitsio-dev \
+    cmake \
+    curl-dev \
+    expat-dev \
+    freexl-dev \
+    gcc \
+    g++ \
+    geos-dev \
+    giflib-dev \
+    gnu-libiconv-dev \
+    hdf5-dev \
+    json-c-dev \
+    kealib-dev \
+    libaec-dev \
     libarchive-dev \
-    kealib-dev libjxl-dev \
-    json-c-dev giflib-dev \
-    libspatialite-dev librasterlite2-dev \
+    libdeflate-dev \
+    libgeotiff-dev \
+    libheif-dev \
+    libjpeg-turbo-dev \
+    libjxl-dev \
+    libkml-dev \
+    libpng-dev \
+    libpq-dev \
+    librasterlite2-dev \
+    libspatialite-dev \
+    libtirpc-dev \
+    libwebp-dev \
+    libxml2-dev \
+    libxslt-dev \
+    linux-headers \
+    lz4-dev \
+    make \
     mariadb-connector-c-dev \
+    netcdf-dev \
+    odbc-cpp-wrapper-dev \
+    ogdi-dev \
+    openexr-dev \
+    openjpeg-dev \
+    openssl-dev \
     pcre2-dev \
+    podofo-dev \
+    poppler-dev \
+    proj-dev \
+    proj-util \
+    py3-pyarrow \
+    py3-pyarrow-pyc \
+    py3-numpy \
+    py3-numpy-dev \
+    py3-pip \
+    py3-setuptools \
+    python3-dev \
     qhull-dev \
+    sfcgal-dev \
+    snappy-dev \
+    sqlite-dev \
+    swig \
+    tiledb-dev \
+    tiff-dev \
     unixodbc-dev \
-    libpq-dev \
-    apache-arrow-dev \
-    py3-pyarrow py3-pyarrow-pyc \
-    libxml2-dev \
-    podofo-dev
+    xerces-c-dev \
+    xz-dev \
+    zlib-dev \
+    zstd-dev
 
 COPY requirements.txt /tmp/
 RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
@@ -2,12 +2,38 @@
 
 set -e
 
+cat << EOF > /tmp/foo.cpp
+#include <cstdio>
+extern "C" void DeclareDeferredFOO(void);
+void DeclareDeferredFOO()
+{
+    FILE* f = fopen("/tmp/DeclareDeferredFOO_has_been_run.bin", "wb");
+    if (f)
+      fclose(f);
+}
+EOF
+
 cmake ${GDAL_SOURCE_DIR:=..} \
   -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_UNITY_BUILD=ON \
   -DUSE_CCACHE=ON \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \
   -DIconv_LIBRARY=/usr/lib/libiconv.so \
-  -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DWERROR_DEV_FLAG="-Werror=dev"
+  -DADD_EXTERNAL_DEFERRED_PLUGIN_FOO=/tmp/foo.cpp \
+  -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS="-std=c++23 -Werror" -DWERROR_DEV_FLAG="-Werror=dev"
 make -j$(nproc)
 make -j$(nproc) install DESTDIR=/tmp/install-gdal
+<<<<<<< HEAD
+=======
+
+# To check if DeclareDeferredFOO() is called by GDALAllRegister()
+apps/gdalinfo --version
+
+if test -f /tmp/DeclareDeferredFOO_has_been_run.bin; then
+  echo "DeclareDeferredFOO() has been run"
+else
+  echo "DeclareDeferredFOO() has NOT been run"
+  exit 1
+fi
+>>>>>>> v3.9.0
@@ -0,0 +1,75 @@
+FROM i386/alpine:edge
+
+RUN apk add \
+    apache-arrow-dev \
+    armadillo-dev \
+    bash \
+    basisu-dev \
+    blosc-dev \
+    brunsli-dev \
+    ccache \
+    cfitsio-dev \
+    cmake \
+    curl-dev \
+    expat-dev \
+    freexl-dev \
+    gcc \
+    g++ \
+    geos-dev \
+    giflib-dev \
+    gnu-libiconv-dev \
+    hdf5-dev \
+    json-c-dev \
+    kealib-dev \
+    libaec-dev \
+    libarchive-dev \
+    libdeflate-dev \
+    libgeotiff-dev \
+    libheif-dev \
+    libjpeg-turbo-dev \
+    libjxl-dev \
+    libkml-dev \
+    libpng-dev \
+    libpq-dev \
+    librasterlite2-dev \
+    libspatialite-dev \
+    libtirpc-dev \
+    libwebp-dev \
+    libxml2-dev \
+    libxslt-dev \
+    linux-headers \
+    lz4-dev \
+    make \
+    mariadb-connector-c-dev \
+    netcdf-dev \
+    odbc-cpp-wrapper-dev \
+    ogdi-dev \
+    openexr-dev \
+    openjpeg-dev \
+    openssl-dev \
+    pcre2-dev \
+    podofo-dev \
+    poppler-dev \
+    proj-dev \
+    proj-util \
+    py3-pyarrow \
+    py3-pyarrow-pyc \
+    py3-numpy \
+    py3-numpy-dev \
+    py3-pip \
+    py3-setuptools \
+    python3-dev \
+    qhull-dev \
+    sfcgal-dev \
+    snappy-dev \
+    sqlite-dev \
+    swig \
+    tiff-dev \
+    unixodbc-dev \
+    xerces-c-dev \
+    xz-dev \
+    zlib-dev \
+    zstd-dev
+
+COPY requirements.txt /tmp/
+RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt