summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-02-22 06:17:02 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2020-02-25 05:29:18 +0530
commitf04628caf563ab702cd821f42062e0daa82c6246 (patch)
tree20080751fbd47a69b30fe4297657f61248f64d07
parentfbaf3bc4ae8c6253f560d3da2ab4dee746cfcb09 (diff)
spandsp.recipe: Remove redundant decls
This is causing a failure with Meson 0.53 since it passes `-Werror=redundant-decls` when `--werror` is enabled.
-rw-r--r--recipes/spandsp.recipe3
-rw-r--r--recipes/spandsp/0001-Delete-redundant-function-prototype-in-header.patch47
2 files changed, 49 insertions, 1 deletions
diff --git a/recipes/spandsp.recipe b/recipes/spandsp.recipe
index c5cc1d95..2ba100bc 100644
--- a/recipes/spandsp.recipe
+++ b/recipes/spandsp.recipe
@@ -15,7 +15,8 @@ class Recipe(recipe.Recipe):
'spandsp/0002-Define-LIBSPANDSP_EXPORTS-when-building-the-spandsp-.patch',
'spandsp/0003-Use-BUILT_SOURCES-to-generate-extra-headers.patch',
'spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch',
- 'spandsp/0001-Make-the-public-API-accessible-from-MSVC.patch',]
+ 'spandsp/0001-Make-the-public-API-accessible-from-MSVC.patch',
+ 'spandsp/0001-Delete-redundant-function-prototype-in-header.patch',]
files_libs = ['libspandsp']
files_devel = ['include/spandsp', 'include/spandsp.h', 'lib/pkgconfig/spandsp.pc']
diff --git a/recipes/spandsp/0001-Delete-redundant-function-prototype-in-header.patch b/recipes/spandsp/0001-Delete-redundant-function-prototype-in-header.patch
new file mode 100644
index 00000000..b525c90b
--- /dev/null
+++ b/recipes/spandsp/0001-Delete-redundant-function-prototype-in-header.patch
@@ -0,0 +1,47 @@
+From cf4a00fa48ed5fff880747e906acc48ff8e4b777 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Sat, 22 Feb 2020 06:13:24 +0530
+Subject: [PATCH] Delete redundant function prototype in header
+
+This is causing a failure with Meson 0.53 since it passes
+`-Werror=redundant-decls` when `--werror` is enabled.
+---
+ src/spandsp/dds.h | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/src/spandsp/dds.h b/src/spandsp/dds.h
+index 698c4e7..c4ece9a 100644
+--- a/src/spandsp/dds.h
++++ b/src/spandsp/dds.h
+@@ -66,12 +66,6 @@ SPAN_DECLARE(int16_t) dds_scaling_dbm0(float level);
+ */
+ SPAN_DECLARE(int16_t) dds_scaling_dbov(float level);
+
+-/*! \brief Find the amplitude for a particular phase.
+- \param phase The desired phase 32 bit phase.
+- \return The signal amplitude.
+-*/
+-SPAN_DECLARE(int16_t) dds_lookup(uint32_t phase);
+-
+ /*! \brief Find the amplitude for a particular phase offset from an accumulated phase.
+ \param phase_acc The accumulated phase.
+ \param phase_offset The phase offset.
+@@ -152,15 +146,6 @@ SPAN_DECLARE(complexi16_t) dds_complexi16(uint32_t *phase_acc, int32_t phase_rat
+ */
+ SPAN_DECLARE(complexi16_t) dds_complexi16_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase);
+
+-/*! \brief Generate a complex 32 bit integer tone sample, with modulation.
+- \param phase_acc A pointer to a phase accumulator value.
+- \param phase_rate The phase increment to be applied.
+- \param scale The scaling factor.
+- \param phase The phase offset.
+- \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767).
+-*/
+-SPAN_DECLARE(complexi32_t) dds_complexi32_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase);
+-
+ /*! \brief Generate a complex 32 bit integer tone sample.
+ \param phase_acc A pointer to a phase accumulator value.
+ \param phase_rate The phase increment to be applied.
+--
+2.24.1
+