Skip to content

Commit

Permalink
Merge pull request #5269 from rouault/remove_drivers_3_5
Browse files Browse the repository at this point in the history
Remove deprecated drivers planned for removal in 3.5
  • Loading branch information
rouault committed Mar 28, 2022
2 parents 14aeda0 + c79f7f2 commit 843cab3
Show file tree
Hide file tree
Showing 278 changed files with 91 additions and 61,841 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/asan/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi


sudo apt-get update
sudo apt-get install -y --allow-unauthenticated libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat1-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libsqlite3-dev gpsbabel swig libhdf4-alt-dev libhdf5-dev libpodofo-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libmysqlclient-dev libogdi-dev libcfitsio-dev openjdk-8-jdk libzstd-dev ccache curl autoconf automake sqlite3 libspatialite-dev make g++ libssl-dev libsfcgal-dev libgeotiff-dev libcharls-dev libopenjp2-7-dev libcairo2-dev python3-dev python3-setuptools python3-numpy python3-pip clang
sudo apt-get install -y --allow-unauthenticated libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat1-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libsqlite3-dev gpsbabel swig libhdf4-alt-dev libhdf5-dev libpodofo-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libmysqlclient-dev libogdi-dev libcfitsio-dev openjdk-8-jdk libzstd-dev ccache curl autoconf automake sqlite3 libspatialite-dev make g++ libssl-dev libsfcgal-dev libgeotiff-dev libopenjp2-7-dev libcairo2-dev python3-dev python3-setuptools python3-numpy python3-pip clang

# Workaround bug in ogdi packaging
sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/cmake_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libcrypto++-dev libdap-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 \
libqhull-dev libcfitsio-dev libogdi-dev libopenjp2-7-dev libcharls-dev libheif-dev \
libqhull-dev libcfitsio-dev libogdi-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
Expand Down Expand Up @@ -315,7 +315,7 @@ jobs:
conda install --yes --quiet --name gdalenv -c conda-forge proj geos hdf4 hdf5 kealib \
libnetcdf openjpeg poppler==21.03.0 libtiff libpng xerces-c expat libxml2 kealib json-c \
cfitsio freexl geotiff jpeg libpq libspatialite libwebp-base pcre pcre2 postgresql \
sqlite tiledb zstd charls cryptopp cgal jasper doxygen librttopo libkml openssl xz \
sqlite tiledb zstd cryptopp cgal doxygen librttopo libkml openssl xz \
openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc
cd $CONDA_PREFIX/Library/share/proj
curl http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz > proj-datumgrid-1.8.tar.gz
Expand Down Expand Up @@ -345,15 +345,14 @@ jobs:
rm /usr/bin/link
- name: Configure
shell: bash -l {0}
# FIXME: Jasper manually disabled because of linking errors: lacks jp2_box_destroy
# Disable MySQL because of "error LNK2038: mismatch detected for '_MSC_VER': value '1800' doesn't match value '1900' in ogrmysqldatasource.obj" and other errors
# Disable LIBKML because of issue at linking time with kmlXXXX.lib being debug libraries
# Note that the leading space in CMAKE_C/CXX_FLAGS=" /WX" is due to using Bash on Windows that would
# otherwise interpret /bla has a file relative to the Bash root directory and would replace it by a path like c:\Program Files\git\WX
# BUILD_JAVA_BINDINGS=OFF because we get "Error occurred during initialization of VM. Corrupted ZIP library: C:\Miniconda\envs\gdalenv\Library\bin\zip.dll" when running java. Not reproducible on a standard VM
run: |
mkdir -p $GITHUB_WORKSPACE/build
cmake -G "${generator}" -Werror=dev "-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install-gdal" "-DUSE_CCACHE=ON" "-DCMAKE_PREFIX_PATH=${CONDA_PREFIX}" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DJASPER_LIBRARY_RELEASE:FILEPATH= -DLIBKML_BASE_LIBRARY:FILEPATH= -DGDAL_ENABLE_PLUGINS:BOOL=ON -DGDAL_ENABLE_PLUGINS_NO_DEPS:BOOL=ON -DGDAL_USE_PUBLICDECOMPWT:BOOL=ON -DPUBLICDECOMPWT_URL=https://github.com/rouault/PublicDecompWT -DBUILD_JAVA_BINDINGS=OFF -DBUILD_CSHARP_BINDINGS=ON -DGDAL_USE_MYSQL:BOOL=OFF -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DWERROR_DEV_FLAG="-Werror=dev" -DCMAKE_BUILD_TYPE=Release
cmake -G "${generator}" -Werror=dev "-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install-gdal" "-DUSE_CCACHE=ON" "-DCMAKE_PREFIX_PATH=${CONDA_PREFIX}" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DLIBKML_BASE_LIBRARY:FILEPATH= -DGDAL_ENABLE_PLUGINS:BOOL=ON -DGDAL_ENABLE_PLUGINS_NO_DEPS:BOOL=ON -DGDAL_USE_PUBLICDECOMPWT:BOOL=ON -DPUBLICDECOMPWT_URL=https://github.com/rouault/PublicDecompWT -DBUILD_JAVA_BINDINGS=OFF -DBUILD_CSHARP_BINDINGS=ON -DGDAL_USE_MYSQL:BOOL=OFF -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DWERROR_DEV_FLAG="-Werror=dev" -DCMAKE_BUILD_TYPE=Release
- name: Build
shell: bash -l {0}
run: cmake --build $GITHUB_WORKSPACE/build --config Release -j 2
Expand Down Expand Up @@ -428,7 +427,7 @@ jobs:
build-mac:
runs-on: macOS-latest
env:
CMAKE_OPTIONS: -DCFITSIO_ROOT=/usr/local/opt/cfitsio -DPoppler_ROOT=/usr/local/opt/poppler -DPROJ_ROOT=/usr/local/opt/proj -DLibXml2_ROOT=/usr/local/opt/libxml2 -DSPATIALITE_ROOT=/usr/local/opt/libspatialite -DPostgreSQL_ROOT=/usr/local/opt/libpq -DEXPAT_ROOT=/usr/local/opt/expat -DXercesC_ROOT=/usr/local/opt/xerces-c -DSQLite3_ROOT=/usr/local/opt/sqlite -DOpenSSL_ROOT=/usr/local/opt/openssl -DPNG_ROOT=/usr/local/opt/libpng -DJPEG_ROOT=/usr/local/opt/jpeg -DOpenJPEG_ROOT=/usr/local/opt/openjpeg -DCURL_ROOT=/usr/local/opt/curl -DGDAL_USE_DAP=OFF -DGDAL_USE_JASPER=OFF
CMAKE_OPTIONS: -DCFITSIO_ROOT=/usr/local/opt/cfitsio -DPoppler_ROOT=/usr/local/opt/poppler -DPROJ_ROOT=/usr/local/opt/proj -DLibXml2_ROOT=/usr/local/opt/libxml2 -DSPATIALITE_ROOT=/usr/local/opt/libspatialite -DPostgreSQL_ROOT=/usr/local/opt/libpq -DEXPAT_ROOT=/usr/local/opt/expat -DXercesC_ROOT=/usr/local/opt/xerces-c -DSQLite3_ROOT=/usr/local/opt/sqlite -DOpenSSL_ROOT=/usr/local/opt/openssl -DPNG_ROOT=/usr/local/opt/libpng -DJPEG_ROOT=/usr/local/opt/jpeg -DOpenJPEG_ROOT=/usr/local/opt/openjpeg -DCURL_ROOT=/usr/local/opt/curl -DGDAL_USE_DAP=OFF
cache-name: cmake-macos
steps:
- name: Setup xcode
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu_18.04/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ docker run --name mariadb -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -
# PostGIS
docker run -v /home:/home --name "postgis" -p 25432:5432 -e ALLOW_IP_RANGE=0.0.0.0/0 -d -t kartoza/postgis:13.0

sudo apt-get install -y --allow-unauthenticated python3-dev python3-pip python3-numpy libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf automake sqlite3 libopenexr-dev g++ fossil libgeotiff-dev libcharls-dev libopenjp2-7-dev libcairo2-dev doxygen
sudo apt-get install -y --allow-unauthenticated python3-dev python3-pip python3-numpy libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf automake sqlite3 libopenexr-dev g++ fossil libgeotiff-dev libopenjp2-7-dev libcairo2-dev doxygen
# libheif-dev: strane linking errors (__cxa_init_primary_exception, std::thread::_State::~_State()) related to also linking to FileGDB API
# libpodofo-dev : FIXME incompatibilities at runtime with that version
#sudo apt-get install -y --allow-unauthenticated libsfcgal-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu_18.04_32bit/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if test -f "$WORK_DIR/ccache.tar.gz"; then
fi


sudo apt-get install -y --no-install-recommends --allow-unauthenticated python3-dev python3-setuptools python3-pip python3-numpy libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf sqlite3 libopenexr-dev g++ fossil libgeotiff-dev libcharls-dev libopenjp2-7-dev libcairo2-dev git libtool automake grep
sudo apt-get install -y --no-install-recommends --allow-unauthenticated python3-dev python3-setuptools python3-pip python3-numpy libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libdap-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf sqlite3 libopenexr-dev g++ fossil libgeotiff-dev libopenjp2-7-dev libcairo2-dev git libtool automake grep


SCRIPT_DIR=$(dirname "$0")
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu_20.04/build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-rec
git make cmake wget zip unzip libtool automake \
zlib1g-dev libsqlite3-dev pkg-config libcurl4-gnutls-dev \
libproj-dev libtiff5-dev \
libcharls-dev libopenjp2-7-dev libcairo2-dev \
libopenjp2-7-dev libcairo2-dev \
python3-dev python3-numpy python3-pip \
libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev \
curl libxml2-dev libexpat-dev libxerces-c-dev \
Expand Down
47 changes: 2 additions & 45 deletions GDALmake.opt.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ INSTALL_DATA = $(GDAL_ROOT)/install-sh -c -m 0644
INSTALL_DIR = $(GDAL_ROOT)/install-sh -d

LIBS = @LIBS@ $(KAK_LIBS) $(DWG_LIBS) $(CURL_LIB) \
$(MRSID_LIBS) $(MRSID_LIDAR_LIBS) $(ECW_LIBS) $(INGRES_LIB) \
$(MRSID_LIBS) $(ECW_LIBS) \
$(PCIDSK_LIB) $(RASDAMAN_LIB) $(SOSI_LIB) $(BRUNSLI_LIB) \
$(OPENCL_LIB) $(JVM_LIB) $(LIBICONV) $(FGDB_LIB) $(LIBXML2_LIB) $(MONGODB_LIB) \
$(OPENCL_LIB) $(LIBICONV) $(FGDB_LIB) $(LIBXML2_LIB) \
$(MONGOCXXV3_LIBS) $(JNI_LIB) $(HDFS_LIB)

SSEFLAGS = @SSEFLAGS@
Expand Down Expand Up @@ -154,14 +154,6 @@ HAVE_OGR_PG = @HAVE_PG@
HAVE_POSTGISRASTER = @HAVE_PG@
PG_INC = @PG_INC@

#
# INGRES
#
II_SYSTEM = @II_SYSTEM@
HAVE_INGRES = @HAVE_INGRES@
INGRES_LIB = @INGRES_LIB@
INGRES_INC = @INGRES_INC@

#
# MySQL support.
#
Expand Down Expand Up @@ -239,26 +231,13 @@ KAK_LIBS = $(KAK_OBJ)
endif
endif

#
# JPEG-2000 Support via JasPer library.
#
HAVE_JASPER = @HAVE_JASPER@
JASPER_FLAGS = @JASPER_FLAGS@

#
# MrSID support via LizardTech's DSDK
#
MRSID_FLAGS = @MRSID_FLAGS@
MRSID_INCLUDE = @MRSID_INCLUDE@
MRSID_LIBS = @MRSID_LIBS@

#
#
# MrSID/MG4 support via LizardTech LiDAR SDK
#
MRSID_LIDAR_INCLUDE = @MRSID_LIDAR_INCLUDE@
MRSID_LIDAR_LIBS = @MRSID_LIDAR_LIBS@

#
# ECW Related
#
Expand Down Expand Up @@ -325,13 +304,6 @@ HAVE_FGDB = @FGDB_ENABLED@
FGDB_LIB = @FGDB_LIB@
FGDB_INC = @FGDB_INC@

#
# MongoDB
#
HAVE_MONGODB = @MONGODB_ENABLED@
MONGODB_LIB = @MONGODB_LIB@
MONGODB_INC = @MONGODB_INC@

#
# MongoCXX v3
#
Expand Down Expand Up @@ -503,12 +475,6 @@ HAVE_PDFIUM = @HAVE_PDFIUM@
PDFIUM_INC = @PDFIUM_INC@
PDFIUM_PLUGIN_LIB = @PDFIUM_PLUGIN_LIB@

#
# CharLs stuff
#
HAVE_CHARLS = @HAVE_CHARLS@
CHARLS_INC = @CHARLS_INC@

#
# Teigha stuff
#
Expand All @@ -529,15 +495,6 @@ ifeq ($(GNM_ENABLED),yes)
CPPFLAGS := -DGNM_ENABLED $(CPPFLAGS)
endif

#
# Java stuff
#
JAVA_HOME = @JAVA_HOME@
JAVA_INC = @JAVA_INC@
JVM_LIB = @JVM_LIB@

MDB_ENABLED = @MDB_ENABLED@

HAVE_ARMADILLO = @HAVE_ARMADILLO@

#
Expand Down
Binary file removed autotest/gdrivers/data/fujibas/fakefujibas.img
Binary file not shown.
11 changes: 0 additions & 11 deletions autotest/gdrivers/data/fujibas/fakefujibas.pcb

This file was deleted.

Binary file removed autotest/gdrivers/data/gmt/gmt_1.grd
Binary file not shown.
Binary file removed autotest/gdrivers/data/ida/DWI01012.AFC
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/8bit_pal.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/8bit_rgb.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt02.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt09.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt09t.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt10.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt24.cit
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt27.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt28.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt29.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt30.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/frmt31.cot
Binary file not shown.
Binary file removed autotest/gdrivers/data/ingr/uint32.cot
Binary file not shown.
Loading

0 comments on commit 843cab3

Please sign in to comment.