[Debian-astro-commits] [cpl] 02/03: Switch to gbp patch workflow
Ole Streicher
olebole at moszumanska.debian.org
Fri Sep 8 15:30:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository cpl.
commit 465d6baa5bbf4d1ed627f367ce39a9cf7bae7c19
Author: Ole Streicher <olebole at debian.org>
Date: Fri Sep 8 17:23:44 2017 +0200
Switch to gbp patch workflow
---
...p-which-may-cause-unaligned-access-SIGBUS.patch | 23 +++++
...ure.patch => Fix-angle-tolerance-in-i386.patch} | 14 ++-
...erial-tests-to-get-better-verbose-output.patch} | 25 ++++-
debian/patches/Loose-cpl_fit_test.patch | 26 +++++
...er-the-required-versions-for-WCS-and-FFTW.patch | 25 +++++
.../patches/Remove-CPU-check-at-compile-time.patch | 25 +++++
...sioninfo.patch => Remove-WCS-versioninfo.patch} | 22 ++--
...ck.patch => Remove-cfitsio-version-check.patch} | 24 +++--
...ibrary-libltdl-and-use-the-installed-one.patch} | 19 +++-
...macros-from-source-for-repoducible-build.patch} | 16 ++-
...atch => Use-standard-paths-for-libraries.patch} | 114 ++++++++++++---------
...around-MIPS-compiler-optimization-problem.patch | 25 +++++
...cpl_mask_count_window_no_unaligned_access_armhf | 15 ---
debian/patches/fix_required_versions.patch | 17 ---
debian/patches/loose_cplfit_test.patch | 16 ---
debian/patches/no_compiletime_cpucheck.patch | 16 ---
debian/patches/series | 24 ++---
debian/patches/workaround_mips_ftbfs.patch | 17 ---
18 files changed, 292 insertions(+), 171 deletions(-)
diff --git a/debian/patches/Don-t-run-a-loop-which-may-cause-unaligned-access-SIGBUS.patch b/debian/patches/Don-t-run-a-loop-which-may-cause-unaligned-access-SIGBUS.patch
new file mode 100644
index 0000000..5377916
--- /dev/null
+++ b/debian/patches/Don-t-run-a-loop-which-may-cause-unaligned-access-SIGBUS.patch
@@ -0,0 +1,23 @@
+From: Iain Lane <iain.lane at canonical.com>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Don't run a loop which may cause unaligned access (SIGBUS)
+
+This happens on armhf and sparc64 (and sparc, which is not a Debian
+arch anymore)
+---
+ cplcore/cpl_mask.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cplcore/cpl_mask.c b/cplcore/cpl_mask.c
+index 7684f48..632c6db 100644
+--- a/cplcore/cpl_mask.c
++++ b/cplcore/cpl_mask.c
+@@ -1127,7 +1127,7 @@ cpl_size cpl_mask_count_window(const cpl_mask * self,
+
+ for (j = lly - 1; j < ury; j++, pi += self->nx) {
+ i = llx - 1;
+-#ifdef CPL_MASK_WORD
++#if defined (CPL_MASK_WORD) && !defined(__arm__) && !defined(sparcv9)
+ /* FIXME: Should really ensure byte-wise iteration to word-boundary */
+ for (; i < llx - 1 + CPL_MASK_PAD2WORD2(llx - 1); i++) {
+ if (pi[i] != CPL_BINARY_0) count++;
diff --git a/debian/patches/fix_i386_failure.patch b/debian/patches/Fix-angle-tolerance-in-i386.patch
similarity index 62%
rename from debian/patches/fix_i386_failure.patch
rename to debian/patches/Fix-angle-tolerance-in-i386.patch
index b645e04..f16f8d7 100644
--- a/debian/patches/fix_i386_failure.patch
+++ b/debian/patches/Fix-angle-tolerance-in-i386.patch
@@ -1,5 +1,6 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix angle tolerance in i386
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Fix angle tolerance in i386
Reason is (IMO) that in `cpl_ppm_match_points()`, outliers are detected with
(`cpl_ppm.c`. line 1757):
@@ -9,11 +10,16 @@ difference_of_angles(angle[i], median_angle) > angle_tolerance
with `angle_tolerance = tolerance * median_angle`. `median_angle` may here be
close to zero, and is actually equal zero in some (i586) cases -- atan2 seems
to return 0.0 for small angles there. The input angle for the median may be
-even "wrapped around" to 2*Pi...
+even "wrapped around" to 2*Pi...
+---
+ cpldrs/cpl_ppm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/cpldrs/cpl_ppm.c b/cpldrs/cpl_ppm.c
+index fa96d51..3a527e7 100644
--- a/cpldrs/cpl_ppm.c
+++ b/cpldrs/cpl_ppm.c
-@@ -1754,7 +1754,7 @@
+@@ -1754,7 +1754,7 @@ cpl_ppm_match_points(const cpl_matrix *data, cpl_size use_data, double err_data,
*/
scale_tolerance = tolerance * median_scale;
diff --git a/debian/patches/serial-tests b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
similarity index 61%
rename from debian/patches/serial-tests
rename to debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
index 468bcee..435b77a 100644
--- a/debian/patches/serial-tests
+++ b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
@@ -1,6 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Force serial-tests to get better verbose output
-Bug: http://bugs.debian.org/715204
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ cplcore/tests/Makefile.am | 2 +-
+ cpldfs/tests/Makefile.am | 2 +-
+ cpldrs/tests/Makefile.am | 2 +-
+ cplui/tests/Makefile.am | 2 +-
+ libcext/tests/Makefile.am | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cplcore/tests/Makefile.am b/cplcore/tests/Makefile.am
+index 3be05f5..5ac4053 100644
--- a/cplcore/tests/Makefile.am
+++ b/cplcore/tests/Makefile.am
@@ -18,7 +18,7 @@
@@ -12,6 +23,8 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
+diff --git a/cpldfs/tests/Makefile.am b/cpldfs/tests/Makefile.am
+index 77112af..010e404 100644
--- a/cpldfs/tests/Makefile.am
+++ b/cpldfs/tests/Makefile.am
@@ -18,7 +18,7 @@
@@ -23,6 +36,8 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
+diff --git a/cpldrs/tests/Makefile.am b/cpldrs/tests/Makefile.am
+index a2e3da7..bbaa6d6 100644
--- a/cpldrs/tests/Makefile.am
+++ b/cpldrs/tests/Makefile.am
@@ -18,7 +18,7 @@
@@ -34,6 +49,8 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
+diff --git a/cplui/tests/Makefile.am b/cplui/tests/Makefile.am
+index 640dd79..3e00c86 100644
--- a/cplui/tests/Makefile.am
+++ b/cplui/tests/Makefile.am
@@ -18,7 +18,7 @@
@@ -45,6 +62,8 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
+diff --git a/libcext/tests/Makefile.am b/libcext/tests/Makefile.am
+index 96633d5..cbc3d0e 100644
--- a/libcext/tests/Makefile.am
+++ b/libcext/tests/Makefile.am
@@ -18,7 +18,7 @@
diff --git a/debian/patches/Loose-cpl_fit_test.patch b/debian/patches/Loose-cpl_fit_test.patch
new file mode 100644
index 0000000..4bcf65e
--- /dev/null
+++ b/debian/patches/Loose-cpl_fit_test.patch
@@ -0,0 +1,26 @@
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Loose cpl_fit_test
+
+On several machines -- even 64 bit -- the fit test may fail because of
+a significant loss of precision in
+cpl_fit_imagelist_polynomial_window(). Since the fit accuracy is not
+defined anyway, we will use the loose requirement here for all
+architectures.
+---
+ cpldrs/tests/cpl_fit-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpldrs/tests/cpl_fit-test.c b/cpldrs/tests/cpl_fit-test.c
+index 4f2ef79..6a2ff6b 100644
+--- a/cpldrs/tests/cpl_fit-test.c
++++ b/cpldrs/tests/cpl_fit-test.c
+@@ -1576,7 +1576,7 @@ cpl_fit_imagelist_polynomial_window_test(const cpl_vector * x_pos,
+ cpl_image * baderror = fiterror ? cpl_image_duplicate(fiterror) : NULL;
+ const double tol = pixeltype == CPL_TYPE_INT ? 0.0
+ : (pixeltype == CPL_TYPE_FLOAT
+-#if defined SIZEOF_SIZE_T && SIZEOF_SIZE_T == 4
++#if 1
+ /* FIXME: Extreme loss of precision on (some) 32-bit machines */
+ ? 0.004 : 30.0 * FLT_EPSILON
+ #else
diff --git a/debian/patches/Lower-the-required-versions-for-WCS-and-FFTW.patch b/debian/patches/Lower-the-required-versions-for-WCS-and-FFTW.patch
new file mode 100644
index 0000000..ce5ba06
--- /dev/null
+++ b/debian/patches/Lower-the-required-versions-for-WCS-and-FFTW.patch
@@ -0,0 +1,25 @@
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Lower the required versions for WCS and FFTW.
+
+Although not supported by ESO, the lower version should work (however,
+this is not well-tested).
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d2e41ae..e629ab9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,8 +78,8 @@ AC_CHECK_LIB(nsl, inet_ntoa, [LIBS="$LIBS -lnsl"])
+
+ CPL_CONFIG_CEXT
+ CPL_CONFIG_CFITSIO([3.310])
+-CPL_CHECK_WCS([4.16])
+-CPL_CHECK_FFTW([3.3.3])
++CPL_CHECK_WCS([4.4.4])
++CPL_CHECK_FFTW([3.1.2])
+
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/debian/patches/Remove-CPU-check-at-compile-time.patch b/debian/patches/Remove-CPU-check-at-compile-time.patch
new file mode 100644
index 0000000..3aeff2d
--- /dev/null
+++ b/debian/patches/Remove-CPU-check-at-compile-time.patch
@@ -0,0 +1,25 @@
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Remove CPU check at compile time
+
+On Linux machines, CPL_CHECK_CPU checks the CPU 2nd level cache during
+compile time for some obscure code optimizations. In a distribution,
+the produced code should be independent of the build environment, so
+we use the default here which works well for non-Linux platforms. The
+performance loss is probably negleglible.
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ffb4d80..d2e41ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,6 @@ CPL_CREATE_SYMBOLS(build)
+ CPL_EXPORT_DIRS(htmldir)
+
+ CPL_CHECK_MEMORYMODE
+-CPL_CHECK_CPU
+
+ CPL_ENABLE_GASGANO
+
diff --git a/debian/patches/remove-wcs-versioninfo.patch b/debian/patches/Remove-WCS-versioninfo.patch
similarity index 51%
rename from debian/patches/remove-wcs-versioninfo.patch
rename to debian/patches/Remove-WCS-versioninfo.patch
index 7210513..1815e71 100644
--- a/debian/patches/remove-wcs-versioninfo.patch
+++ b/debian/patches/Remove-WCS-versioninfo.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Since wcslib does not provide a version string at runtime, CPL
- included the WCSLIB version number at compile time. This is misleading when
- the wcslib is updated afterwards. To omit confusion, this patch removes the
- WCSLIB version number from the CPL version string.
-Forwarded: <mailto:cpl-help at eso.org>
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Remove WCS versioninfo
+
+Since wcslib does not provide a version string at runtime, CPL
+included the WCSLIB version number at compile time. This is misleading
+when the wcslib is updated afterwards. To omit confusion, this patch
+removes the WCSLIB version number from the CPL version string.
+---
+ cplcore/cpl_init.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/cplcore/cpl_init.c b/cplcore/cpl_init.c
+index e4f3276..257c4c4 100644
--- a/cplcore/cpl_init.c
+++ b/cplcore/cpl_init.c
@@ -47,11 +47,6 @@
@@ -18,7 +26,7 @@ Forwarded: <mailto:cpl-help at eso.org>
#if defined CPL_FFTWF_INSTALLED || defined CPL_FFTW_INSTALLED
#include <fftw3.h>
#endif
-@@ -273,11 +268,7 @@
+@@ -273,11 +268,7 @@ const char * cpl_get_description(unsigned self)
only, or both */
#ifdef CPL_WCS_INSTALLED
diff --git a/debian/patches/remove-cfitsio-version-check.patch b/debian/patches/Remove-cfitsio-version-check.patch
similarity index 90%
rename from debian/patches/remove-cfitsio-version-check.patch
rename to debian/patches/Remove-cfitsio-version-check.patch
index 5ca0d78..332acab 100644
--- a/debian/patches/remove-cfitsio-version-check.patch
+++ b/debian/patches/Remove-cfitsio-version-check.patch
@@ -1,10 +1,18 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: ESO is paranoid against the binary incompability of cfitsio
- and checks that the version at runtime equals the compile time version.
- Since the libcfitsio3 is binary compatible up to now, this check is
- obsolete. For Debian, runtime dependency checks should be put into the
- install dependency anyway instead of checking it at runtime.
-Forwarded: <mailto:cpl-help at eso.org>
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Remove cfitsio version check
+
+ESO is paranoid against the binary incompability of cfitsio and checks
+that the version at runtime equals the compile time version. Since the
+libcfitsio3 is binary compatible up to now, this check is
+obsolete. For Debian, runtime dependency checks should be put into the
+install dependency anyway instead of checking it at runtime.
+---
+ cplcore/cpl_init.c | 112 -----------------------------------------------------
+ 1 file changed, 112 deletions(-)
+
+diff --git a/cplcore/cpl_init.c b/cplcore/cpl_init.c
+index 257c4c4..f09b6e4 100644
--- a/cplcore/cpl_init.c
+++ b/cplcore/cpl_init.c
@@ -98,49 +98,16 @@
@@ -57,7 +65,7 @@ Forwarded: <mailto:cpl-help at eso.org>
if (memory_mode_string != NULL) {
if (strcmp("0", memory_mode_string) == 0) {
-@@ -160,85 +127,6 @@
+@@ -160,85 +127,6 @@ cpl_init(unsigned self)
cpl_msg_warning(cpl_func, "Illegal input ignored");
}
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/Remove-private-library-libltdl-and-use-the-installed-one.patch
similarity index 62%
rename from debian/patches/remove-private-ltdl.patch
rename to debian/patches/Remove-private-library-libltdl-and-use-the-installed-one.patch
index aea9c1d..5d722bd 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/Remove-private-library-libltdl-and-use-the-installed-one.patch
@@ -1,8 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
Subject: Remove private library libltdl and use the installed one.
+
+---
+ Makefile.am | 3 +--
+ configure.ac | 5 +++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0059fb0..ac5cb88 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -25,11 +25,10 @@
+@@ -25,11 +25,10 @@ ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES = *~
if GASGANO_SUPPORT
@@ -15,9 +24,11 @@ Subject: Remove private library libltdl and use the installed one.
DOXYGEN_SUBDIRS =
+diff --git a/configure.ac b/configure.ac
+index 87b4385..ffb4d80 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -58,7 +58,9 @@
+@@ -58,7 +58,9 @@ ESO_CHECK_DOCTOOLS
AC_ENABLE_STATIC(yes)
AC_ENABLE_SHARED(yes)
@@ -28,7 +39,7 @@ Subject: Remove private library libltdl and use the installed one.
AC_PROG_LIBTOOL
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
-@@ -129,7 +131,6 @@
+@@ -129,7 +131,6 @@ CPL_ENABLE_GASGANO
CPL_CONFIG_FUNC
# Configure subpackages
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/Remove-timestamp-macros-from-source-for-repoducible-build.patch
similarity index 55%
rename from debian/patches/reproducible_build.patch
rename to debian/patches/Remove-timestamp-macros-from-source-for-repoducible-build.patch
index c6aca94..19d32d5 100644
--- a/debian/patches/reproducible_build.patch
+++ b/debian/patches/Remove-timestamp-macros-from-source-for-repoducible-build.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Remove timestamp macros from source
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Remove timestamp macros from source for repoducible builds
+
+---
+ cplcore/cpl_test.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/cplcore/cpl_test.c b/cplcore/cpl_test.c
+index b40792c..6baa0a4 100644
--- a/cplcore/cpl_test.c
+++ b/cplcore/cpl_test.c
-@@ -3003,12 +3003,6 @@
+@@ -3003,12 +3003,6 @@ static const char * cpl_test_get_description(void)
"This platform is not big-endian\n"
#endif
@@ -15,7 +23,7 @@ Description: Remove timestamp macros from source
#ifdef __STDC__
CPL_XSTRINGIFY(__STDC__) ": " CPL_STRINGIFY(__STDC__) "\n"
#endif
-@@ -3051,9 +3045,6 @@
+@@ -3051,9 +3045,6 @@ static const char * cpl_test_get_description(void)
#ifdef __OPTIMIZE__
CPL_XSTRINGIFY(__OPTIMIZE__) ": " CPL_STRINGIFY(__OPTIMIZE__) "\n"
#endif
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/Use-standard-paths-for-libraries.patch
similarity index 71%
rename from debian/patches/use-std-paths-for-libs.patch
rename to debian/patches/Use-standard-paths-for-libraries.patch
index 3154375..9ae3619 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/Use-standard-paths-for-libraries.patch
@@ -1,12 +1,63 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Check cfitsio, wcs, and fftw in the standard paths if
- they are not mentioned as configure packages. For wcslib, also the
- #include wcslib.h directives were changed so that the software can be
- compiled without additional -I flags of the compiler if wcslib is
- installed in the standard directory.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Use standard paths for libraries
+
+Check cfitsio, wcs, and fftw in the standard paths if they are not
+mentioned as configure packages. For wcslib, also the #include
+wcslib.h directives were changed so that the software can be compiled
+without additional -I flags of the compiler if wcslib is installed in
+the standard directory.
+---
+ cplcore/cpl_test.c | 2 +-
+ cpldrs/cpl_wcs.c | 2 +-
+ cpldrs/tests/cpl_wcs-test.c | 2 +-
+ m4/cpl.m4 | 15 ++++++++++-----
+ 4 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/cplcore/cpl_test.c b/cplcore/cpl_test.c
+index 2dd97c9..b40792c 100644
+--- a/cplcore/cpl_test.c
++++ b/cplcore/cpl_test.c
+@@ -111,7 +111,7 @@
+
+ #if defined CPL_WCS_INSTALLED && CPL_WCS_INSTALLED == 1
+ /* Used for WCSLIB_VERSION */
+-#include <wcslib.h>
++#include <wcslib/wcslib.h>
+ #endif
+
+ #ifndef inline
+diff --git a/cpldrs/cpl_wcs.c b/cpldrs/cpl_wcs.c
+index 947d446..74ddcb4 100644
+--- a/cpldrs/cpl_wcs.c
++++ b/cpldrs/cpl_wcs.c
+@@ -79,7 +79,7 @@
+ # undef PACKAGE_BUGREPORT
+ #endif
+
+-#include <wcslib.h>
++#include <wcslib/wcslib.h>
+ #endif /* End If WCS is installed */
+
+
+diff --git a/cpldrs/tests/cpl_wcs-test.c b/cpldrs/tests/cpl_wcs-test.c
+index c113037..43913d0 100644
+--- a/cpldrs/tests/cpl_wcs-test.c
++++ b/cpldrs/tests/cpl_wcs-test.c
+@@ -47,7 +47,7 @@
+
+ #ifdef CPL_WCS_INSTALLED
+ /* Needed for cpl_error_set_wcs() */
+-#include <wcslib.h>
++#include <wcslib/wcslib.h>
+ #endif
+
+ #define TESTFILE "nonaxis.fits"
+diff --git a/m4/cpl.m4 b/m4/cpl.m4
+index b0ec8ae..4e0bbb0 100644
--- a/m4/cpl.m4
+++ b/m4/cpl.m4
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -15,7 +66,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -110,6 +110,7 @@
+@@ -110,6 +110,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
@@ -23,7 +74,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -496,6 +497,7 @@
+@@ -496,6 +497,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
@@ -31,7 +82,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -608,7 +610,7 @@
+@@ -608,7 +610,7 @@ AC_DEFUN([CPL_CHECK_WCS],
cpl_wcs_check_version="$1"
cpl_wcs_check_header="wcslib.h"
@@ -40,7 +91,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_wcs_includes=""
cpl_wcs_libraries=""
-@@ -682,6 +684,7 @@
+@@ -682,6 +684,7 @@ AC_DEFUN([CPL_CHECK_WCS],
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -48,7 +99,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -844,8 +847,8 @@
+@@ -844,8 +847,8 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_check_version="$1"
cpl_fftw_check_header="fftw3.h"
@@ -59,7 +110,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_fftw_includes=""
cpl_fftw_libraries=""
-@@ -920,6 +923,7 @@
+@@ -920,6 +923,7 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -67,7 +118,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1270,7 +1274,7 @@
+@@ -1270,7 +1274,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -76,7 +127,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_incdirs=""
cpl_libdirs=""
-@@ -1347,6 +1351,7 @@
+@@ -1347,6 +1351,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
@@ -84,36 +135,3 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CPLDIR" && \
cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
---- a/cplcore/cpl_test.c
-+++ b/cplcore/cpl_test.c
-@@ -111,7 +111,7 @@
-
- #if defined CPL_WCS_INSTALLED && CPL_WCS_INSTALLED == 1
- /* Used for WCSLIB_VERSION */
--#include <wcslib.h>
-+#include <wcslib/wcslib.h>
- #endif
-
- #ifndef inline
---- a/cpldrs/cpl_wcs.c
-+++ b/cpldrs/cpl_wcs.c
-@@ -79,7 +79,7 @@
- # undef PACKAGE_BUGREPORT
- #endif
-
--#include <wcslib.h>
-+#include <wcslib/wcslib.h>
- #endif /* End If WCS is installed */
-
-
---- a/cpldrs/tests/cpl_wcs-test.c
-+++ b/cpldrs/tests/cpl_wcs-test.c
-@@ -47,7 +47,7 @@
-
- #ifdef CPL_WCS_INSTALLED
- /* Needed for cpl_error_set_wcs() */
--#include <wcslib.h>
-+#include <wcslib/wcslib.h>
- #endif
-
- #define TESTFILE "nonaxis.fits"
diff --git a/debian/patches/Work-around-MIPS-compiler-optimization-problem.patch b/debian/patches/Work-around-MIPS-compiler-optimization-problem.patch
new file mode 100644
index 0000000..f4a1b18
--- /dev/null
+++ b/debian/patches/Work-around-MIPS-compiler-optimization-problem.patch
@@ -0,0 +1,25 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Sep 2017 17:16:17 +0200
+Subject: Work around MIPS compiler optimization problem
+
+Switch off optimization for cpl_imagelist_basic.c on MIPS There is a
+loop optimization problem around cpl_imagelist_basic_body.h:111
+---
+ cplcore/cpl_imagelist_basic.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cplcore/cpl_imagelist_basic.c b/cplcore/cpl_imagelist_basic.c
+index 0769976..1ae7a2a 100644
+--- a/cplcore/cpl_imagelist_basic.c
++++ b/cplcore/cpl_imagelist_basic.c
+@@ -29,6 +29,10 @@
+ #include <config.h>
+ #endif
+
++#ifdef __mips__
++#pragma GCC optimize ("-O0") /* workaround for #813777: gcc bug? */
++#endif
++
+ /*-----------------------------------------------------------------------------
+ Includes
+ -----------------------------------------------------------------------------*/
diff --git a/debian/patches/cpl_mask_count_window_no_unaligned_access_armhf b/debian/patches/cpl_mask_count_window_no_unaligned_access_armhf
deleted file mode 100644
index c2b6e0a..0000000
--- a/debian/patches/cpl_mask_count_window_no_unaligned_access_armhf
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Don't run a loop which causes unaligned access (SIGBUS) on armhf
-Author: Iain Lane <iain.lane at canonical.com>
-Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846094
-
---- cpl-7.0.orig/cplcore/cpl_mask.c
-+++ cpl-7.0/cplcore/cpl_mask.c
-@@ -1127,7 +1127,7 @@ cpl_size cpl_mask_count_window(const cpl
-
- for (j = lly - 1; j < ury; j++, pi += self->nx) {
- i = llx - 1;
--#ifdef CPL_MASK_WORD
-+#if defined (CPL_MASK_WORD) && !defined(__arm__) && !defined(sparcv9)
- /* FIXME: Should really ensure byte-wise iteration to word-boundary */
- for (; i < llx - 1 + CPL_MASK_PAD2WORD2(llx - 1); i++) {
- if (pi[i] != CPL_BINARY_0) count++;
diff --git a/debian/patches/fix_required_versions.patch b/debian/patches/fix_required_versions.patch
deleted file mode 100644
index 9975cde..0000000
--- a/debian/patches/fix_required_versions.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Lower the required versions for WCS and FFTW.
- Although not supported by ESO, the lower version should work (however,
- this is not well-tested).
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,8 +78,8 @@
-
- CPL_CONFIG_CEXT
- CPL_CONFIG_CFITSIO([3.310])
--CPL_CHECK_WCS([4.16])
--CPL_CHECK_FFTW([3.3.3])
-+CPL_CHECK_WCS([4.4.4])
-+CPL_CHECK_FFTW([3.1.2])
-
- # Checks for header files.
- AC_HEADER_STDC
diff --git a/debian/patches/loose_cplfit_test.patch b/debian/patches/loose_cplfit_test.patch
deleted file mode 100644
index afdf40e..0000000
--- a/debian/patches/loose_cplfit_test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: On several machines -- even 64 bit -- the fit test may fail
- because of a significant loss of precision in
- cpl_fit_imagelist_polynomial_window(). Since the fit accuracy is not defined
- anyway, we will use the loose requirement here for all architectures.
---- a/cpldrs/tests/cpl_fit-test.c
-+++ b/cpldrs/tests/cpl_fit-test.c
-@@ -1576,7 +1576,7 @@
- cpl_image * baderror = fiterror ? cpl_image_duplicate(fiterror) : NULL;
- const double tol = pixeltype == CPL_TYPE_INT ? 0.0
- : (pixeltype == CPL_TYPE_FLOAT
--#if defined SIZEOF_SIZE_T && SIZEOF_SIZE_T == 4
-+#if 1
- /* FIXME: Extreme loss of precision on (some) 32-bit machines */
- ? 0.004 : 30.0 * FLT_EPSILON
- #else
diff --git a/debian/patches/no_compiletime_cpucheck.patch b/debian/patches/no_compiletime_cpucheck.patch
deleted file mode 100644
index 6e99987..0000000
--- a/debian/patches/no_compiletime_cpucheck.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: On Linux machines, CPL_CHECK_CPU checks the CPU 2nd level
- cache during compile time for some obscure code optimizations. In a
- distribution, the produced code should be independent of the build
- environment, so we use the default here which works well for non-Linux
- platforms. The performance loss is probably negleglible.
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,7 +123,6 @@
- CPL_EXPORT_DIRS(htmldir)
-
- CPL_CHECK_MEMORYMODE
--CPL_CHECK_CPU
-
- CPL_ENABLE_GASGANO
-
diff --git a/debian/patches/series b/debian/patches/series
index 779f77c..0881bb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,12 @@
-remove-wcs-versioninfo.patch
-remove-cfitsio-version-check.patch
-use-std-paths-for-libs.patch
-remove-private-ltdl.patch
-loose_cplfit_test.patch
-no_compiletime_cpucheck.patch
-fix_required_versions.patch
-serial-tests
-reproducible_build.patch
-workaround_mips_ftbfs.patch
-fix_i386_failure.patch
-cpl_mask_count_window_no_unaligned_access_armhf
+Remove-WCS-versioninfo.patch
+Remove-cfitsio-version-check.patch
+Use-standard-paths-for-libraries.patch
+Remove-private-library-libltdl-and-use-the-installed-one.patch
+Loose-cpl_fit_test.patch
+Remove-CPU-check-at-compile-time.patch
+Lower-the-required-versions-for-WCS-and-FFTW.patch
+Force-serial-tests-to-get-better-verbose-output.patch
+Remove-timestamp-macros-from-source-for-repoducible-build.patch
+Work-around-MIPS-compiler-optimization-problem.patch
+Fix-angle-tolerance-in-i386.patch
+Don-t-run-a-loop-which-may-cause-unaligned-access-SIGBUS.patch
diff --git a/debian/patches/workaround_mips_ftbfs.patch b/debian/patches/workaround_mips_ftbfs.patch
deleted file mode 100644
index 30adebb..0000000
--- a/debian/patches/workaround_mips_ftbfs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Bug: https://bugs.debian.org/813777
-Description: Switch off optimization for cpl_imagelist_basic.c on MIPS
- There is a loop optimization problem around cpl_imagelist_basic_body.h:111
---- a/cplcore/cpl_imagelist_basic.c
-+++ b/cplcore/cpl_imagelist_basic.c
-@@ -29,6 +29,10 @@
- #include <config.h>
- #endif
-
-+#ifdef __mips__
-+#pragma GCC optimize ("-O0") /* workaround for #813777: gcc bug? */
-+#endif
-+
- /*-----------------------------------------------------------------------------
- Includes
- -----------------------------------------------------------------------------*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl.git
More information about the Debian-astro-commits
mailing list