From 9301b2c22113c5e067d8bff3575fa30c6353e109 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Sun, 11 Aug 2013 21:14:58 +0300 Subject: [PATCH] Fix build failure due to gsl 1.15 --> 1.16 upgrade --- debian/patches/series | 1 + debian/patches/src-fft-cpp.patch | 11 +++++++++++ src/fft.cpp | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/patches/src-fft-cpp.patch diff --git a/debian/patches/series b/debian/patches/series index 4277de1..116b8c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +src-fft-cpp.patch CMakeLists-txt.patch diff --git a/debian/patches/src-fft-cpp.patch b/debian/patches/src-fft-cpp.patch new file mode 100644 index 0000000..bd7184f --- /dev/null +++ b/debian/patches/src-fft-cpp.patch @@ -0,0 +1,11 @@ +--- a/src/fft.cpp ++++ b/src/fft.cpp +@@ -82,7 +82,7 @@ + void MGL_EXPORT mgl_fft(double *x, long s, long n, const void *wt, void *ws, bool inv) + { + #if MGL_HAVE_GSL +-gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?backward:forward); ++gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?gsl_fft_backward:gsl_fft_forward); + #else // NOTE this is VERY slow! + const double *c = (const double *)wt; + double *d = (double *)ws, f = inv?1./n:1; diff --git a/src/fft.cpp b/src/fft.cpp index 486154d..ba62d21 100644 --- a/src/fft.cpp +++ b/src/fft.cpp @@ -82,7 +82,7 @@ void MGL_EXPORT mgl_fft_free(void *wt, void **ws, long nthr) void MGL_EXPORT mgl_fft(double *x, long s, long n, const void *wt, void *ws, bool inv) { #if MGL_HAVE_GSL -gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?backward:forward); +gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?gsl_fft_backward:gsl_fft_forward); #else // NOTE this is VERY slow! const double *c = (const double *)wt; double *d = (double *)ws, f = inv?1./n:1; -- 2.30.2