summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2020-01-07 09:20:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commitb1902afa4cc608b023ff7a8053c4987f0f7c6a6b (patch)
tree4ea2fea7455891025cfc1e551dded1e64fc0a60b /meta/recipes-multimedia
parent247b23b2de543beb8192bfb94cd3afd4a9dc19fc (diff)
downloadpoky-b1902afa4cc608b023ff7a8053c4987f0f7c6a6b.tar.gz
speexdsp: 1.2rc3 -> 1.2.0
Removed backported patch 0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch Enabling NEON on aarch64 doesn't break the build any more. (From OE-Core rev: f715c3cd1342a19a9cb780d02dfa425721b456be) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch63
-rw-r--r--meta/recipes-multimedia/speex/speexdsp_1.2.0.bb (renamed from meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb)20
2 files changed, 3 insertions, 80 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
deleted file mode 100644
index c7067daaa0..0000000000
--- a/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From c73370ceafd138becee8ca3c688ba75756830bfe Mon Sep 17 00:00:00 2001
2From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
3Date: Sun, 5 Jul 2015 17:48:16 +0300
4Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined
5
6Not everyone who includes speexdsp_config_types.h will have a test
7which defines those, and if we've chosen to use the stdint types at
8configure time then we know exactly which header(s) are available, so
9just choose the best one then and generate the header to use it.
10
11This patch, including the above text, is copied from a commit in the
12speex 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
17Upstream-Status: Backport
18
19Signed-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
25diff --git a/configure.ac b/configure.ac
26index 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
42diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in
43index 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--
621.9.3
63
diff --git a/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb b/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb
index 03c949be22..2f934ebe3a 100644
--- a/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
+++ b/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb
@@ -5,11 +5,10 @@ SECTION = "libs"
5LICENSE = "BSD-3-Clause" 5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8" 6LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8"
7 7
8SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz \ 8SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz"
9 file://0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch"
10 9
11SRC_URI[md5sum] = "70d9d31184f7eb761192fd1ef0b73333" 10SRC_URI[md5sum] = "b722df341576dc185d897131321008fc"
12SRC_URI[sha256sum] = "4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1" 11SRC_URI[sha256sum] = "682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771"
13 12
14inherit autotools pkgconfig 13inherit autotools pkgconfig
15 14
@@ -18,19 +17,6 @@ EXTRA_OECONF = "\
18 ${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api', '', d)} \ 17 ${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api', '', d)} \
19" 18"
20 19
21# Workaround for a build failure when building with MACHINE=qemuarm64. I think
22# aarch64 is supposed to support NEON just fine, but building for qemuarm64
23# fails in NEON code:
24#
25# .../speexdsp-1.2rc3/libspeexdsp/resample_neon.h:148:5: error: impossible constraint in 'asm'
26# asm volatile (" cmp %[len], #0\n"
27# ^
28#
29# I sent an email about the issue to speex-dev. At the time of writing there
30# are no responses yet:
31# http://thread.gmane.org/gmane.comp.audio.compression.speex.devel/7360
32EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--disable-neon', '', d)}"
33
34# speexdsp was split off from speex in 1.2rc2. Older versions of speex can't 20# speexdsp was split off from speex in 1.2rc2. Older versions of speex can't
35# be installed together with speexdsp, since they contain overlapping files. 21# be installed together with speexdsp, since they contain overlapping files.
36RCONFLICTS_${PN} = "speex (< 1.2rc2)" 22RCONFLICTS_${PN} = "speex (< 1.2rc2)"