diff -Nru libgdal-grass-3.4.3/.github/workflows/apt.txt libgdal-grass-1.0.2/.github/workflows/apt.txt --- libgdal-grass-3.4.3/.github/workflows/apt.txt 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/.github/workflows/apt.txt 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,6 @@ +gdal-bin +grass +grass-dev +libgdal-dev +libpq-dev +pkg-config diff -Nru libgdal-grass-3.4.3/.github/workflows/build_ubuntu.sh libgdal-grass-1.0.2/.github/workflows/build_ubuntu.sh --- libgdal-grass-3.4.3/.github/workflows/build_ubuntu.sh 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/.github/workflows/build_ubuntu.sh 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# fail on non-zero return code from a subprocess +set -e + +# print commands +set -x + +if [ -z "$1" ]; then + echo "Usage: $0 GDAL_AUTOLOAD_DIR" + exit 1 +fi + +# non-existent variables as an errors +set -u + +# versionless in future? +GRASS=grass$(pkg-config --modversion grass | cut -d. -f1,2 | sed 's+\.++g') + +export GDAL_AUTOLOAD_DIR=$1 + +./configure \ + --prefix=/usr \ + --with-autoload=${GDAL_AUTOLOAD_DIR} \ + --with-grass=/usr/lib/${GRASS} \ + --with-postgres-includes=$(pg_config --includedir) + +make +make install diff -Nru libgdal-grass-3.4.3/.github/workflows/test_simple.sh libgdal-grass-1.0.2/.github/workflows/test_simple.sh --- libgdal-grass-3.4.3/.github/workflows/test_simple.sh 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/.github/workflows/test_simple.sh 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# fail on non-zero return code from a subprocess +set -e + +# print commands +set -x + +if [ -z "$1" ]; then + echo "Usage: $0 GDAL_AUTOLOAD_DIR" + exit 1 +fi + +# non-existent variables as an errors +set -u + +export GDAL_AUTOLOAD_DIR=$1 +export GDAL_DRIVER_PATH=${GDAL_AUTOLOAD_DIR} + +# add small GRASS GIS dataset for tests +(mkdir -p $HOME/grassdata && \ + cd $HOME/grassdata/ && \ + wget -c --quiet https://grass.osgeo.org/sampledata/north_carolina/nc_spm_08_micro.zip && \ + unzip nc_spm_08_micro.zip && \ + rm -f nc_spm_08_micro.zip ) + +# Using LD_LIBRARY_PATH workaround for GRASS GIS < 7.8.8 +export LD_LIBRARY_PATH=$(grass --config path)/lib + +# test GRASS GIS raster map +gdalinfo $HOME/grassdata/nc_spm_08_micro/PERMANENT/cellhd/elevation + +# test GRASS GIS vector map +ogrinfo -so -al $HOME/grassdata/nc_spm_08_micro/PERMANENT/vector/firestations/head diff -Nru libgdal-grass-3.4.3/.github/workflows/ubuntu.yml libgdal-grass-1.0.2/.github/workflows/ubuntu.yml --- libgdal-grass-3.4.3/.github/workflows/ubuntu.yml 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/.github/workflows/ubuntu.yml 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,23 @@ +name: Build on Ubuntu +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Check out repository code + uses: actions/checkout@v3 + - name: Get dependencies + run: | + sudo apt-get update -y + sudo apt-get install -y wget git gawk findutils + xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \ + sudo apt-get install -y --no-install-recommends --no-install-suggests + - name: Create GDAL_AUTOLOAD directory + run: | + mkdir $HOME/gdalplugins + - name: Build + run: .github/workflows/build_ubuntu.sh $HOME/gdalplugins + - name: Test executing of GDAL with driver on GRASS maps + run: .github/workflows/test_simple.sh $HOME/gdalplugins + diff -Nru libgdal-grass-3.4.3/Makefile.in libgdal-grass-1.0.2/Makefile.in --- libgdal-grass-3.4.3/Makefile.in 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/Makefile.in 2022-11-06 10:42:02.000000000 +0000 @@ -22,9 +22,9 @@ default: $(GLIBNAME) $(OLIBNAME) install: default - install -d $(AUTOLOAD_DIR) - cp $(GLIBNAME) $(AUTOLOAD_DIR) - cp $(OLIBNAME) $(AUTOLOAD_DIR) + install -d $(DESTDIR)$(AUTOLOAD_DIR) + cp $(GLIBNAME) $(DESTDIR)$(AUTOLOAD_DIR) + cp $(OLIBNAME) $(DESTDIR)$(AUTOLOAD_DIR) clean: rm -f $(OLIBNAME) $(GLIBNAME) *.o @@ -34,10 +34,10 @@ $(GLIBNAME): grass.o - $(LD_SHARED) $(LDFLAGS) grass.o $(LIBS) -o $(GLIBNAME) + $(LD_SHARED) $(LDFLAGS) grass.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,"@GRASS_GISBASE@/lib" $(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o - $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) + $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,"@GRASS_GISBASE@/lib" %.o: %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< diff -Nru libgdal-grass-3.4.3/README libgdal-grass-1.0.2/README --- libgdal-grass-3.4.3/README 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -Standalone GRASS Drivers for GDAL and OGR -========================================= - -This package contains standalone drivers for GRASS raster and vector -files that can be built after GDAL has been built and installed as an -"autoload" driver. - -This is particularly useful in resolving problems with GRASS depending -on GDAL, but GDAL with GRASS support depending on GRASS. With this -package you can configure and install GDAL normally (--without-grass), then -build and install GRASS normally and finally build and install this driver. - -To build this driver it is necessary for it to find GDAL and GRASS support -files. Typically the configure and build process would look something like: - -./configure --with-gdal=/usr/local/bin/gdal-config --with-grass=/usr/local/grass-7.0.1 -make -sudo make install - -See also: - - https://gdal.org/ - https://grass.osgeo.org - - ---- - -FAQs ----- - - -Question: - -I am trying to install gdal-grass 3.1.3 on RedHat Enterprise Linux -advanced server 3.0. I have previously installed gdal 3.1.3 --without-grass, -and GRASS 7.0.1 with GDAL. I have tried to configure gdal-grass -with: - -./configure --with-gdal=/usr/local/bin/gdal-config \ - --with-grass=/usr/local/grass-7.0.1 - -It seems to find gdal alright, but then balks at the Grass location. The -Grass location specified above is indeed the correct location. I have -also tried adding --with-grass=/usr/local/grass-7.0.1/lib, but with no -success. My error is: - -... -checking for G_asprintf in -lgrass_gis ... no -configure: error: --with-grass=/usr/local/grass-7.0.1 requested, but -libraries not found? - - -Answer: - -Your problem is likely to be solved by editing /etc/ld.so.conf to -include the locations of proj, gdal, grass, and geos. Specifically, -the full path to both gdal-config and geos-config, and the full paths -to the library locations of proj (often /usr/local/lib) and grass -(/usr/local/grass-7.0.1/lib). After editing ld.so.conf, run ldconfig, -and you should be good to go. - -I ran into this problem this weekend (and posted for help to this -list), so it seems to be a pretty common issue. diff -Nru libgdal-grass-3.4.3/README.md libgdal-grass-1.0.2/README.md --- libgdal-grass-3.4.3/README.md 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/README.md 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,35 @@ +## Standalone GRASS Drivers for GDAL and OGR + +This package contains standalone drivers for [GRASS](http://grass.osgeo.org/) +raster and vector files that can be built after [GDAL](https://gdal.org/) has +been built and installed as a GDAL "autoload" driver. + +This approach avoids circular dependencies with GRASS depending on GDAL, +but GDAL with GRASS support depending on GRASS. With this driver package +you configure and install GDAL normally, then build and install GRASS normally +and finally build and install this driver. + +To build this driver it is necessary for it to find GDAL and GRASS +support files. Typically the configure and build process would look +something like: + +``` +./configure --with-gdal=/usr/bin/gdal-config \ + --with-grass=/usr/grass +make +sudo make install +``` + +## Usage + +Access GRASS GIS raster data from GDAL: + +``` +gdalinfo $HOME/grassdata/nc_spm_08_grass7/PERMANENT/cellhd/elevation +``` + +Access GRASS GIS vector data from GDAL-OGR: + +``` +ogrinfo -so -al $HOME/grassdata/nc_spm_08_grass7/PERMANENT/vector/zipcodes/head +``` diff -Nru libgdal-grass-3.4.3/VERSION libgdal-grass-1.0.2/VERSION --- libgdal-grass-3.4.3/VERSION 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/VERSION 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.4.3 diff -Nru libgdal-grass-3.4.3/aclocal.m4 libgdal-grass-1.0.2/aclocal.m4 --- libgdal-grass-3.4.3/aclocal.m4 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/aclocal.m4 2022-11-06 10:42:02.000000000 +0000 @@ -19,11 +19,6 @@ AC_DEFUN(AC_COMPILER_WFLAGS, [ - # Remove -g from compile flags, we will add via CFG variable if - # we need it. - CXXFLAGS=`echo "$CXXFLAGS " | sed "s/-g //"` - CFLAGS=`echo "$CFLAGS " | sed "s/-g //"` - # check for GNU compiler, and use -Wall if test "$GCC" = "yes"; then C_WFLAGS="-Wall" diff -Nru libgdal-grass-3.4.3/debian/.gitlab-ci.yml libgdal-grass-1.0.2/debian/.gitlab-ci.yml --- libgdal-grass-3.4.3/debian/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/.gitlab-ci.yml 2023-10-26 11:30:23.000000000 +0000 @@ -0,0 +1,6 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml + +variables: + SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1 diff -Nru libgdal-grass-3.4.3/debian/README.source libgdal-grass-1.0.2/debian/README.source --- libgdal-grass-3.4.3/debian/README.source 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/README.source 2023-10-26 11:30:23.000000000 +0000 @@ -1,19 +1,27 @@ -How to create an upstream tarball for the gdal-grass plugin ------------------------------------------------------------ +GDAL-GRASS for Debian +--------------------- -The gdal-grass source tarball can be generated starting from -the gdal debianized source as follows: +The GDAL plugins are tightly coupled to the version of GDAL and GRASS +they were built with. -apt-get source gdal -dpkg-source -x gdal_*-*.dsc -cd gdal-* -debian/rules gdal-grass - -It will generate a gdal-grass upstream tarball in the directory -where you unpack the Debian sources. - -The gdal source provides the gdal-grass stanza since 1.5.2-1, -with previous versions you need to create the tarball by -configuring the package and run `make dist' within the -frmts/grass directory. +The libgdal-grass package needs to be rebuilt whenever a new version +of the grass package is uploaded. + +GRASS performs a version check using the upstream version, which can +trigger errors like this: + + ERROR: Module built against version 8.2.0 but trying to use version + 8.2.1. You need to rebuild GRASS GIS or untangle multiple + installations. + +The libgdal-grass package also needs to be rebuilt whenever the GDAL +major or minor version changes. + +The GDAL version check an trigger errors like this: + + ERROR 1: GDAL/GRASS driver was compiled against GDAL 2.1, but the + current library version is 2.2 + + ERROR 1: OGR/GRASS driver was compiled against GDAL 2.1, but the + current library version is 2.2 diff -Nru libgdal-grass-3.4.3/debian/changelog libgdal-grass-1.0.2/debian/changelog --- libgdal-grass-3.4.3/debian/changelog 2022-06-21 11:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/changelog 2023-10-26 11:33:04.000000000 +0000 @@ -1,20 +1,112 @@ -libgdal-grass (3.4.3-2~jammy2) jammy; urgency=medium +libgdal-grass (1:1.0.2-7~jammy1) jammy; urgency=medium - * Update packaging for GRASS 8.2.0 + * Rebuild for jammy. - -- Angelos Tzotsos Tue, 21 Jun 2022 14:00:00 +0300 + -- Martin Landa Thu, 26 Oct 2023 13:33:04 +0200 -libgdal-grass (3.4.3-2~jammy1) jammy; urgency=medium +libgdal-grass (1:1.0.2-6) unstable; urgency=medium - * No change rebuild for grass 8.2 + * Ignore ogrinfo failure on 32 bit architectures, + instead of limiting autopkgtest architectures. + * Update packaging for GRASS 8.3.1. - -- Angelos Tzotsos Fri, 10 Jun 2022 14:00:00 +0300 + -- Bas Couwenberg Wed, 25 Oct 2023 21:47:36 +0200 -libgdal-grass (3.4.3-2~jammy0) jammy; urgency=medium +libgdal-grass (1:1.0.2-6~jammy1) jammy; urgency=medium - * No change rebuild for jammy. + * Rebuild for jammy. - -- Angelos Tzotsos Sun, 29 May 2022 12:00:00 +0300 + -- Martin Landa Wed, 13 Sep 2023 15:02:31 +0200 + +libgdal-grass (1:1.0.2-5) unstable; urgency=medium + + * Bump debhelper compat to 13. + * Drop grass build dependency. + * Update packaging for GRASS 8.3.0. + + -- Bas Couwenberg Tue, 27 Jun 2023 06:14:48 +0200 + +libgdal-grass (1:1.0.2-4) unstable; urgency=medium + + * Bump Standards-Version to 4.6.2, no changes. + * Update packaging for GRASS 8.2.1. + + -- Bas Couwenberg Sun, 22 Jan 2023 07:48:53 +0100 + +libgdal-grass (1:1.0.2-3) unstable; urgency=medium + + * Add Rules-Requires-Root to control file. + * Update README.source for GRASS version check changes. + + -- Bas Couwenberg Fri, 02 Dec 2022 11:53:10 +0100 + +libgdal-grass (1:1.0.2-2) unstable; urgency=medium + + * Catch wget & tar errors in autopkgtest. + * Limit autopkgtest to 64bit architectures. + See: https://github.com/OSGeo/grass/issues/2631 + + -- Bas Couwenberg Sun, 06 Nov 2022 18:10:07 +0100 + +libgdal-grass (1:1.0.2-1) unstable; urgency=medium + + * New upstream release. + * Drop pr13-Add-support-for-GDAL-3.6.0.patch, included upstream. + + -- Bas Couwenberg Sun, 06 Nov 2022 12:17:52 +0100 + +libgdal-grass (1:1.0.1-2) unstable; urgency=medium + + * Bump Standards-Version to 4.6.1, no changes. + * Add autopkgtest to catch GDAL/GRASS version errors. + * Enable Salsa CI. + * Add upstream patch to fix FTBFS with GDAL 3.6.0. + (closes: #1023506) + + -- Bas Couwenberg Sun, 06 Nov 2022 09:01:16 +0100 + +libgdal-grass (1:1.0.1-1) unstable; urgency=medium + + * New upstream release. + * Drop patches, applied upstream. + * Add docs file to install Markdown documentation. + + -- Bas Couwenberg Tue, 14 Jun 2022 15:11:07 +0200 + +libgdal-grass (1:1.0.0-2) unstable; urgency=medium + + * Add patch to fix undefined symbol issues. + + -- Bas Couwenberg Mon, 13 Jun 2022 21:34:48 +0200 + +libgdal-grass (1:1.0.0-1) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg Sat, 11 Jun 2022 08:11:50 +0200 + +libgdal-grass (1:1.0.0-1~exp1) experimental; urgency=medium + + * New upstream release. + - Use epoch to deal with versioning separate from gdal. + * Remove VERSION check. + * Add upstream metadata. + * Update watch file to use GitHub tags. + * Use Multi-Arch path for gdalplugins with GDAL 3.5.0. + * Drop rpath patch, fixed upstream. + * Drop obsolete dirs file. + * Drop obsolete dh_autoreconf overrides. + * Add patch to support DESTDIR, drop obsolete dh_auto_install override. + * Add patch to not remove -g from C{,XX}FLAGS. + * Update lintian overrides. + + -- Bas Couwenberg Wed, 11 May 2022 11:22:30 +0200 + +libgdal-grass (3.4.3-3) unstable; urgency=medium + + * Update packaging for GRASS 8.2.0. + + -- Bas Couwenberg Sat, 04 Jun 2022 12:58:26 +0200 libgdal-grass (3.4.3-2) unstable; urgency=medium diff -Nru libgdal-grass-3.4.3/debian/control libgdal-grass-1.0.2/debian/control --- libgdal-grass-3.4.3/debian/control 2022-06-21 11:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/control 2023-10-26 11:32:03.000000000 +0000 @@ -4,16 +4,16 @@ Bas Couwenberg Section: science Priority: optional -Build-Depends: debhelper-compat (= 12), - grass (>= 8.2.0), - grass-dev (>= 8.2.0), - libgdal-dev (>= 3.4.3), +Build-Depends: debhelper-compat (= 13), + grass-dev (>= 8.3.1), + libgdal-dev (>= 3.5.0), libpq-dev, pkg-config -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -Homepage: http://www.gdal.org/ +Homepage: https://github.com/OSGeo/gdal-grass +Rules-Requires-Root: no Package: libgdal-grass Architecture: any diff -Nru libgdal-grass-3.4.3/debian/copyright libgdal-grass-1.0.2/debian/copyright --- libgdal-grass-3.4.3/debian/copyright 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/copyright 2023-10-26 11:30:23.000000000 +0000 @@ -1,11 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: GDAL-GRASS -Upstream-Contact: Frank Warmerdam , - Radim Blazek -Source: GDAL-GRASS source is extracted from the GDAL source. - The gdal-grass target in gdal debian/rules creates the tarball from - the frmts/grass directory in the gdal source. GDAL is downloaded - from http://www.gdal.org/ +Upstream-Contact: GDAL-GRASS Developers +Source: https://github.com/OSGeo/gdal-grass Files: * Copyright: 2007-2020, Even Rouault diff -Nru libgdal-grass-3.4.3/debian/dirs libgdal-grass-1.0.2/debian/dirs --- libgdal-grass-3.4.3/debian/dirs 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib diff -Nru libgdal-grass-3.4.3/debian/docs libgdal-grass-1.0.2/debian/docs --- libgdal-grass-3.4.3/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/docs 2023-10-26 11:30:23.000000000 +0000 @@ -0,0 +1,2 @@ +README.md +docs/*.md diff -Nru libgdal-grass-3.4.3/debian/gbp.conf libgdal-grass-1.0.2/debian/gbp.conf --- libgdal-grass-3.4.3/debian/gbp.conf 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/gbp.conf 2023-10-26 11:30:23.000000000 +0000 @@ -6,7 +6,7 @@ # The default name for the Debian branch is "master". # Change it if the name is different (for instance, "debian/unstable"). -debian-branch = master +debian-branch = ubuntu/jammy # git-import-orig uses the following names for the upstream tags. # Change the value if you are not using git-import-orig diff -Nru libgdal-grass-3.4.3/debian/lintian-overrides libgdal-grass-1.0.2/debian/lintian-overrides --- libgdal-grass-3.4.3/debian/lintian-overrides 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/lintian-overrides 2023-10-26 11:30:23.000000000 +0000 @@ -1,3 +1,3 @@ # The run path has been added to get GRASS internal library -custom-library-search-path RUNPATH /usr/lib/grass*/lib [usr/lib/gdalplugins/*_GRASS.so] +custom-library-search-path RUNPATH /usr/lib/grass*/lib * diff -Nru libgdal-grass-3.4.3/debian/patches/rpath libgdal-grass-1.0.2/debian/patches/rpath --- libgdal-grass-3.4.3/debian/patches/rpath 2022-06-21 11:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/patches/rpath 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: Francesco Paolo Lovergine -Subject: Add rpath in solib to allow using the internal path of grass stuff. -Forwarded: not-needed - ---- a/Makefile.in -+++ b/Makefile.in -@@ -34,10 +34,10 @@ distclean: clean - - - $(GLIBNAME): grass.o -- $(LD_SHARED) $(LDFLAGS) grass.o $(LIBS) -o $(GLIBNAME) -+ $(LD_SHARED) $(LDFLAGS) grass.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass82/lib - - $(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o -- $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -+ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass82/lib - - %.o: %.cpp - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< diff -Nru libgdal-grass-3.4.3/debian/patches/series libgdal-grass-1.0.2/debian/patches/series --- libgdal-grass-3.4.3/debian/patches/series 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -rpath diff -Nru libgdal-grass-3.4.3/debian/rules libgdal-grass-1.0.2/debian/rules --- libgdal-grass-3.4.3/debian/rules 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/rules 2023-10-26 11:30:23.000000000 +0000 @@ -10,6 +10,10 @@ # Don't link with as-needed to prevent missing libraries export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed +ifeq (,$(DEB_HOST_MULTIARCH)) + DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +endif + PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2) GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2)) GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/')) @@ -17,38 +21,14 @@ %: dh $@ -override_dh_autoreconf: - mv configure configure.pre-autoreconf - dh_autoreconf - -override_dh_autoreconf_clean: - dh_autoreconf_clean - if [ -e "configure.pre-autoreconf" ]; then \ - mv configure.pre-autoreconf configure ; \ - fi - override_dh_auto_configure: - # Abort if source and gdal have not the same versions. - if [ `gdal-config --version` != `cat VERSION` ]; then \ - echo "GDAL version and GDAL GRASS plugin version are not aligned. Please, upload a proper plugin source version."; \ - exit 1; \ - fi - dh_auto_configure -- \ - --prefix=/usr \ - --with-autoload=/usr/lib/gdalplugins \ + --with-autoload=/usr/lib/$(DEB_HOST_MULTIARCH)/gdalplugins \ --with-grass=/usr/lib/$(GRASS) \ --with-postgres-includes=$(shell pg_config --includedir) -override_dh_auto_install: - dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins - override_dh_shlibdeps: dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib -override_dh_strip: - # Debug files contain no debug symbols - dh_strip --no-automatic-dbgsym - override_dh_gencontrol: dh_gencontrol -- -Vgrass:Depends="$(GRASS_ABI)" diff -Nru libgdal-grass-3.4.3/debian/tests/control libgdal-grass-1.0.2/debian/tests/control --- libgdal-grass-3.4.3/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/tests/control 2023-10-26 11:30:23.000000000 +0000 @@ -0,0 +1,6 @@ +Tests: gdalinfo-ogrinfo +Depends: ca-certificates, + gdal-bin, + libgdal-grass, + wget +Restrictions: needs-internet, skippable diff -Nru libgdal-grass-3.4.3/debian/tests/gdalinfo-ogrinfo libgdal-grass-1.0.2/debian/tests/gdalinfo-ogrinfo --- libgdal-grass-3.4.3/debian/tests/gdalinfo-ogrinfo 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/tests/gdalinfo-ogrinfo 2023-10-26 11:30:23.000000000 +0000 @@ -0,0 +1,58 @@ +#!/bin/sh + +DATASET_URL="https://grass.osgeo.org/sampledata/spearfish_grass70data-0.3.tar.gz" +DATASET_FILE="spearfish.tar.gz" + +TEMPDIR="$(mktemp -d)" + +cd "${TEMPDIR}" || exit 1 + +wget -q "${DATASET_URL}" -O "${DATASET_FILE}" +RC=$? + +if [ "${RC}" -ne 0 ]; then + cd "${OLDPWD}" || exit 1 + rm -rf "${TEMPDIR}" + + exit "${RC}" +fi + +tar xaf "${DATASET_FILE}" +RC=$? + +if [ "${RC}" -ne 0 ]; then + cd "${OLDPWD}" || exit 1 + rm -rf "${TEMPDIR}" + + exit "${RC}" +fi + +GISBASE="$(ls -d /usr/lib/grass??)" \ +PROJ_NETWORK=ON \ +gdalinfo ./spearfish*/PERMANENT/cellhd/geology +RC=$? + +if [ "${RC}" -ne 0 ]; then + cd "${OLDPWD}" || exit 1 + rm -rf "${TEMPDIR}" + + exit "${RC}" +fi + +echo + +GISBASE="$(ls -d /usr/lib/grass??)" \ +PROJ_NETWORK=ON \ +ogrinfo -so -al ./spearfish*/PERMANENT/vector/roads/head +RC=$? + +cd "${OLDPWD}" || exit 1 +rm -rf "${TEMPDIR}" + +# ogrinfo fails on 32bit architectures: https://github.com/OSGeo/grass/issues/2631 +if [ "${RC}" -ne 0 ] && [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS 2> /dev/null)" = "32" ]; then + echo "Ignoring test failures on 32 bit architecture" + RC=77 +fi + +exit "${RC}" diff -Nru libgdal-grass-3.4.3/debian/upstream/metadata libgdal-grass-1.0.2/debian/upstream/metadata --- libgdal-grass-3.4.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/debian/upstream/metadata 2023-10-26 11:30:23.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/OSGeo/gdal-grass/issues +Bug-Submit: https://github.com/OSGeo/gdal-grass/issues/new +Repository: https://github.com/OSGeo/gdal-grass.git +Repository-Browse: https://github.com/OSGeo/gdal-grass diff -Nru libgdal-grass-3.4.3/debian/watch libgdal-grass-1.0.2/debian/watch --- libgdal-grass-3.4.3/debian/watch 2022-05-12 14:58:17.000000000 +0000 +++ libgdal-grass-1.0.2/debian/watch 2023-10-26 11:30:23.000000000 +0000 @@ -2,6 +2,6 @@ opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\ -dirversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \ -https://download.osgeo.org/gdal/(3\.4\.\d+\w*)/ \ -(?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) +filenamemangle=s/(?:.*\/)?(?:rel|v|gdal-grass)?[\-\_]?(\d[\d\-\.]+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/gdal-grass-$1.$2/ \ +https://github.com/OSGeo/gdal-grass/tags \ +(?:.*?/archive/(?:.*?/)?)?(?:rel|v|gdal-grass)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru libgdal-grass-3.4.3/docs/grass_raster.md libgdal-grass-1.0.2/docs/grass_raster.md --- libgdal-grass-3.4.3/docs/grass_raster.md 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/docs/grass_raster.md 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,66 @@ +# GDAL-GRASS driver: Raster Format + +GDAL optionally supports reading of existing GRASS GIS raster maps or +imagery groups, but not writing or export. The support for GRASS raster +format is determined when the library is configured, and requires +libgrass to be pre-installed (see Notes below). + +GRASS raster maps/imagery groups can be selected in several ways. + +1. The full path to the `cellhd` file can be specified. This is not a + relative path, or at least it must contain all the path components + within the GRASS database including the database root itself. The + following example opens the raster map "elevation" within the GRASS + mapset "PERMANENT" of the GRASS location "myloc" in the GRASS + database located at `/data/grassdb`. + + For example: + + gdalinfo /data/grassdb/myloc/PERMANENT/cellhd/elevation + +2. The full path to the directory containing information about an + imagery group (or the REF file within it) can be specified to refer + to the whole group as a single dataset. The following examples do + the same thing. + + For example: + + gdalinfo /data/grassdb/imagery/raw/group/testmff/REF + gdalinfo /data/grassdb/imagery/raw/group/testmff + +3. If there is a correct `.grassrc7/rc` (GRASS 7) setup file in the + user's home directory then raster maps or imagery groups may be + opened just by the cell or group name. This only works for raster + maps or imagery groups in the current GRASS location and mapset as + defined in the GRASS setup file. + +The following features are supported by the GDAL/GRASS link. + + - Up to 256 entries from raster colormaps are read (0-255). + - Compressed and uncompressed integer (CELL), floating point (FCELL) + and double precision (DCELL) raster maps are all supported. Integer + raster maps are classified with a band type of "Byte" if the 1-byte + per pixel format is used, or "UInt16" if the two byte per pixel + format is used. Otherwise integer raster maps are treated as + "UInt32". + - Georeferencing information is properly read from GRASS format. + - An attempt is made to translate coordinate systems, but some + conversions may be flawed, in particular in handling of datums and + units. + +## Driver capabilities + +## Notes on driver variations + +The driver is able to use the GRASS GIS shared libraries directly +instead of using libgrass (not recommended due to potentially circular +dependencies). Currently both versions of the driver are available and +can be configured using `--with-libgrass` for the libgrass variant or +`--with-grass=` for the GRASS GIS library based version. The GRASS +driver version currently does not support coordinate system access, +though it is hoped that will be corrected at some point. + +## See Also + + - [GRASS GIS home page](https://grass.osgeo.org) + - [old libgrass page](https://web.archive.org/web/20130730111701/http://home.gdal.org/projects/grass/) diff -Nru libgdal-grass-3.4.3/docs/grass_raster.rst libgdal-grass-1.0.2/docs/grass_raster.rst --- libgdal-grass-3.4.3/docs/grass_raster.rst 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/docs/grass_raster.rst 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,83 @@ +.. _raster.grass: + +================================================================================ +GRASS Raster Format +================================================================================ + +.. shortname:: GRASS + +.. build_dependencies:: libgrass + +GDAL optionally supports reading of existing GRASS GIS raster maps or +imagery groups, but not writing or export. The support for GRASS raster +format is determined when the library is configured, and requires +libgrass to be pre-installed (see Notes below). + +GRASS raster maps/imagery groups can be selected in several ways. + +#. The full path to the ``cellhd`` file can be specified. This is not a + relative path, or at least it must contain all the path components + within the GRASS database including the database root itself. The + following example opens the raster map "elevation" within the GRASS + mapset "PERMANENT" of the GRASS location "myloc" in the GRASS + database located at ``/data/grassdb``. + + For example: + + :: + + gdalinfo /data/grassdb/myloc/PERMANENT/cellhd/elevation + +#. The full path to the directory containing information about an + imagery group (or the REF file within it) can be specified to refer + to the whole group as a single dataset. The following examples do the + same thing. + + For example: + + :: + + gdalinfo /data/grassdb/imagery/raw/group/testmff/REF + gdalinfo /data/grassdb/imagery/raw/group/testmff + +#. If there is a correct ``.grassrc7/rc`` (GRASS 7) setup file in the + user's home directory then raster maps or imagery groups may be opened + just by the cell or group name. + This only works for raster maps or imagery groups in the + current GRASS location and mapset as defined in the GRASS setup file. + +The following features are supported by the GDAL/GRASS link. + +- Up to 256 entries from raster colormaps are read (0-255). +- Compressed and uncompressed integer (CELL), floating point (FCELL) + and double precision (DCELL) raster maps are all supported. Integer + raster maps are classified with a band type of "Byte" if the 1-byte + per pixel format is used, or "UInt16" if the two byte per pixel + format is used. Otherwise integer raster maps are treated as + "UInt32". +- Georeferencing information is properly read from GRASS format. +- An attempt is made to translate coordinate systems, but some + conversions may be flawed, in particular in handling of datums and + units. + +Driver capabilities +------------------- + +.. supports_georeferencing:: + +Notes on driver variations +-------------------------- + +The driver is able to use the GRASS GIS shared libraries directly +instead of using libgrass (not recommended due to potentially circular +dependencies). Currently both versions of the driver are available and +can be configured using ``--with-libgrass`` for the libgrass variant or +``--with-grass=`` for the GRASS GIS library based version. The +GRASS driver version currently does not support coordinate system +access, though it is hoped that will be corrected at some point. + +See Also +-------- + +- `GRASS GIS home page `__ +- `libgrass page `__ diff -Nru libgdal-grass-3.4.3/docs/grass_vector.md libgdal-grass-1.0.2/docs/grass_vector.md --- libgdal-grass-3.4.3/docs/grass_vector.md 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/docs/grass_vector.md 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,113 @@ +# GDAL-GRASS driver: Vector Format + +The GDAL-GRASS driver can read GRASS (version 6.0 and higher) vector maps. Each +GRASS vector map is represented as one datasource. A GRASS vector map +may have 0, 1 or more layers. + +GRASS points are represented as wkbPoint, lines and boundaries as +wkbLineString and areas as wkbPolygon. wkbMulti\* and +wkbGeometryCollection are not used. More feature types can be mixed in +one layer. If a layer contains only features of one type, it is set +appropriately and can be retrieved by OGRLayer::GetLayerDefn(); + +If a geometry has more categories of the same layer attached, its +represented as more features (one for each category). + +Both 2D and 3D maps are supported. + +## Driver capabilities + +## Datasource name + +Datasource name is full path to 'head' file in GRASS vector directory. +Using names of GRASS environment variables it can be expressed: + + $GISDBASE/$LOCATION_NAME/$MAPSET/vector/mymap/head + +where 'mymap' is name of a vector map. For example: + + /home/cimrman/grass_data/jizerky/jara/vector/liptakov/head + +## Layer names + +Usually layer numbers are used as layer names. Layer number 0 is used +for all features without any category. It is possible to optionally give +names to GRASS layers linked to database however currently this is not +supported by grass modules. A layer name can be added in 'dbln' vector +file as '/name' after layer number, for example to original record: + + 1 rivers cat $GISDBASE/$LOCATION_NAME/$MAPSET/dbf/ dbf + +it is possible to assign name 'rivers' + + 1/rivers rivers cat $GISDBASE/$LOCATION_NAME/$MAPSET/dbf/ dbf + +the layer 1 will be listed is layer 'rivers'. + +## Attribute filter + +If a layer has attributes stored in a database, the query is passed to +the underlying database driver. That means, that SQL conditions which +can be used depend on the driver and database to which the layer is +linked. For example, DBF driver has currently very limited set of SQL +expressions and PostgreSQL offers very rich set of SQL expressions. + +If a layer has no attributes linked and it has only categories, OGR +internal SQL engine is used to evaluate the expression. Category is an +integer number attached to geometry, it is sort of ID, but it is not FID +as more features in one layer can have the same category. + +Evaluation is done once when the attribute filter is set. + +## Spatial filter + +Bounding boxes of features stored in topology structure are used to +evaluate if a features matches current spatial filter. + +Evaluation is done once when the spatial filter is set. + +## GISBASE + +GISBASE is full path to the directory where GRASS is installed. By +default, GRASS driver is using the path given to gdal configure script. +A different directory can be forced by setting GISBASE environment +variable. GISBASE is used to find GRASS database drivers. + +## Missing topology + +GRASS driver can read GRASS vector files if topology is available (AKA +level 2). If an error is reported, telling that the topology is not +available, it is necessary to build topology within GRASS using v.build +module. + +## Random access + +If random access (GetFeature instead of GetNextFeature) is used on layer +with attributes, the reading of features can be quite slow. It is +because the driver has to query attributes by category for each feature +(to avoid using a lot of memory) and random access to database is +usually slow. This can be improved on GRASS side optimizing/writing file +based (DBF, SQLite) drivers. + +## Known problem + +Because of bug in GRASS library, it is impossible to start/stop database +drivers in FIFO order and FILO order must be used. The GRASS driver for +OGR is written with this limit in mind and drivers are always closed if +not used and if a driver remains opened kill() is used to terminate it. +It can happen however in rare cases, that the driver will try to stop +database driver which is not the last opened and an application hangs. +This can happen if sequential read (GetNextFeature) of a layer is not +finished (reading is stopped before last available feature is reached), +features from another layer are read and then the reading of the first +layer is finished, because in that case kill() is not used. + +## See Also + + - [GRASS GIS home page](https://grass.osgeo.org) + - [old libgrass page](https://web.archive.org/web/20130730111701/http://home.gdal.org/projects/grass/) + +----- + +Development of this driver was financially supported by Faunalia +([www.faunalia.it](http://www.faunalia.it/)). diff -Nru libgdal-grass-3.4.3/docs/grass_vector.rst libgdal-grass-1.0.2/docs/grass_vector.rst --- libgdal-grass-3.4.3/docs/grass_vector.rst 1970-01-01 00:00:00.000000000 +0000 +++ libgdal-grass-1.0.2/docs/grass_vector.rst 2022-11-06 10:42:02.000000000 +0000 @@ -0,0 +1,139 @@ +.. _vector.grass: + +GRASS Vector Format +=================== + +.. shortname:: GRASS + +.. build_dependencies:: libgrass + +GRASS driver can read GRASS (version 6.0 and higher) vector maps. Each +GRASS vector map is represented as one datasource. A GRASS vector map +may have 0, 1 or more layers. + +GRASS points are represented as wkbPoint, lines and boundaries as +wkbLineString and areas as wkbPolygon. wkbMulti\* and +wkbGeometryCollection are not used. More feature types can be mixed in +one layer. If a layer contains only features of one type, it is set +appropriately and can be retrieved by OGRLayer::GetLayerDefn(); + +If a geometry has more categories of the same layer attached, its +represented as more features (one for each category). + +Both 2D and 3D maps are supported. + +Driver capabilities +------------------- + +.. supports_georeferencing:: + +Datasource name +--------------- + +Datasource name is full path to 'head' file in GRASS vector directory. +Using names of GRASS environment variables it can be expressed: + +:: + + $GISDBASE/$LOCATION_NAME/$MAPSET/vector/mymap/head + +where 'mymap' is name of a vector map. For example: + +:: + + /home/cimrman/grass_data/jizerky/jara/vector/liptakov/head + +Layer names +----------- + +Usually layer numbers are used as layer names. Layer number 0 is used +for all features without any category. It is possible to optionally give +names to GRASS layers linked to database however currently this is not +supported by grass modules. A layer name can be added in 'dbln' vector +file as '/name' after layer number, for example to original record: + +:: + + 1 rivers cat $GISDBASE/$LOCATION_NAME/$MAPSET/dbf/ dbf + +it is possible to assign name 'rivers' + +:: + + 1/rivers rivers cat $GISDBASE/$LOCATION_NAME/$MAPSET/dbf/ dbf + +the layer 1 will be listed is layer 'rivers'. + +Attribute filter +---------------- + +If a layer has attributes stored in a database, the query is passed to +the underlying database driver. That means, that SQL conditions which +can be used depend on the driver and database to which the layer is +linked. For example, DBF driver has currently very limited set of SQL +expressions and PostgreSQL offers very rich set of SQL expressions. + +If a layer has no attributes linked and it has only categories, OGR +internal SQL engine is used to evaluate the expression. Category is an +integer number attached to geometry, it is sort of ID, but it is not FID +as more features in one layer can have the same category. + +Evaluation is done once when the attribute filter is set. + +Spatial filter +-------------- + +Bounding boxes of features stored in topology structure are used to +evaluate if a features matches current spatial filter. + +Evaluation is done once when the spatial filter is set. + +GISBASE +------- + +GISBASE is full path to the directory where GRASS is installed. By +default, GRASS driver is using the path given to gdal configure script. +A different directory can be forced by setting GISBASE environment +variable. GISBASE is used to find GRASS database drivers. + +Missing topology +---------------- + +GRASS driver can read GRASS vector files if topology is available (AKA +level 2). If an error is reported, telling that the topology is not +available, it is necessary to build topology within GRASS using v.build +module. + +Random access +------------- + +If random access (GetFeature instead of GetNextFeature) is used on layer +with attributes, the reading of features can be quite slow. It is +because the driver has to query attributes by category for each feature +(to avoid using a lot of memory) and random access to database is +usually slow. This can be improved on GRASS side optimizing/writing file +based (DBF, SQLite) drivers. + +Known problem +------------- + +Because of bug in GRASS library, it is impossible to start/stop database +drivers in FIFO order and FILO order must be used. The GRASS driver for +OGR is written with this limit in mind and drivers are always closed if +not used and if a driver remains opened kill() is used to terminate it. +It can happen however in rare cases, that the driver will try to stop +database driver which is not the last opened and an application hangs. +This can happen if sequential read (GetNextFeature) of a layer is not +finished (reading is stopped before last available feature is reached), +features from another layer are read and then the reading of the first +layer is finished, because in that case kill() is not used. + +See Also +-------- + +- `GRASS GIS home page `__ + +-------------- + +Development of this driver was financially supported by Faunalia +(`www.faunalia.it `__). diff -Nru libgdal-grass-3.4.3/grass.cpp libgdal-grass-1.0.2/grass.cpp --- libgdal-grass-3.4.3/grass.cpp 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/grass.cpp 2022-11-06 10:42:02.000000000 +0000 @@ -53,11 +53,13 @@ char *GPJ_grass_to_wkt( const struct Key_Value *, const struct Key_Value *, int, int ); + +void GDALRegister_GRASS(); } #define GRASS_MAX_COLORS 100000 // what is the right value -CPL_CVSID("$Id: grass.cpp a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $") +CPL_CVSID("$Id$") /************************************************************************/ /* Grass2CPLErrorHook() */ @@ -93,7 +95,7 @@ struct Cell_head sCellInfo; /* raster region */ - char *pszProjection; + OGRSpatialReference m_oSRS{}; double adfGeoTransform[6]; @@ -101,10 +103,7 @@ GRASSDataset(); ~GRASSDataset() override; - const char *_GetProjectionRef(void) override; - const OGRSpatialReference* GetSpatialRef() const override { - return GetSpatialRefFromOldGetProjectionRef(); - } + const OGRSpatialReference* GetSpatialRef() const override; CPLErr GetGeoTransform( double * ) override; static GDALDataset *Open( GDALOpenInfo * ); @@ -716,7 +715,7 @@ GRASSDataset::GRASSDataset() { - pszProjection = NULL; + m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER); adfGeoTransform[0] = 0.0; adfGeoTransform[1] = 1.0; @@ -744,20 +743,15 @@ if ( pszElement ) G_free ( pszElement ); - - G_free( pszProjection ); } /************************************************************************/ -/* GetProjectionRef() */ +/* GetSpatialRef() */ /************************************************************************/ -const char *GRASSDataset::_GetProjectionRef() +const OGRSpatialReference *GRASSDataset::GetSpatialRef() const { - if( pszProjection == NULL ) - return ""; - else - return pszProjection; + return m_oSRS.IsEmpty() ? nullptr : &m_oSRS; } /************************************************************************/ @@ -972,9 +966,12 @@ projinfo = G_get_projinfo(); projunits = G_get_projunits(); - poDS->pszProjection = GPJ_grass_to_wkt ( projinfo, projunits, 0, 0); + char* pszWKT = GPJ_grass_to_wkt ( projinfo, projunits, 0, 0); if (projinfo) G_free_key_value(projinfo); if (projunits) G_free_key_value(projunits); + if( pszWKT ) + poDS->m_oSRS.importFromWkt(pszWKT); + G_free( pszWKT ); /* -------------------------------------------------------------------- */ /* Create band information objects. */ diff -Nru libgdal-grass-3.4.3/ogrgrass.h libgdal-grass-1.0.2/ogrgrass.h --- libgdal-grass-3.4.3/ogrgrass.h 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/ogrgrass.h 2022-11-06 10:42:02.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: ogrgrass.h a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $ + * $Id$ * * Project: OpenGIS Simple Features Reference Implementation * Purpose: Private definitions for OGR/GRASS driver. diff -Nru libgdal-grass-3.4.3/ogrgrassdatasource.cpp libgdal-grass-1.0.2/ogrgrassdatasource.cpp --- libgdal-grass-3.4.3/ogrgrassdatasource.cpp 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/ogrgrassdatasource.cpp 2022-11-06 10:42:02.000000000 +0000 @@ -31,7 +31,7 @@ #include "cpl_conv.h" #include "cpl_string.h" -CPL_CVSID("$Id: ogrgrassdatasource.cpp a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $") +CPL_CVSID("$Id$") /************************************************************************/ diff -Nru libgdal-grass-3.4.3/ogrgrassdriver.cpp libgdal-grass-1.0.2/ogrgrassdriver.cpp --- libgdal-grass-3.4.3/ogrgrassdriver.cpp 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/ogrgrassdriver.cpp 2022-11-06 10:42:02.000000000 +0000 @@ -30,7 +30,11 @@ #include "cpl_conv.h" #include "cpl_string.h" -CPL_CVSID("$Id: ogrgrassdriver.cpp 1761acd90777d5bcc49eddbc13c193098f0ed40b 2020-10-01 12:12:00 +0200 Even Rouault $") +extern "C" { + void RegisterOGRGRASS(); +} + +CPL_CVSID("$Id$") /************************************************************************/ /* ~OGRGRASSDriver() */ diff -Nru libgdal-grass-3.4.3/ogrgrasslayer.cpp libgdal-grass-1.0.2/ogrgrasslayer.cpp --- libgdal-grass-3.4.3/ogrgrasslayer.cpp 2022-04-22 11:30:01.000000000 +0000 +++ libgdal-grass-1.0.2/ogrgrasslayer.cpp 2022-11-06 10:42:02.000000000 +0000 @@ -31,7 +31,7 @@ #include "ogrgrass.h" #include "cpl_conv.h" -CPL_CVSID("$Id: ogrgrasslayer.cpp 5163a8056bee931f5bc8e72676d90092cdd1d760 2021-08-12 22:25:24 +0200 Even Rouault $") +CPL_CVSID("$Id$") /************************************************************************/ /* OGRGRASSLayer() */