[saga] 11/11: Use debian version of libsvm

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch experimental
in repository saga.

commit 44a1b669d5caf755f12deba3bd4dc7292ca8d2e7
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Mon Nov 3 20:38:38 2014 +0100

    Use debian version of libsvm
---
 ...tch => 0001-Remove-references-to-libfire.patch} |  6 ++---
 ...atch => 0002-Use-debian-version-of-grib2.patch} |  0
 ...ch => 0003-Use-qhull-instead-of-triangle.patch} |  0
 .../0004-Use-debian-version-of-libsvm.patch        | 31 ++++++++++++++++++++++
 debian/patches/series                              |  7 ++---
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0002-Remove-references-to-libfire.patch b/debian/patches/0001-Remove-references-to-libfire.patch
similarity index 93%
rename from debian/patches/0002-Remove-references-to-libfire.patch
rename to debian/patches/0001-Remove-references-to-libfire.patch
index 356ed43..bce6076 100644
--- a/debian/patches/0002-Remove-references-to-libfire.patch
+++ b/debian/patches/0001-Remove-references-to-libfire.patch
@@ -9,7 +9,7 @@ Subject: Remove references to libfire
  3 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index afa2cc7..82dab2a 100755
+index d419561..dff2da2 100755
 --- a/configure.ac
 +++ b/configure.ac
 @@ -276,7 +276,6 @@ AC_OUTPUT(Makefile \
@@ -28,10 +28,10 @@ index 7ec461d..2f378e2 100644
 -SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres
 +SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres
 diff --git a/src/modules/simulation/Makefile.in b/src/modules/simulation/Makefile.in
-index 2f58074..7be1b6a 100644
+index c4823da..2f9e27c 100644
 --- a/src/modules/simulation/Makefile.in
 +++ b/src/modules/simulation/Makefile.in
-@@ -260,7 +260,7 @@ target_alias = @target_alias@
+@@ -236,7 +236,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/debian/patches/0003-Use-debian-version-of-grib2.patch b/debian/patches/0002-Use-debian-version-of-grib2.patch
similarity index 100%
rename from debian/patches/0003-Use-debian-version-of-grib2.patch
rename to debian/patches/0002-Use-debian-version-of-grib2.patch
diff --git a/debian/patches/0004-Use-qhull-instead-of-triangle.patch b/debian/patches/0003-Use-qhull-instead-of-triangle.patch
similarity index 100%
rename from debian/patches/0004-Use-qhull-instead-of-triangle.patch
rename to debian/patches/0003-Use-qhull-instead-of-triangle.patch
diff --git a/debian/patches/0004-Use-debian-version-of-libsvm.patch b/debian/patches/0004-Use-debian-version-of-libsvm.patch
new file mode 100644
index 0000000..4501f7c
--- /dev/null
+++ b/debian/patches/0004-Use-debian-version-of-libsvm.patch
@@ -0,0 +1,31 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Mon, 3 Nov 2014 20:38:24 +0100
+Subject: Use debian version of libsvm
+
+---
+ src/modules/imagery/imagery_svm/Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/imagery/imagery_svm/Makefile.am b/src/modules/imagery/imagery_svm/Makefile.am
+index a92c3bd..8a87973 100644
+--- a/src/modules/imagery/imagery_svm/Makefile.am
++++ b/src/modules/imagery/imagery_svm/Makefile.am
+@@ -5,16 +5,14 @@ if SAGA_UNICODE
+ UC_DEFS = -D_SAGA_UNICODE
+ endif
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+-CXX_INCS           = -I$(top_srcdir)/src/saga_core
++CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/libsvm
+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS         = -fPIC -shared -avoid-version
++AM_LDFLAGS         = -fPIC -shared -avoid-version -lsvm
+ pkglib_LTLIBRARIES = libimagery_svm.la
+ libimagery_svm_la_SOURCES =\
+ MLB_Interface.cpp\
+-svm.cpp\
+ svm_grids.cpp\
+ MLB_Interface.h\
+-svm.h\
+ svm_grids.h
+ 
+ libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
diff --git a/debian/patches/series b/debian/patches/series
index b2e5377..a6abd65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-0002-Remove-references-to-libfire.patch
-0003-Use-debian-version-of-grib2.patch
-0004-Use-qhull-instead-of-triangle.patch
+0001-Remove-references-to-libfire.patch
+0002-Use-debian-version-of-grib2.patch
+0003-Use-qhull-instead-of-triangle.patch
+0004-Use-debian-version-of-libsvm.patch

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