Commit 4bea0c9b authored by Ole Streicher's avatar Ole Streicher

Rediff patches

Added Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch: <REASON>
Added Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch: <REASON>
Added Use-system-provided-swarp-instead-of-convenience-copy.patch: <REASON>
Added Force-serial-tests-to-get-better-verbose-output.patch: <REASON>
Added Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch: <REASON>
Dropped libadd_cpl.patch: <REASON>
Dropped set_plugindir.patch: <REASON>
Dropped force-serial-tests.patch: <REASON>
Dropped fix_test_fail.patch: <REASON>
Dropped system-swarp.patch: <REASON>
parent 1f167120
Author: Ole Streicher <olebole@debian.org>
Description: Add the cpl libraries to the recips.so and the test program
--- a/visir/tests/Makefile.am
+++ b/visir/tests/Makefile.am
@@ -34,7 +34,7 @@
OBJDIR = $(top_builddir)/recipes/.libs
AM_CPPFLAGS = $(all_includes)
-LDADD = $(LIBVISIR) $(LIBCEXT)
+LDADD = $(LIBVISIR) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLUI)
pkginclude_HEADERS =
From: Ole Streicher <olebole@debian.org>
Date: Mon, 18 Jul 2016 21:17:04 +0200
Subject: Add the cpl libraries to the recips.so and the test program
---
recipes/Makefile.am | 52 ++++++++++++++++++++++++-------------------------
visir/tests/Makefile.am | 2 +-
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/recipes/Makefile.am b/recipes/Makefile.am
index 6d8228b..5cc00ac 100644
--- a/recipes/Makefile.am
+++ b/recipes/Makefile.am
@@ -64,122 +64,122 @@
@@ -64,122 +64,122 @@ plugin_LTLIBRARIES = visir_old_img_combine.la \
visir_spc_reduce.la
visir_old_img_combine_la_SOURCES = visir_recipe.h visir_img_combine.c
......@@ -160,7 +158,7 @@ Description: Add the cpl libraries to the recips.so and the test program
visir_util_run_swarp_la_LDFLAGS = -module -avoid-version
visir_util_run_swarp_la_DEPENDENCIES = $(LIBVISIR)
@@ -192,7 +192,7 @@
@@ -192,7 +192,7 @@ visir_img_reduce_la_SOURCES = visir_recipe.h visir_img_chain.c \
visir_util_join.c \
visir_img_phot.c
visir_img_reduce_la_CPPFLAGS = -DVISIR_CHAIN $(AM_CPPFLAGS)
......@@ -169,7 +167,7 @@ Description: Add the cpl libraries to the recips.so and the test program
visir_img_reduce_la_LDFLAGS = -module -avoid-version
visir_img_reduce_la_DEPENDENCIES = $(LIBVISIR)
@@ -202,6 +202,6 @@
@@ -202,6 +202,6 @@ visir_spc_reduce_la_SOURCES = visir_recipe.h visir_spc_chain.c \
visir_util_destripe.c \
visir_spc_obs.c
visir_spc_reduce_la_CPPFLAGS = -DVISIR_CHAIN $(AM_CPPFLAGS)
......@@ -177,3 +175,16 @@ Description: Add the cpl libraries to the recips.so and the test program
+visir_spc_reduce_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_spc_reduce_la_LDFLAGS = -module -avoid-version
visir_spc_reduce_la_DEPENDENCIES = $(LIBVISIR)
diff --git a/visir/tests/Makefile.am b/visir/tests/Makefile.am
index 840ede8..5fba830 100644
--- a/visir/tests/Makefile.am
+++ b/visir/tests/Makefile.am
@@ -34,7 +34,7 @@ LIBVISIR = $(top_builddir)/visir/libvisir.la \
OBJDIR = $(top_builddir)/recipes/.libs
AM_CPPFLAGS = $(all_includes)
-LDADD = $(LIBVISIR) $(LIBCEXT)
+LDADD = $(LIBVISIR) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLUI)
pkginclude_HEADERS =
Author: Ole Streicher <olebole@debian.org>
Description: Force serial-tests to get better verbose output
Bug: http://bugs.debian.org/715204
--- a/recipes/tests/Makefile.am
+++ b/recipes/tests/Makefile.am
From: Ole Streicher <olebole@debian.org>
Date: Mon, 18 Jul 2016 21:17:04 +0200
Subject: Force serial-tests to get better verbose output
---
irplib/tests/Makefile.am | 2 +-
recipes/tests/Makefile.am | 2 +-
visir/tests/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/irplib/tests/Makefile.am b/irplib/tests/Makefile.am
index e0f4f0c..b876b1b 100644
--- a/irplib/tests/Makefile.am
+++ b/irplib/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
......@@ -12,8 +21,10 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
--- a/visir/tests/Makefile.am
+++ b/visir/tests/Makefile.am
diff --git a/recipes/tests/Makefile.am b/recipes/tests/Makefile.am
index 928cb5c..fafacc0 100644
--- a/recipes/tests/Makefile.am
+++ b/recipes/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
......@@ -23,8 +34,10 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
--- a/irplib/tests/Makefile.am
+++ b/irplib/tests/Makefile.am
diff --git a/visir/tests/Makefile.am b/visir/tests/Makefile.am
index 5fba830..da6bcb3 100644
--- a/visir/tests/Makefile.am
+++ b/visir/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
......
Author: Ole Streicher <olebole@debian.org>
Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
From: Ole Streicher <olebole@debian.org>
Date: Mon, 18 Jul 2016 21:17:04 +0200
Subject: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
---
irplib/tests/irplib_polynomial-test.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/irplib/tests/irplib_polynomial-test.c b/irplib/tests/irplib_polynomial-test.c
index 5bbd3ff..a67028d 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
@@ -567,16 +567,16 @@
@@ -567,16 +567,16 @@ irplib_polynomial_test_root_all_macro(const cpl_vector * self, cpl_size nreal,
const double root = cpl_vector_get(roots, i);
const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
......
Author: Ole Streicher <olebole@debian.org>
Description: Set the plugin directory so that esorex and python-cpl can find it.
From: Ole Streicher <olebole@debian.org>
Date: Mon, 18 Jul 2016 21:17:04 +0200
Subject: Set the plugin directory so that esorex and python-cpl can find it.
---
acinclude.m4 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 1a92402..96bc161 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -219,15 +219,15 @@
@@ -219,15 +219,15 @@ AC_DEFUN([VISIR_SET_PATHS],
[
if test -z "$plugindir"; then
......@@ -21,7 +29,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
if test -z "$privatelibdir"; then
@@ -235,7 +235,7 @@
@@ -235,7 +235,7 @@ AC_DEFUN([VISIR_SET_PATHS],
fi
if test -z "$wkfextradir"; then
......@@ -30,7 +38,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
if test -z "$wkfcopydir"; then
@@ -256,7 +256,7 @@
@@ -256,7 +256,7 @@ AC_DEFUN([VISIR_SET_PATHS],
# Define a preprocesor symbol for the plugin search paths
......
Author: Ole Streicher <olebole@debian.org>
Description: Use system provided swarp instead of convenience copy
From: Ole Streicher <olebole@debian.org>
Date: Mon, 18 Jul 2016 21:17:04 +0200
Subject: Use system provided swarp instead of convenience copy
---
Makefile.am | 2 +-
acinclude.m4 | 4 ++--
configure.ac | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 111a775..4de4d69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@
@@ -26,7 +26,7 @@ DISTCLEANFILES = *~
COMPILE_FIRST =
......@@ -11,9 +21,11 @@ Description: Use system provided swarp instead of convenience copy
COMPILE_LAST =
diff --git a/acinclude.m4 b/acinclude.m4
index 96bc161..357635b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -273,9 +273,9 @@
@@ -273,9 +273,9 @@ AC_DEFUN([VISIR_SET_PATHS],
AC_DEFINE_UNQUOTED(VISIR_CONFIG_PATH, "$config_dir",
[Absolute path to the config data directory])
......@@ -25,9 +37,11 @@ Description: Use system provided swarp instead of convenience copy
])
diff --git a/configure.ac b/configure.ac
index c61076a..7403687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,6 @@
@@ -14,8 +14,6 @@ AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE([enable])
......
libadd_cpl.patch
set_plugindir.patch
fix_test_fail.patch
force-serial-tests.patch
system-swarp.patch
Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
Force-serial-tests-to-get-better-verbose-output.patch
Use-system-provided-swarp-instead-of-convenience-copy.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment