[gdal-grass] 01/02: Add patch to support GRASS 7.0.0RC2.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository gdal-grass.

commit afba813284409e350d9551fdb9f66805c00e018e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 19 23:46:15 2015 +0100

    Add patch to support GRASS 7.0.0RC2.
---
 debian/changelog      |  1 +
 debian/patches/grass7 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 238aff2..4bc3806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libgdal-grass (1.11.2-1) UNRELEASED; urgency=medium
   * Refresh patches.
   * Update Vcs-Browser URL to use cgit instead of gitweb.
   * Update copyright file, group files & copyright by license.
+  * Add patch to support GRASS 7.0.0RC2.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Feb 2015 00:02:26 +0100
 
diff --git a/debian/patches/grass7 b/debian/patches/grass7
new file mode 100644
index 0000000..9bbee5b
--- /dev/null
+++ b/debian/patches/grass7
@@ -0,0 +1,56 @@
+Description: Update GRASS support for 7.0.0RC2.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+
+--- a/configure.in
++++ b/configure.in
+@@ -131,14 +131,22 @@ if test "$with_grass" != "yes" ; then
+     GRASS_GISBASE="$with_grass"
+   else
+ 
+-    # Check for GRASS >= 7.0
++    # Check for GRASS >= 7.0 (SVN)
+     AC_CHECK_LIB(grass_gis.7.0.svn,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn)
+     if test "$GRASS_SETTING" = "grass7+" ; then
+         LIBS="-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn $LIBS"
+         GRASS_INCLUDE="-I$with_grass/include"
+         GRASS_GISBASE="$with_grass"
+     else
+-        AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found!  Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
++        # Check for GRASS 7.0.0RC2
++        AC_CHECK_LIB(grass_gis.7.0.0RC2,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.0RC2 -lgrass_gmath.7.0.0RC2 -lgrass_gis.7.0.0RC2 -lgrass_datetime.7.0.0RC2 -lgrass_gproj.7.0.0RC2 -lgrass_vector.7.0.0RC2 -lgrass_dbmibase.7.0.0RC2 -lgrass_dbmiclient.7.0.0RC2 -lgrass_dgl.7.0.0RC2 -lgrass_dig2.7.0.0RC2 -lgrass_rtree.7.0.0RC2 -lgrass_linkm.7.0.0RC2 -lgrass_btree2.7.0.0RC2 -lgrass_ccmath.7.0.0RC2)
++        if test "$GRASS_SETTING" = "grass7+" ; then
++            LIBS="-L$with_grass/lib -lgrass_raster.7.0.0RC2 -lgrass_gmath.7.0.0RC2 -lgrass_gis.7.0.0RC2 -lgrass_datetime.7.0.0RC2 -lgrass_gproj.7.0.0RC2 -lgrass_vector.7.0.0RC2 -lgrass_dbmibase.7.0.0RC2 -lgrass_dbmiclient.7.0.0RC2 -lgrass_dgl.7.0.0RC2 -lgrass_dig2.7.0.0RC2 -lgrass_rtree.7.0.0RC2 -lgrass_linkm.7.0.0RC2 -lgrass_btree2.7.0.0RC2 -lgrass_ccmath.7.0.0RC2 $LIBS"
++            GRASS_INCLUDE="-I$with_grass/include"
++            GRASS_GISBASE="$with_grass"
++        else
++            AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found!  Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
++        fi
+     fi
+   fi
+ fi
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -30,8 +30,8 @@ install:	default
+ 	cp $(OLIBNAME) $(AUTOLOAD_DIR)
+ 	test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR}
+ 	test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc
+-	cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
+-	cp @GRASS_GISBASE@/etc/datum.table @GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc
++	cp @GRASS_GISBASE@/etc/proj/ellipse.table ${GRASSTABLES_DIR}/etc
++	cp @GRASS_GISBASE@/etc/proj/datum.table @GRASS_GISBASE@/etc/proj/datumtransform.table ${GRASSTABLES_DIR}/etc
+ 	test -d ${GRASSTABLES_DIR}/driver || mkdir ${GRASSTABLES_DIR}/driver
+ 	test -d ${GRASSTABLES_DIR}/driver/db || mkdir ${GRASSTABLES_DIR}/driver/db
+ 	cp -r @GRASS_GISBASE@/driver/db/* ${GRASSTABLES_DIR}/driver/db/
+@@ -44,10 +44,10 @@ distclean: clean
+ 
+ 
+ $(GLIBNAME):	grass57dataset.o
+-	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
++	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
+ 
+ $(OLIBNAME):	ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
+-	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
++	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
+ 
+ %.o:	%.cpp
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
diff --git a/debian/patches/series b/debian/patches/series
index b4c4abd..baf66a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 rpath
 hardening
 environment-typo
+grass7

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git