[liblas] 01/03: Add patch to fix FTBFS with libgeotiff 1.4.2.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository liblas.

commit c02a5a7a3d5dd1a42e17df8bf9c7c34acba637ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 11 21:24:18 2016 +0200

    Add patch to fix FTBFS with libgeotiff 1.4.2.
---
 debian/changelog                      |  6 ++++++
 debian/patches/libgeotiff-1.4.2.patch | 39 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 40fe95a..bf5bde6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+liblas (1.8.0-12) UNRELEASED; urgency=medium
+
+  * Add patch to fix FTBFS with libgeotiff 1.4.2.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 11 Aug 2016 20:52:28 +0200
+
 liblas (1.8.0-11) unstable; urgency=medium
 
   * Require at least libgdal-dev 2.1.1 for GDAL transition.
diff --git a/debian/patches/libgeotiff-1.4.2.patch b/debian/patches/libgeotiff-1.4.2.patch
new file mode 100644
index 0000000..122bb26
--- /dev/null
+++ b/debian/patches/libgeotiff-1.4.2.patch
@@ -0,0 +1,39 @@
+Description: Add support for libgeotiff 1.4.2.
+ libgeotiff 1.4.2 renamed __geotiff_h_ to LIBGEOTIFF_GEOTIFF_H_,
+ and __geo_simpletags_h_ to LIBGEOTIFF_GEO_SIMPLETAGS_H_.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/libLAS/libLAS/pull/92
+
+--- a/include/liblas/spatialreference.hpp
++++ b/include/liblas/spatialreference.hpp
+@@ -56,10 +56,10 @@
+ #include <string>
+ 
+ // Fake out the compiler if we don't have libgeotiff includes already
+-#if !defined(__geotiff_h_)
++#if !defined(__geotiff_h_) && !defined(LIBGEOTIFF_GEOTIFF_H_)
+ typedef struct GTIFS *GTIF;
+ #endif
+-#if !defined(__geo_simpletags_h_)
++#if !defined(__geo_simpletags_h_) && !defined(LIBGEOTIFF_GEO_SIMPLETAGS_H_)
+ typedef struct ST_TIFFS *ST_TIFF;
+ #endif
+ 
+@@ -199,7 +199,7 @@ private:
+ LAS_DLL std::ostream& operator<<(std::ostream& ostr, const liblas::SpatialReference& srs);
+ 
+ LAS_C_START
+-#if defined(__geotiff_h_)
++#if defined(__geotiff_h_) || defined(LIBGEOTIFF_GEOTIFF_H_)
+ #if defined(GEO_NORMALIZE_H_INCLUDED)
+ char LAS_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*);
+ #endif
+@@ -210,7 +210,7 @@ void SetLinearUnitCitation(GTIF* psGTIF,
+ #if defined(_OGR_SRS_API_H_INCLUDED)
+ void SetGeogCSCitation(GTIF* psGTIF, OGRSpatialReference* poSRS, char* angUnitName, int nDatum, short nSpheroid);
+ #endif // defined _OGR_SRS_API_H_INCLUDED
+-#endif // defined __geotiff_h_
++#endif // defined __geotiff_h_ || defined LIBGEOTIFF_GEOTIFF_H_
+ 
+ LAS_C_END
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ada6e59..ddb75a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ accommodate-typo
 #disable-bigfile_boost_iostreams_test.patch
 parameters-typo
 specified-typo
+libgeotiff-1.4.2.patch

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