[saga] 01/01: Disable JasPer support.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository saga.

commit bd2d49784846733b1c5e05c9667ecc504daa00f0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 16 21:47:49 2016 +0100

    Disable JasPer support.
---
 debian/changelog                    |  1 +
 debian/patches/disable-jasper.patch | 51 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  1 +
 4 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2335c7a..d4c5cd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ saga (2.2.5+dfsg-1) UNRELEASED; urgency=medium
   * Remove executable bit from saga_gui resource files.
   * Move architecture independent files to saga-common package.
   * Explicitly remove files not to be installed.
+  * Disable JasPer support. (closes: #818218)
 
  -- Johan Van de Wauw <johan at vandewauw.be>  Fri, 04 Mar 2016 17:34:50 +0100
 
diff --git a/debian/patches/disable-jasper.patch b/debian/patches/disable-jasper.patch
new file mode 100644
index 0000000..5d55eeb
--- /dev/null
+++ b/debian/patches/disable-jasper.patch
@@ -0,0 +1,51 @@
+Description: Add --disable-jasper option to configure.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/818218
+Forwarded: https://sourceforge.net/p/saga-gis/bugs/224/
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,6 @@ AC_PROG_LIBTOOL
+ AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
+ AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
+ AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
+-AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
+ AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
+ AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
+ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found])
+@@ -192,6 +191,19 @@ if test "x$use_libfire" != xyes; then
+     AC_MSG_RESULT([        Libfire disabled])
+ fi
+ 
++AC_ARG_ENABLE(jasper,
++        AS_HELP_STRING([--disable-jasper],[ Compile without jasper ]),
++	,
++	[use_jasper=yes])
++
++AM_CONDITIONAL(JASPER, [test x$use_jasper = xyes])
++
++if test "x$use_jasper" != xyes; then
++    AC_MSG_RESULT([        Jasper disabled])
++else
++    AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
++fi
++
+ #AM_CONDITIONAL(X86_64, test "`uname -m`" = "x86_64")
+     AM_CONDITIONAL(HAVE_CV, test -n "$CVFOUND")
+     AM_CONDITIONAL(HAVE_LLAS, test -n "$LASFOUND")
+--- a/src/modules/io/io_grid_grib2/Makefile.am
++++ b/src/modules/io/io_grid_grib2/Makefile.am
+@@ -10,8 +10,11 @@ endif
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG
+ CXX_INCS           = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+-#AM_LDFLAGS         = -fPIC -shared -avoid-version -lpq -ljasper
+-AM_LDFLAGS         = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
++#AM_LDFLAGS         = -fPIC -shared -avoid-version -lpq
++AM_LDFLAGS         = -fPIC -shared -avoid-version $(LOCAL_LIBS)
++if JASPER
++AM_LDFLAGS        +=-ljasper
++endif
+ pkglib_LTLIBRARIES = libio_grid_grib2.la
+ libio_grid_grib2_la_SOURCES =\
+ grib2_import.cpp\
diff --git a/debian/patches/series b/debian/patches/series
index c72bd00..ba954fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ disable-grid-gridding.patch
 desktop-keywords.patch
 spelling-errors.patch
 install-icons.patch
+disable-jasper.patch
diff --git a/debian/rules b/debian/rules
index d54ad3f..a515be1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_configure:
 	done
 	dh_auto_configure -- \
 		--prefix=/usr \
+		--disable-jasper \
 		--disable-libfire \
 		--disable-triangle \
 		--enable-openmp \

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