[Debian-astro-commits] [cpl-plugin-hawki] 02/04: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Fri Jun 30 15:00:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository cpl-plugin-hawki.
commit dcccc438e240f750b591690fa36c5e956a4db952
Author: Ole Streicher <olebole at debian.org>
Date: Fri Jun 30 16:56:41 2017 +0200
Rediff patches
Dropped use-std-paths-for-cpl.patch: <REASON>
---
debian/patches/fix_irplib_gcc5.patch | 54 +++++++++++++------------
debian/patches/fix_test_fail.patch | 14 +++++--
debian/patches/force-serial-tests.patch | 42 ++++++++++++++------
debian/patches/series | 1 -
debian/patches/set_plugindir.patch | 14 +++++--
debian/patches/use-std-paths-for-cpl.patch | 63 ------------------------------
6 files changed, 79 insertions(+), 109 deletions(-)
diff --git a/debian/patches/fix_irplib_gcc5.patch b/debian/patches/fix_irplib_gcc5.patch
index fa3b637..095663d 100644
--- a/debian/patches/fix_irplib_gcc5.patch
+++ b/debian/patches/fix_irplib_gcc5.patch
@@ -1,15 +1,20 @@
From: jtaylor <jtaylor at 318c8218-2dab-440d-9263-6f70bac63e5b>
Date: Fri, 31 Oct 2014 09:48:58 +0000
-Subject: [PATCH] make aligned allocator more robust to weird standard
- requirements
+Subject: make aligned allocator more robust to weird standard requirements
C11 requires size to be multiple of alignment, so extend the size
internally. glibc does not require that and additionally does not require
the alignment to be a power of two. In irplib requires this for all variants
for consistency.
+---
+ irplib/irplib_utils.c | 78 +++++++++++++++++++++++++++++----------------------
+ 1 file changed, 44 insertions(+), 34 deletions(-)
+
+diff --git a/irplib/irplib_utils.c b/irplib/irplib_utils.c
+index 2b13ab7..f3bef8b 100644
--- a/irplib/irplib_utils.c
+++ b/irplib/irplib_utils.c
-@@ -1587,51 +1587,61 @@
+@@ -1587,51 +1587,61 @@ static double frame_get_exptime(const cpl_frame * pframe)
/*----------------------------------------------------------------------------*/
void * irplib_aligned_malloc(size_t alignment, size_t size)
{
@@ -44,21 +49,6 @@ for consistency.
- if (size == 0)
- return NULL;
--
-- /* Assume malloc'd pointer is aligned at least to sizeof (void*).
-- If necessary, add another sizeof (void*) to store the value
-- returned by malloc. Effectively this enforces a minimum alignment
-- of sizeof double. */
-- if (alignment < 2 * sizeof (void *))
-- alignment = 2 * sizeof (void *);
--
-- malloc_ptr = malloc (size + alignment);
-- if (!malloc_ptr)
-- return NULL;
--
-- /* Align We have at least sizeof (void *) space below malloc'd ptr. */
-- aligned_ptr = (void *) (((size_t) malloc_ptr + alignment)
-- & ~((size_t) (alignment) - 1));
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L
+ return aligned_alloc(alignment, size);
+#elif defined HAVE_POSIX_MEMALIGN && defined HAVE_DECL_POSIX_MEMALIGN
@@ -78,31 +68,43 @@ for consistency.
+ {
+ void * malloc_ptr;
+ void * aligned_ptr;
-+
+
+- /* Assume malloc'd pointer is aligned at least to sizeof (void*).
+- If necessary, add another sizeof (void*) to store the value
+- returned by malloc. Effectively this enforces a minimum alignment
+- of sizeof double. */
+- if (alignment < 2 * sizeof (void *))
+- alignment = 2 * sizeof (void *);
+ if (size == 0)
+ return NULL;
-+
+
+- malloc_ptr = malloc (size + alignment);
+- if (!malloc_ptr)
+- return NULL;
+ /* Assume malloc'd pointer is aligned at least to sizeof (void*).
+ If necessary, add another sizeof (void*) to store the value
+ returned by malloc. Effectively this enforces a minimum alignment
+ of sizeof double. */
+ if (alignment < 2 * sizeof (void *))
+ alignment = 2 * sizeof (void *);
-+
+
+- /* Align We have at least sizeof (void *) space below malloc'd ptr. */
+- aligned_ptr = (void *) (((size_t) malloc_ptr + alignment)
+- & ~((size_t) (alignment) - 1));
+ malloc_ptr = malloc (size + alignment);
+ if (!malloc_ptr)
+ return NULL;
-+
+
+- /* Store the original pointer just before p. */
+- *(((void **) aligned_ptr) - 1) = malloc_ptr;
+ /* Align We have at least sizeof (void *) space below malloc'd ptr. */
+ aligned_ptr = (void *) (((size_t) malloc_ptr + alignment)
+ & ~((size_t) (alignment) - 1));
-- /* Store the original pointer just before p. */
-- *(((void **) aligned_ptr) - 1) = malloc_ptr;
+- return aligned_ptr;
+ /* Store the original pointer just before p. */
+ *(((void **) aligned_ptr) - 1) = malloc_ptr;
-
-- return aligned_ptr;
++
+ return aligned_ptr;
+ }
#endif
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index dd30010..f3dc6f8 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/fix_test_fail.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 30 Jun 2017 16:54:42 +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 146478a..19f3df0 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -560,16 +560,16 @@
+@@ -560,16 +560,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);
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
index fdb4c74..a513819 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -1,28 +1,42 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Force serial-tests to get better verbose output
-Bug: http://bugs.debian.org/715204
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 30 Jun 2017 16:54:42 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ hawki/tests/Makefile.am | 2 +-
+ irplib/tests/Makefile.am | 2 +-
+ regtests/tests/Makefile.am | 2 +-
+ tests/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hawki/tests/Makefile.am b/hawki/tests/Makefile.am
+index 9cc8f17..2e7b4e8 100644
+--- a/hawki/tests/Makefile.am
++++ b/hawki/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--AUTOMAKE_OPTIONS = 1.6 foreign
+-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~
---- a/hawki/tests/Makefile.am
-+++ b/hawki/tests/Makefile.am
+diff --git a/irplib/tests/Makefile.am b/irplib/tests/Makefile.am
+index 8a403b4..8371c90 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~
+diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
+index d5ae540..0213f37 100644
--- a/regtests/tests/Makefile.am
+++ b/regtests/tests/Makefile.am
@@ -17,7 +17,7 @@
@@ -34,13 +48,15 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
---- a/irplib/tests/Makefile.am
-+++ b/irplib/tests/Makefile.am
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 8bf80f4..03e4dde 100644
+--- a/tests/Makefile.am
++++ b/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
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--AUTOMAKE_OPTIONS = 1.8 foreign
+-AUTOMAKE_OPTIONS = 1.6 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~
diff --git a/debian/patches/series b/debian/patches/series
index 7f5a4e9..f23edd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
set_plugindir.patch
-use-std-paths-for-cpl.patch
fix_test_fail.patch
force-serial-tests.patch
fix_irplib_gcc5.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index b98aac7..1948ee7 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Set the plugin directory so that esorex and python-cpl can find it.
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 30 Jun 2017 16:54:42 +0200
+Subject: Set the plugin directory so that esorex and python-cpl can find it.
+
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 1db3a06..28b0495 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ AC_DEFUN([HAWKI_SET_VERSION_INFO],
AC_DEFUN([HAWKI_SET_PATHS],
[
if test -z "$plugindir"; then
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
deleted file mode 100644
index 6ad20e8..0000000
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use standard path and name for cpl
---- a/m4macros/cpl.m4
-+++ b/m4macros/cpl.m4
-@@ -9,7 +9,7 @@
-
- cpl_cfitsio_check_version="$1"
- cpl_cfitsio_check_header="fitsio.h"
-- cpl_cfitsio_check_lib="libcfitsio.a"
-+ cpl_cfitsio_check_lib="libcfitsio.so"
-
- cpl_cfitsio_incdirs=""
- cpl_cfitsio_libdirs=""
-@@ -110,7 +110,7 @@
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
--
-+ cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- test -n "$CFITSIODIR" && \
- cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
- $CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
-@@ -492,6 +492,7 @@
- cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
- cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
- cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
-+ cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
- test -n "$CPLDIR" && \
- cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -678,6 +679,7 @@
- cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
- cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
- cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
-+ cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
- test -n "$WCSDIR" && \
- cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -912,6 +914,7 @@
- cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
- cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
- cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
-+ cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
- test -n "$FFTWDIR" && \
- cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1250,7 +1253,7 @@
- AC_MSG_CHECKING([for CPL])
-
- cpl_check_cpl_header="cpl.h"
-- cpl_check_cpl_lib="libcplcore.a"
-+ cpl_check_cpl_lib="libcplcore.so"
-
- cpl_incdirs=""
- cpl_libdirs=""
-@@ -1327,6 +1330,7 @@
- cpl_libdirs="$cpl_libdirs /usr/lib64"
- cpl_libdirs="$cpl_libdirs /usr/lib"
- cpl_libdirs="$cpl_libdirs /usr/lib32"
-+ cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
- test -n "$CPLDIR" && \
- cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-hawki.git
More information about the Debian-astro-commits
mailing list