[zoo-project] 01/02: Add upstream patch to fix build with OTB 5.8.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository zoo-project.

commit 566e2ca59886b92871b4cb9201cd8fe78ddb9139
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 19 20:48:43 2017 +0100

    Add upstream patch to fix build with OTB 5.8.
---
 ...hen-building-with-OTB-version-upper-or-eq.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch b/debian/patches/0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch
new file mode 100644
index 0000000..fd938ee
--- /dev/null
+++ b/debian/patches/0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch
@@ -0,0 +1,35 @@
+Description: Fix issue when building with OTB version upper or equal to 5.8.0.
+ git-svn-id: http://svn.zoo-project.org/svn/trunk@803 4b6b6ad6-68b3-4dcc-9231-bd9b83bc5dc3
+Author: djay <djay at 4b6b6ad6-68b3-4dcc-9231-bd9b83bc5dc3>
+Origin: https://github.com/OSGeo/zoo-project/commit/2dc016ec347eb5fc86510ab06e37190acbe69ff3
+
+--- a/zoo-project/zoo-kernel/configure.ac
++++ b/zoo-project/zoo-kernel/configure.ac
+@@ -830,14 +830,21 @@ else
+ 	CPPFLAGS="$OTB_CPPFLAGS"
+ 	LDFLAGS_SAVE="$LDFLAGS"
+ 	LIBS="$LIBS_SAVE $OTB_LDFLAGS"
+-	echo $OTB_CPPFLAGS
+-	#AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
+-	#		[], [AC_MSG_ERROR([could not find header file $i related to OTB])])
++	#echo $OTB_CPPFLAGS
++	AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
++			[], [AC_MSG_ERROR([could not find header file $i related to OTB])])
+ 	LDFLAGS_SAVE="$LDFLAGS"
+ 	LDFLAGS="$OTB_LDFLAGS"
+-	echo $OTB_LDFLAGS
+-	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"],[std::vector<std::string> list = otb::Wrapwper::ApplicationRegistry::GetAvailableApplication();]])],
+-		[AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
++	#echo $OTB_LDFLAGS
++	UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
++	if test "$OTBVERS" ==  "$UVERS" ; then 
++		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
++							   [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
++	else
++		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
++							   [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
++	fi
++							   			
+ 	LDFLAGS="$LDFLAGS_SAVE"
+ 	AC_LANG_POP([C++])
+ 	AC_LANG(C++)
diff --git a/debian/patches/series b/debian/patches/series
index 4e23241..b6b7131 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardening-buildflags.patch
 zoo-version.patch
+0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch

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