Remove OGDI support (VMAP)

.github/workflows/alpine/Dockerfile.ci

@@ -44,7 +44,6 @@ RUN apk add \
     muparser-dev \
     netcdf-dev \
     odbc-cpp-wrapper-dev \
-    ogdi-dev \
     openexr-dev \
     openjpeg-dev \
     openssl-dev \

.github/workflows/alpine_32bit/Dockerfile.ci

@@ -45,7 +45,6 @@ RUN apk add \
     mariadb-connector-c-dev \
     netcdf-dev \
     odbc-cpp-wrapper-dev \
-    ogdi-dev \
     openexr-dev \
     openjpeg-dev \
     openssl-dev \

.github/workflows/alpine_32bit/test.sh

@@ -11,9 +11,6 @@ make quicktest
 PYTEST_SKIP=
 PYTEST_XFAIL="gcore/tiff_ovr.py gdrivers/gribmultidim.py gdrivers/mbtiles.py gdrivers/vrtwarp.py gdrivers/wcs.py utilities/test_gdalwarp.py pyscripts/test_gdal_pansharpen.py"
 
-# Fails with ERROR 1: OGDI DataSource Open Failed: Could not find the dynamic library "vrf"
-PYTEST_SKIP="ogr/ogr_ogdi.py $PYTEST_SKIP"
-
 # Stalls on it. Probably not enough memory
 PYTEST_SKIP="gdrivers/jp2openjpeg.py $PYTEST_SKIP"
 

.github/workflows/asan/test.sh

@@ -49,7 +49,6 @@ find -L \
         ! -name netcdf_cfchecks.py \
         ! -name ogr_fgdb.py `# Don't run these` \
         ! -name ogr_pgeo.py `# Don't run these` \
-        ! -name ogr_ogdi.py `# Error on ogdi_5 test` \
         ! -name ogr_gpsbabel.py `# new-delete-type-mismatch error in gpsbabel binary that we can't suppress` \
         ! -name "__init__.py" \
         ! -path 'ogr/data/*' \

.github/workflows/cmake_builds.yml

@@ -55,7 +55,7 @@ jobs:
            libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libcrypto++-dev libkml-dev \
            libmysqlclient-dev libarmadillo-dev wget libfyba-dev libjsoncpp-dev libexpat1-dev \
            libclc-dev ocl-icd-opencl-dev libsqlite3-dev sqlite3-pcre libpcre3-dev libspatialite-dev libsfcgal-dev fossil libcairo2-dev libjson-c-dev libdeflate-dev liblz4-dev libblosc-dev libarchive-dev \
-           libqhull-dev libcfitsio-dev libogdi-dev libopenjp2-7-dev libheif-dev \
+           libqhull-dev libcfitsio-dev libopenjp2-7-dev libheif-dev \
            python3-dev libpython3-dev libpython3.8-dev python3.8-dev python3-numpy python3-lxml pyflakes python3-setuptools python3-pip python3-venv \
            python3-pytest swig doxygen texlive-latex-base make cppcheck ccache g++ \
            libpq-dev libpqtypes-dev postgresql-12 postgresql-12-postgis-3 postgresql-client-12 postgresql-12-postgis-3-scripts
@@ -94,9 +94,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev
         #
-        # Workaround bug in ogdi packaging
-        sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
-        #
         PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U pip wheel setuptools numpy importlib_metadata
         PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt
 

.github/workflows/codeql.yml

@@ -74,7 +74,6 @@ jobs:
             liblzma-dev \
             libmysqlclient-dev \
             libnetcdf-dev \
-            libogdi-dev \
             libopenexr-dev \
             libopenjp2-7-dev \
             libpcre3-dev \

.github/workflows/s390x/Dockerfile.ci

@@ -53,7 +53,6 @@ RUN apt-get update && \
     liblzma-dev${APT_ARCH_SUFFIX} \
     libmysqlclient-dev${APT_ARCH_SUFFIX} \
     libnetcdf-dev${APT_ARCH_SUFFIX} \
-    libogdi-dev${APT_ARCH_SUFFIX} \
     libopenexr-dev${APT_ARCH_SUFFIX} \
     libopenjp2-7-dev${APT_ARCH_SUFFIX} \
     libpcre3-dev${APT_ARCH_SUFFIX} \

.github/workflows/ubuntu_20.04/Dockerfile.ci

@@ -52,7 +52,6 @@ RUN apt-get update -y \
     libmuparser-dev \
     libmysqlclient-dev \
     libnetcdf-dev \
-    libogdi-dev \
     libopenexr-dev \
     libopenjp2-7-dev \
     libpcre2-dev \
@@ -124,9 +123,6 @@ RUN mkdir tiledb \
     && cd ../.. \
     && rm -rf tiledeb
 
-# Workaround bug in ogdi packaging
-RUN ln -s /usr/lib/ogdi/libvrf.so /usr/lib
-
 # Build libjxl
 # libjxl being still unstable, if the main branch fails to compile/test
 # you can replace JXL_TREEISH=main by JXL_TREEISH=sha1_of_known_working_commit
@@ -276,7 +272,7 @@ RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
     ); fi
 
 # Install exprtk
-RUN wget -q -P /usr/local/include https://raw.githubusercontent.com/ArashPartow/exprtk/refs/heads/master/exprtk.hpp 
+RUN wget -q -P /usr/local/include https://raw.githubusercontent.com/ArashPartow/exprtk/refs/heads/master/exprtk.hpp
 
 RUN ldconfig
 

.github/workflows/ubuntu_22.04/Dockerfile.ci

@@ -39,7 +39,6 @@ RUN apt-get update && \
     liblzma-dev \
     libmysqlclient-dev \
     libnetcdf-dev \
-    libogdi-dev \
     libopenexr-dev \
     libopenjp2-7-dev \
     libpcre3-dev \

.github/workflows/ubuntu_24.04/Dockerfile.ci

@@ -40,7 +40,6 @@ RUN apt-get update && \
     libmuparser-dev \
     libmysqlclient-dev \
     libnetcdf-dev \
-    libogdi-dev \
     libopenexr-dev \
     libopenjp2-7-dev \
     libpcre3-dev \
@@ -158,10 +157,6 @@ RUN curl -L -O https://download.oracle.com/otn_software/linux/instantclient/1990
     && apt-get install -y libaio1t64 \
     && ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
 
-# Workaround libogdi packaging issue
-# Cf https://lists.debian.org/debian-gis/2024/04/msg00006.html
-RUN ln -s /usr/lib/x86_64-linux-gnu/ogdi/4.1/libvrf.so /usr/lib/x86_64-linux-gnu
-
 COPY requirements.txt /tmp/
 RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt
 

.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt

@@ -36,7 +36,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   WAsP -vector- (rw+v): WAsP .map format (*.map)
   PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
   MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
-  OGR_OGDI -vector- (ro): OGDI Vectors (VPF, VMAP, DCW)
   PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
   MySQL -vector- (rw+): MySQL
   OCI -vector- (rw+): Oracle Spatial

cmake/helpers/CheckDependentLibraries.cmake

@@ -409,7 +409,6 @@ gdal_check_package(NetCDF "Enable netCDF driver" CAN_DISABLE
   NAMES netCDF
   TARGETS netCDF::netcdf NETCDF::netCDF
   VERSION "4.7")
-gdal_check_package(OGDI "Enable ogr_OGDI driver" CAN_DISABLE)
 gdal_check_package(OpenCL "Enable OpenCL (may be used for warping)" CAN_DISABLE)
 
 set(PostgreSQL_ADDITIONAL_VERSIONS "14" CACHE STRING "Additional PostgreSQL versions to check")