This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository zoo-project.
commit 9f391d17a00a4567a687ecf81eb3b66e27f1ecab Author: Bas Couwenberg <[email protected]> Date: Sat Jan 21 13:19:58 2017 +0100 Add upstream patch: Temporary fix for ITK 4.10 and OTB >=5.4. --- debian/patches/series | 3 +- ...temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch | 58 ++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index f2c2036..2cf840d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ hardening-buildflags.patch zoo-version.patch 0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch -insighttoolkit-4.10.patch +#insighttoolkit-4.10.patch +temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch diff --git a/debian/patches/temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch b/debian/patches/temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch new file mode 100644 index 0000000..1b9dbcf --- /dev/null +++ b/debian/patches/temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch @@ -0,0 +1,58 @@ +Description: Temporary fix for ITK 4.10 and OTB >=5.4. +Author: djay +Origin: http://zoo-project.org/trac/changeset/804/ + +--- a/zoo-project/zoo-kernel/configure.ac ++++ b/zoo-project/zoo-kernel/configure.ac +@@ -813,6 +813,13 @@ else + ITKVERS="4.5" + fi + OTB_ENABLED="-DUSE_OTB" ++ IVERS="$(echo -e '4.10\n$ITKVERS' | sort -r | head -n1)" ++ if test "$IVERS" == "$ITKVERS"; then ++ ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl- [...] ++ else ++ ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkv [...] ++ fi ++ + if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then + OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/" + OTB_CPPFLAGS="-I${OTB_RPATH}ApplicationEngine -I$OTB_RPATH/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTB_RPATH/Utilities/ITK -I$OTB_RPATH/ -I$OTB_RPATH/IO -I$OTB_RPATH/UtilitiesAdapters/OssimAdapters -I$OTB_RPATH/UtilitiesAdapters/CurlAdapters -I$OTB_RPATH/Utilities/BGL -I$OTB_RPATH/UtilitiesAdapters/ITKPendingPatches -I$OTB_RPATH/Utilities/otbconfigfile $GDAL_CFLAGS" +@@ -836,14 +843,14 @@ else + LDFLAGS_SAVE="$LDFLAGS" + LDFLAGS="$OTB_LDFLAGS" + #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 ++ #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++]) +@@ -905,14 +912,6 @@ AC_SUBST([SAGA_LDFLAGS]) + AC_SUBST([SAGA_FILE]) + AC_SUBST([SAGA_ENABLED]) + +-HARDENING_CFLAGS=`dpkg-buildflags --get CFLAGS` +-HARDENING_CPPFLAGS=`dpkg-buildflags --get CPPFLAGS` +-HARDENING_LDFLAGS=`dpkg-buildflags --get LDFLAGS` +- +-AC_SUBST([HARDENING_CFLAGS]) +-AC_SUBST([HARDENING_CPPFLAGS]) +-AC_SUBST([HARDENING_LDFLAGS]) +- + AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([ZOOMakefile.opts]) + AC_OUTPUT -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
