From: Lucas Stach <l.stach@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 1/3] speex: version bump 1.2rc1 -> 1.2
Date: Mon, 5 Nov 2018 16:01:15 +0100 [thread overview]
Message-ID: <20181105150117.13436-1-l.stach@pengutronix.de> (raw)
- version bump
- speexdsp has been split out by upstream into own library
with most recent release version 1.2rc3
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
| 45 ----
patches/speex-1.2rc1/0002-resample.patch | 84 -------
.../0003-Make-speex-Thumb2-compatible.patch | 228 ------------------
patches/speex-1.2rc1/series | 6 -
rules/speex.in | 8 +-
rules/speex.make | 38 +--
rules/speexdsp.in | 35 +++
rules/speexdsp.make | 74 ++++++
8 files changed, 126 insertions(+), 392 deletions(-)
delete mode 100644 patches/speex-1.2rc1/0001-speex_header.patch
delete mode 100644 patches/speex-1.2rc1/0002-resample.patch
delete mode 100644 patches/speex-1.2rc1/0003-Make-speex-Thumb2-compatible.patch
delete mode 100644 patches/speex-1.2rc1/series
create mode 100644 rules/speexdsp.in
create mode 100644 rules/speexdsp.make
diff --git a/patches/speex-1.2rc1/0001-speex_header.patch b/patches/speex-1.2rc1/0001-speex_header.patch
deleted file mode 100644
index 9bb09737a130..000000000000
--- a/patches/speex-1.2rc1/0001-speex_header.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Ron Lee <ron@debian.org>
-Date: Fri, 11 Jan 2013 12:13:50 +0100
-Subject: [PATCH] speex_header
-
-from: http://patch-tracker.debian.org/package/speex/1.2~rc1-7
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- libspeex/speex_header.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/libspeex/speex_header.c b/libspeex/speex_header.c
-index b743059..92cc0d4 100644
---- a/libspeex/speex_header.c
-+++ b/libspeex/speex_header.c
-@@ -147,20 +147,21 @@ EXPORT SpeexHeader *speex_packet_to_header(char *packet, int size)
- int i;
- SpeexHeader *le_header;
- const char *h = "Speex ";
-- for (i=0;i<8;i++)
-- if (packet[i]!=h[i])
-- {
-- speex_notify("This doesn't look like a Speex file");
-- return NULL;
-- }
--
-+
- /*FIXME: Do we allow larger headers?*/
- if (size < (int)sizeof(SpeexHeader))
- {
- speex_notify("Speex header too small");
- return NULL;
- }
--
-+
-+ for (i=0;i<8;i++)
-+ if (packet[i]!=h[i])
-+ {
-+ speex_notify("This doesn't look like a Speex file");
-+ return NULL;
-+ }
-+
- le_header = (SpeexHeader*)speex_alloc(sizeof(SpeexHeader));
-
- SPEEX_COPY(le_header, (SpeexHeader*)packet, 1);
diff --git a/patches/speex-1.2rc1/0002-resample.patch b/patches/speex-1.2rc1/0002-resample.patch
deleted file mode 100644
index db79c6fb014a..000000000000
--- a/patches/speex-1.2rc1/0002-resample.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Ron Lee <ron@debian.org>
-Date: Fri, 11 Jan 2013 12:13:50 +0100
-Subject: [PATCH] resample
-
-from: http://patch-tracker.debian.org/package/speex/1.2~rc1-7
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- libspeex/resample.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/libspeex/resample.c b/libspeex/resample.c
-index bebd1a8..0a0296b 100644
---- a/libspeex/resample.c
-+++ b/libspeex/resample.c
-@@ -561,8 +561,8 @@ static void update_filter(SpeexResamplerState *st)
- st->cutoff = quality_map[st->quality].downsample_bandwidth * st->den_rate / st->num_rate;
- /* FIXME: divide the numerator and denominator by a certain amount if they're too large */
- st->filt_len = st->filt_len*st->num_rate / st->den_rate;
-- /* Round down to make sure we have a multiple of 4 */
-- st->filt_len &= (~0x3);
-+ /* Round up to make sure we have a multiple of 8 for SSE */
-+ st->filt_len = ((st->filt_len-1)&(~0x7))+8;
- if (2*st->den_rate < st->num_rate)
- st->oversample >>= 1;
- if (4*st->den_rate < st->num_rate)
-@@ -579,7 +579,7 @@ static void update_filter(SpeexResamplerState *st)
- }
-
- /* Choose the resampling type that requires the least amount of memory */
-- if (st->den_rate <= st->oversample)
-+ if (st->filt_len*st->den_rate <= st->filt_len*st->oversample+8)
- {
- spx_uint32_t i;
- if (!st->sinc_table)
-@@ -756,9 +756,9 @@ EXPORT SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels,
- #endif
-
- /* Per channel data */
-- st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(int));
-- st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(int));
-- st->samp_frac_num = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(int));
-+ st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(spx_int32_t));
-+ st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t));
-+ st->samp_frac_num = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t));
- for (i=0;i<nb_channels;i++)
- {
- st->last_sample[i] = 0;
-@@ -954,13 +954,15 @@ EXPORT int speex_resampler_process_interleaved_float(SpeexResamplerState *st, co
- {
- spx_uint32_t i;
- int istride_save, ostride_save;
-- spx_uint32_t bak_len = *out_len;
-+ spx_uint32_t bak_out_len = *out_len;
-+ spx_uint32_t bak_in_len = *in_len;
- istride_save = st->in_stride;
- ostride_save = st->out_stride;
- st->in_stride = st->out_stride = st->nb_channels;
- for (i=0;i<st->nb_channels;i++)
- {
-- *out_len = bak_len;
-+ *out_len = bak_out_len;
-+ *in_len = bak_in_len;
- if (in != NULL)
- speex_resampler_process_float(st, i, in+i, in_len, out+i, out_len);
- else
-@@ -975,13 +977,15 @@ EXPORT int speex_resampler_process_interleaved_int(SpeexResamplerState *st, cons
- {
- spx_uint32_t i;
- int istride_save, ostride_save;
-- spx_uint32_t bak_len = *out_len;
-+ spx_uint32_t bak_out_len = *out_len;
-+ spx_uint32_t bak_in_len = *in_len;
- istride_save = st->in_stride;
- ostride_save = st->out_stride;
- st->in_stride = st->out_stride = st->nb_channels;
- for (i=0;i<st->nb_channels;i++)
- {
-- *out_len = bak_len;
-+ *out_len = bak_out_len;
-+ *in_len = bak_in_len;
- if (in != NULL)
- speex_resampler_process_int(st, i, in+i, in_len, out+i, out_len);
- else
diff --git a/patches/speex-1.2rc1/0003-Make-speex-Thumb2-compatible.patch b/patches/speex-1.2rc1/0003-Make-speex-Thumb2-compatible.patch
deleted file mode 100644
index f47df1dc9090..000000000000
--- a/patches/speex-1.2rc1/0003-Make-speex-Thumb2-compatible.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 11 Jan 2013 12:13:50 +0100
-Subject: [PATCH] Make speex Thumb2 compatible
-
-Patch written by Michael Hope from Linaro, available at
-http://lists.xiph.org/pipermail/speex-dev/2010-November/008041.html.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- libspeex/filters_arm4.h | 3 +++
- libspeex/fixed_arm4.h | 18 ++++++++++++++++++
- libspeex/fixed_arm5e.h | 18 ++++++++++++++++++
- 3 files changed, 39 insertions(+)
-
-diff --git a/libspeex/filters_arm4.h b/libspeex/filters_arm4.h
-index 7a74042..6ec1f75 100644
---- a/libspeex/filters_arm4.h
-+++ b/libspeex/filters_arm4.h
-@@ -47,8 +47,10 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
-
- "\tldr %4, [%0], #4 \n"
- "\tcmps %4, %1 \n"
-+ "\tit gt \n"
- "\tmovgt %1, %4 \n"
- "\tcmps %4, %3 \n"
-+ "\tit lt \n"
- "\tmovlt %3, %4 \n"
-
- "\tsubs %2, %2, #1 \n"
-@@ -56,6 +58,7 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
-
- "\trsb %3, %3, #0 \n"
- "\tcmp %1, %3 \n"
-+ "\tit lt \n"
- "\tmovlt %1, %3 \n"
- : "=r" (dead1), "=r" (max_val), "=r" (dead3), "=r" (dead4),
- "=r" (dead5), "=r" (dead6)
-diff --git a/libspeex/fixed_arm4.h b/libspeex/fixed_arm4.h
-index b6981ca..b6218ca 100644
---- a/libspeex/fixed_arm4.h
-+++ b/libspeex/fixed_arm4.h
-@@ -69,72 +69,90 @@ static inline short DIV32_16(int a, int b)
- __asm__ __volatile__ (
- "\teor %5, %0, %1\n"
- "\tmovs %4, %0\n"
-+ "\tit mi \n"
- "\trsbmi %0, %0, #0 \n"
- "\tmovs %4, %1\n"
-+ "\tit mi \n"
- "\trsbmi %1, %1, #0 \n"
- "\tmov %4, #1\n"
-
- "\tsubs %3, %0, %1, asl #14 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #14 \n"
-
- "\tsubs %3, %0, %1, asl #13 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #13 \n"
-
- "\tsubs %3, %0, %1, asl #12 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #12 \n"
-
- "\tsubs %3, %0, %1, asl #11 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #11 \n"
-
- "\tsubs %3, %0, %1, asl #10 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #10 \n"
-
- "\tsubs %3, %0, %1, asl #9 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #9 \n"
-
- "\tsubs %3, %0, %1, asl #8 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #8 \n"
-
- "\tsubs %3, %0, %1, asl #7 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #7 \n"
-
- "\tsubs %3, %0, %1, asl #6 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #6 \n"
-
- "\tsubs %3, %0, %1, asl #5 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #5 \n"
-
- "\tsubs %3, %0, %1, asl #4 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #4 \n"
-
- "\tsubs %3, %0, %1, asl #3 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #3 \n"
-
- "\tsubs %3, %0, %1, asl #2 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #2 \n"
-
- "\tsubs %3, %0, %1, asl #1 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4, asl #1 \n"
-
- "\tsubs %3, %0, %1 \n"
-+ "\titt pl \n"
- "\tmovpl %0, %3 \n"
- "\torrpl %2, %2, %4 \n"
-
- "\tmovs %5, %5, lsr #31 \n"
-+ "\tit ne \n"
- "\trsbne %2, %2, #0 \n"
- : "=r" (dead1), "=r" (dead2), "=r" (res),
- "=r" (dead3), "=r" (dead4), "=r" (dead5)
-diff --git a/libspeex/fixed_arm5e.h b/libspeex/fixed_arm5e.h
-index 9b4861c..bdadd02 100644
---- a/libspeex/fixed_arm5e.h
-+++ b/libspeex/fixed_arm5e.h
-@@ -97,72 +97,90 @@ static inline short DIV32_16(int a, int b)
- __asm__ __volatile__ (
- "\teor %5, %0, %1\n"
- "\tmovs %4, %0\n"
-+ "\tit mi \n"
- "\trsbmi %0, %0, #0 \n"
- "\tmovs %4, %1\n"
-+ "\tit mi \n"
- "\trsbmi %1, %1, #0 \n"
- "\tmov %4, #1\n"
-
- "\tsubs %3, %0, %1, asl #14 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #14 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #13 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #13 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #12 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #12 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #11 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #11 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #10 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #10 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #9 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #9 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #8 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #8 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #7 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #7 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #6 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #6 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #5 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #5 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #4 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #4 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #3 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #3 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #2 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #2 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1, asl #1 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4, asl #1 \n"
- "\tmovpl %0, %3 \n"
-
- "\tsubs %3, %0, %1 \n"
-+ "\titt pl \n"
- "\torrpl %2, %2, %4 \n"
- "\tmovpl %0, %3 \n"
-
- "\tmovs %5, %5, lsr #31 \n"
-+ "\tit ne \n"
- "\trsbne %2, %2, #0 \n"
- : "=r" (dead1), "=r" (dead2), "=r" (res),
- "=r" (dead3), "=r" (dead4), "=r" (dead5)
diff --git a/patches/speex-1.2rc1/series b/patches/speex-1.2rc1/series
deleted file mode 100644
index a708dd0f71b3..000000000000
--- a/patches/speex-1.2rc1/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-speex_header.patch
-0002-resample.patch
-0003-Make-speex-Thumb2-compatible.patch
-# 15de47bd7bc882627946c5258a755571 - git-ptx-patches magic
diff --git a/rules/speex.in b/rules/speex.in
index 0629947b1642..617b68e2bd57 100644
--- a/rules/speex.in
+++ b/rules/speex.in
@@ -4,7 +4,8 @@ menuconfig SPEEX
tristate
select LIBC_M
select GCCLIBS_GCC_S
- select LIBOGG
+ select LIBOGG if SPEEX_BINARIES
+ select SPEEXDSP
prompt "speex "
help
Speex is an Open Source/Free Software
@@ -48,12 +49,17 @@ choice
prompt "proprietary-intel-mkl [BROKEN]"
endchoice
+config SPEEX_BINARIES
+ bool
+
config SPEEX_INSTALL_SPEEXENC
bool
+ select SPEEX_BINARIES
prompt "Install speexenc"
config SPEEX_INSTALL_SPEEXDEC
bool
+ select SPEEX_BINARIES
prompt "Install speexdec"
endif
diff --git a/rules/speex.make b/rules/speex.make
index 1f2218cfc464..2d21f81b5b1e 100644
--- a/rules/speex.make
+++ b/rules/speex.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SPEEX) += speex
#
# Paths and names
#
-SPEEX_VERSION := 1.2rc1
-SPEEX_MD5 := c4438b22c08e5811ff10e2b06ee9b9ae
+SPEEX_VERSION := 1.2.0
+SPEEX_MD5 := 8ab7bb2589110dfaf0ed7fa7757dc49c
SPEEX := speex-$(SPEEX_VERSION)
SPEEX_SUFFIX := tar.gz
SPEEX_URL := http://downloads.xiph.org/releases/speex/$(SPEEX).$(SPEEX_SUFFIX)
@@ -40,36 +40,19 @@ SPEEX_FFT-$(PTXCONF_SPEEX_FFT_PROPRIETARY_INTL_MKL) += proprietary-intel-mkl
SPEEX_CONF_TOOL := autoconf
SPEEX_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --disable-oggtest \
--disable-valgrind \
+ --$(call ptx/endis, PTXCONF_ARCH_X86)-sse \
--$(call ptx/endis, PTXCONF_SPEEX_FIXED_POINT)-fixed-point \
- --disable-fixed-point-debug \
--$(call ptx/endis, PTXCONF_SPEEX_FLOAT_API)-float-api \
+ --$(call ptx/endis, PTXCONF_SPEEX_BINARIES)-binaries \
--$(call ptx/endis, PTXCONF_SPEEX_VBR)-vbr \
+ --$(call ptx/endis, PTXCONF_ARCH_ARM_V4)-arm4-asm \
+ --$(call ptx/endis, PTXCONF_ARCH_ARM_V5E)-arm5e-asm \
+ --$(call ptx/endis, PTXCONF_ARCH_BLACKFIN)-blackfin-asm \
+ --disable-fixed-point-debug \
--disable-ti-c55x \
- --with-fft=$(SPEEX_FFT-y) \
- --with-ogg=$(PTXDIST_SYSROOT_TARGET)/usr
-
-ifdef PTXCONF_ARCH_ARM_V4
-SPEEX_CONF_OPT += --enable-arm4-asm
-else
-SPEEX_CONF_OPT += --disable-arm4-asm
-endif
-ifdef PTXCONF_ARCH_ARM_V5E
-SPEEX_CONF_OPT += --enable-arm5e-asm
-else
-SPEEX_CONF_OPT += --disable-arm5e-asm
-endif
-ifdef PTXCONF_ARCH_X86
-SPEEX_CONF_OPT += --enable-sse
-else
-SPEEX_CONF_OPT += --disable-sse
-endif
-ifdef PTXCONF_ARCH_BLACKFIN
-SPEEX_CONF_OPT += --enable-blackfin-asm
-else
-SPEEX_CONF_OPT += --disable-blackfin-asm
-endif
+ --enable-vorbis-psy \
+ --with-fft=$(SPEEX_FFT-y)
# ----------------------------------------------------------------------------
# Target-Install
@@ -91,7 +74,6 @@ ifdef PTXCONF_SPEEX_INSTALL_SPEEXDEC
@$(call install_copy, speex, 0, 0, 0755, -, /usr/bin/speexdec)
endif
- @$(call install_lib, speex, 0, 0, 0644, libspeexdsp)
@$(call install_lib, speex, 0, 0, 0644, libspeex)
@$(call install_finish, speex)
diff --git a/rules/speexdsp.in b/rules/speexdsp.in
new file mode 100644
index 000000000000..eb756d9bcb85
--- /dev/null
+++ b/rules/speexdsp.in
@@ -0,0 +1,35 @@
+## SECTION=multimedia_libs
+
+config SPEEXDSP
+ tristate
+ select LIBC_M
+ select GCCLIBS_GCC_S
+ prompt "speexdsp"
+ help
+ SpeexDSP is the signal processing library
+ developed by the Speex codec.
+
+if SPEEXDSP
+
+config SPEEXDSP_FIXED_POINT
+ bool
+ prompt "use fixed point"
+
+config SPEEXDSP_FLOAT_API
+ bool
+ prompt "enable float api"
+
+choice
+ prompt "Kind of FFT to use"
+ default SPEEXDSP_FFT_KISS
+
+ config SPEEXDSP_FFT_KISS
+ bool
+ prompt "kiss"
+
+ config SPEEXDSP_FFT_SMALLFT
+ bool
+ prompt "smallft"
+endchoice
+
+endif
diff --git a/rules/speexdsp.make b/rules/speexdsp.make
new file mode 100644
index 000000000000..aeca8395b552
--- /dev/null
+++ b/rules/speexdsp.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Lucas Stach <l.stach@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SPEEXDSP) += speexdsp
+
+#
+# Paths and names
+#
+SPEEXDSP_VERSION := 1.2rc3
+SPEEXDSP_MD5 := 70d9d31184f7eb761192fd1ef0b73333
+SPEEXDSP := speexdsp-$(SPEEXDSP_VERSION)
+SPEEXDSP_SUFFIX := tar.gz
+SPEEXDSP_URL := http://downloads.xiph.org/releases/speex//$(SPEEXDSP).$(SPEEXDSP_SUFFIX)
+SPEEXDSP_SOURCE := $(SRCDIR)/$(SPEEXDSP).$(SPEEXDSP_SUFFIX)
+SPEEXDSP_DIR := $(BUILDDIR)/$(SPEEXDSP)
+SPEEXDSP_LICENSE := BSD-3-Clause
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+SPEEXDSP_FFT-$(PTXCONF_SPEEXDSP_FFT_KISS) += kiss
+SPEEXDSP_FFT-$(PTXCONF_SPEEXDSP_FFT_SMALLFT) += smallft
+
+#
+# autoconf
+#
+SPEEXDSP_CONF_TOOL := autoconf
+SPEEXDSP_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-valgrind \
+ --$(call ptx/endis, PTXCONF_ARCH_X86)-sse \
+ --$(call ptx/endis, PTXCONF_ARCH_ARM_NEON)-neon \
+ --$(call ptx/endis, PTXCONF_SPEEXDSP_FIXED_POINT)-fixed-point \
+ --$(call ptx/endis, PTXCONF_SPEEXDSP_FLOAT_API)-float-api \
+ --disable-examples \
+ --$(call ptx/endis, PTXCONF_ARCH_ARM_V4)-arm4-asm \
+ --$(call ptx/endis, PTXCONF_ARCH_ARM_V5E)-arm5e-asm \
+ --$(call ptx/endis, PTXCONF_ARCH_BLACKFIN)-blackfin-asm \
+ --disable-fixed-point-debug \
+ --enable-resample-full-sinc-table \
+ --disable-ti-c55x \
+ --with-fft=$(SPEEXDSP_FFT-y)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/speexdsp.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, speexdsp)
+ @$(call install_fixup, speexdsp,PRIORITY,optional)
+ @$(call install_fixup, speexdsp,SECTION,base)
+ @$(call install_fixup, speexdsp,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
+ @$(call install_fixup, speexdsp,DESCRIPTION,missing)
+
+ @$(call install_lib, speexdsp, 0, 0, 0644, libspeexdsp)
+
+ @$(call install_finish, speexdsp)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.19.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2018-11-05 15:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 15:01 Lucas Stach [this message]
2018-11-05 15:01 ` [ptxdist] [PATCH 2/3] sbc: new package Lucas Stach
2018-11-05 15:01 ` [ptxdist] [PATCH 3/3] pulseaudio: version bump 8.0 -> 12.2 Lucas Stach
2018-11-22 6:24 ` Michael Olbrich
2018-11-22 10:06 ` Roland Hieber
2018-11-22 10:12 ` Michael Olbrich
2018-11-22 10:27 ` Lucas Stach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181105150117.13436-1-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox