diff options
author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2015-07-09 13:43:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:09:15 +0100 |
commit | d8c34285e15c636ef08cfe42d15890984b12280e (patch) | |
tree | c755770bdf83051449277930bd7d721b64f761cc /meta/recipes-multimedia/speex/speexdsp | |
parent | ba07a69f3dc8fb798e372130bf665d059fed9d42 (diff) | |
download | poky-d8c34285e15c636ef08cfe42d15890984b12280e.tar.gz |
speexdsp: initial recipe
speexdsp was split off from speex in 1.2rc2, so we need a separate
recipe for speexdsp when before we can upgrade speex.
The speex recipe has so far used the --enable-fixed-point configure
option unconditionally, but I believe that was a mistake, so I
dropped that. The option is still enabled if TARGET_FPU is set to
"soft". Commit e8f707f16a38d85535593a32efff6dcbf4ddb203 added the
TARGET_FPU check, and I think that commit should have removed
--enable-fixed-point from the static configure options, like it
removed --disable-float-api.
The NEON code caused a build failure on qemuarm64. As a workaround,
I disabled NEON optimizations when building for aarch64.
I added a patch that fixes a build failure in alsa-plugins. Compiling
alsa-plugins against the new speexdsp version without the patch
resulted in this error:
In file included from .../usr/include/speex/speexdsp_types.h:122:0,
from .../usr/include/speex/speex_preprocess.h:46,
from .../alsa-plugins-1.0.29/speex/pcm_speex.c:23:
.../usr/include/speex/speexdsp_config_types.h:13:9: error: unknown type name 'uint16_t'
typedef uint16_t spx_uint16_t;
^
(From OE-Core rev: bb826645d188e5ea78718f3ad4b2e420eec3b354)
(From OE-Core rev: 28b7bccd226c4d9040ef0d8199a29e74f2da72b1)
Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/speex/speexdsp')
-rw-r--r-- | meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch b/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch new file mode 100644 index 0000000000..c7067daaa0 --- /dev/null +++ b/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From c73370ceafd138becee8ca3c688ba75756830bfe Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | ||
3 | Date: Sun, 5 Jul 2015 17:48:16 +0300 | ||
4 | Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined | ||
5 | |||
6 | Not everyone who includes speexdsp_config_types.h will have a test | ||
7 | which defines those, and if we've chosen to use the stdint types at | ||
8 | configure time then we know exactly which header(s) are available, so | ||
9 | just choose the best one then and generate the header to use it. | ||
10 | |||
11 | This patch, including the above text, is copied from a commit in the | ||
12 | speex repository[1]. The original commit for speex was made by Ron | ||
13 | <ron@debian.org>. | ||
14 | |||
15 | [1] https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87 | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | ||
20 | --- | ||
21 | configure.ac | 6 ++++++ | ||
22 | include/speex/speexdsp_config_types.h.in | 8 +------- | ||
23 | 2 files changed, 7 insertions(+), 7 deletions(-) | ||
24 | |||
25 | diff --git a/configure.ac b/configure.ac | ||
26 | index 2cd2d1e..1de0c23 100644 | ||
27 | --- a/configure.ac | ||
28 | +++ b/configure.ac | ||
29 | @@ -334,6 +334,12 @@ AC_SUBST([USIZE16]) | ||
30 | AC_SUBST([SIZE32]) | ||
31 | AC_SUBST([USIZE32]) | ||
32 | |||
33 | +AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include <stdint.h>"], | ||
34 | + [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include <inttypes.h>"], | ||
35 | + [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"]) | ||
36 | + | ||
37 | +AC_SUBST([INCLUDE_STDINT]) | ||
38 | + | ||
39 | AC_CONFIG_FILES([ | ||
40 | Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec | ||
41 | include/Makefile include/speex/Makefile speexdsp.pc | ||
42 | diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in | ||
43 | index 02b82fd..5ea7b55 100644 | ||
44 | --- a/include/speex/speexdsp_config_types.h.in | ||
45 | +++ b/include/speex/speexdsp_config_types.h.in | ||
46 | @@ -1,13 +1,7 @@ | ||
47 | #ifndef __SPEEX_TYPES_H__ | ||
48 | #define __SPEEX_TYPES_H__ | ||
49 | |||
50 | -#if defined HAVE_STDINT_H | ||
51 | -# include <stdint.h> | ||
52 | -#elif defined HAVE_INTTYPES_H | ||
53 | -# include <inttypes.h> | ||
54 | -#elif defined HAVE_SYS_TYPES_H | ||
55 | -# include <sys/types.h> | ||
56 | -#endif | ||
57 | +@INCLUDE_STDINT@ | ||
58 | |||
59 | typedef @SIZE16@ spx_int16_t; | ||
60 | typedef @USIZE16@ spx_uint16_t; | ||
61 | -- | ||
62 | 1.9.3 | ||
63 | |||