[ossim-plugins] 01/01: Enable GDAL plugin with upstream patch for GDAL 2.x.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository ossim-plugins.

commit 90d5babf40acd22e5e530f581a42fd84e803b949
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 28 13:31:02 2016 +0200

    Enable GDAL plugin with upstream patch for GDAL 2.x.
---
 debian/control                   | 32 ++++++++++++++++++++++++-
 debian/ossim-plugin-gdal.install |  1 +
 debian/patches/gdal.patch        | 52 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  1 +
 5 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 14430b5..6196441 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,9 @@ Priority: extra
 Build-Depends: cmake (>= 2.8),
                debhelper (>= 9),
                libcurl4-gnutls-dev | libcurl-ssl-dev,
+               libexpat1-dev,
                libfftw3-dev,
+               libgdal-dev,
                libgeotiff-dev,
                libhdf5-dev,
                libjpeg-dev,
@@ -16,6 +18,7 @@ Build-Depends: cmake (>= 2.8),
                libossim-dev (>= 1.8.20.3),
                libpng-dev,
                libpodofo-dev,
+               libproj-dev,
                libraw-dev,
                libsqlite3-dev,
                libtiff-dev,
@@ -30,7 +33,8 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: ossim-plugin-geopdf (= ${binary:Version}),
+Recommends: ossim-plugin-gdal (= ${binary:Version}),
+            ossim-plugin-geopdf (= ${binary:Version}),
             ossim-plugin-hdf5 (= ${binary:Version}),
             ossim-plugin-kmlsuperoverlay (= ${binary:Version}),
             ossim-plugin-las (= ${binary:Version}),
@@ -62,6 +66,32 @@ Description: OSSIM core plugins
  .
  This package contains the OSSIM core plugins.
 
+Package: ossim-plugin-gdal
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: OSSIM GDAL plugin
+ Open Source Software Image Map (OSSIM) is a high performance engine for
+ remote sensing, image processing, geographical information systems and
+ photogrammetry. It has been actively developed since 1996.
+ .
+ Designed as a series of high performance software libraries, it is
+ written in C++ employing the latest techniques in object-oriented
+ software design.
+ .
+ The library provides advanced remote sensing, image processing, and
+ geo-spatial functionality. A quick summary of OSSIM functionality
+ includes ortho-rectification, precision terrain correction, rigorous
+ sensor models, very large mosaics, and cross sensor fusions, a wide
+ range of map projections and datums, and a large range of commercial
+ and government data formats. The architecture of the library supports
+ parallel processing with mpi (not enabled), a dynamic plugin architecture,
+ and dynamically connectable objects allowing rapid prototyping of custom
+ image processing chains.
+ .
+ This package contains the OSSIM GDAL plugin.
+
 Package: ossim-plugin-geopdf
 Architecture: any
 Section: libs
diff --git a/debian/ossim-plugin-gdal.install b/debian/ossim-plugin-gdal.install
new file mode 100644
index 0000000..23b632e
--- /dev/null
+++ b/debian/ossim-plugin-gdal.install
@@ -0,0 +1 @@
+usr/lib/ossim/plugins/libossimgdal_plugin.so
diff --git a/debian/patches/gdal.patch b/debian/patches/gdal.patch
new file mode 100644
index 0000000..4e71a79
--- /dev/null
+++ b/debian/patches/gdal.patch
@@ -0,0 +1,52 @@
+Origin: https://github.com/ossimlabs/ossim-plugins/commit/6eca9642408a82f4d7c2829e43c646af0a638295
+From 6eca9642408a82f4d7c2829e43c646af0a638295 Mon Sep 17 00:00:00 2001
+From: David Burken <dburken at comcast.net>
+Date: Sun, 29 May 2016 08:44:11 -0400
+Subject: Fixed gdal build errors against gdal 2.x.
+
+--- a/ossim_plugins/gdal/ossimGdalDataset.cpp
++++ b/ossim_plugins/gdal/ossimGdalDataset.cpp
+@@ -7,10 +7,7 @@
+ // Description: A gdal data set from an ossim image handler.
+ //
+ //----------------------------------------------------------------------------
+-// $Id: ossimGdalDataset.cpp 23003 2014-11-24 17:13:40Z dburken $
+-
+-
+-#include <fstream>
++// $Id$
+ 
+ #include <ossimGdalDataset.h>
+ #include <ossimGdalType.h>
+@@ -19,6 +16,7 @@
+ #include <ossim/base/ossimTrace.h>
+ #include <ossim/imaging/ossimImageHandler.h>
+ #include <ossim/imaging/ossimImageHandlerRegistry.h>
++#include <fstream>
+ 
+ static GDALDriver *poOssimGdalDriver = 0;
+ 
+@@ -226,12 +224,6 @@ ossimGdalDatasetRasterBand::ossimGdalDat
+    if (nRasterXSize % nBlockXSize) ++nBlocksPerRow;
+    if (nRasterYSize % nBlockYSize) ++nBlocksPerColumn;
+ 
+-   nSubBlocksPerRow = 0;
+-   nSubBlocksPerColumn = 0;
+-
+-   bSubBlockingActive = FALSE;
+-   papoBlocks = 0;
+-
+    nBlockReads = 0;
+    bForceCachedIO = false;
+ }
+--- a/ossim_plugins/png/ossimPngWriter.h
++++ b/ossim_plugins/png/ossimPngWriter.h
+@@ -36,7 +36,7 @@ public:
+    /** @return "ossim png writer" */
+    virtual ossimString getLongName()  const;
+ 
+-   /** @return "ossimPngReader" */
++   /** @return "ossimPngWriter" */
+    virtual ossimString getClassName()    const;
+ 
+    /**
diff --git a/debian/patches/series b/debian/patches/series
index 72e857c..d486aa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ sqlite.patch
 libraw.patch
 fftw3.patch
 opencv.patch
+gdal.patch
diff --git a/debian/rules b/debian/rules
index 05dfb12..78fd292 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ CMAKE_OPTS = \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX=/usr \
        -DCMAKE_MODULE_PATH=$(CURDIR)/ossim_plugins/CMakeModules \
+       -DBUILD_OSSIMGDAL_PLUGIN=ON \
        -DBUILD_OSSIMGEOPDF_PLUGIN=ON \
        -DBUILD_OSSIMHDF5_PLUGIN=ON \
        -DBUILD_OSSIMKMLSUPEROVERLAY_PLUGIN=ON \

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