mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
247b23b2de
commit
b1902afa4c
-63
@@ -1,63 +0,0 @@
|
|||||||
From c73370ceafd138becee8ca3c688ba75756830bfe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
|
|
||||||
Date: Sun, 5 Jul 2015 17:48:16 +0300
|
|
||||||
Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined
|
|
||||||
|
|
||||||
Not everyone who includes speexdsp_config_types.h will have a test
|
|
||||||
which defines those, and if we've chosen to use the stdint types at
|
|
||||||
configure time then we know exactly which header(s) are available, so
|
|
||||||
just choose the best one then and generate the header to use it.
|
|
||||||
|
|
||||||
This patch, including the above text, is copied from a commit in the
|
|
||||||
speex repository[1]. The original commit for speex was made by Ron
|
|
||||||
<ron@debian.org>.
|
|
||||||
|
|
||||||
[1] https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
|
|
||||||
---
|
|
||||||
configure.ac | 6 ++++++
|
|
||||||
include/speex/speexdsp_config_types.h.in | 8 +-------
|
|
||||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 2cd2d1e..1de0c23 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -334,6 +334,12 @@ AC_SUBST([USIZE16])
|
|
||||||
AC_SUBST([SIZE32])
|
|
||||||
AC_SUBST([USIZE32])
|
|
||||||
|
|
||||||
+AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include <stdint.h>"],
|
|
||||||
+ [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include <inttypes.h>"],
|
|
||||||
+ [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"])
|
|
||||||
+
|
|
||||||
+AC_SUBST([INCLUDE_STDINT])
|
|
||||||
+
|
|
||||||
AC_CONFIG_FILES([
|
|
||||||
Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
|
|
||||||
include/Makefile include/speex/Makefile speexdsp.pc
|
|
||||||
diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in
|
|
||||||
index 02b82fd..5ea7b55 100644
|
|
||||||
--- a/include/speex/speexdsp_config_types.h.in
|
|
||||||
+++ b/include/speex/speexdsp_config_types.h.in
|
|
||||||
@@ -1,13 +1,7 @@
|
|
||||||
#ifndef __SPEEX_TYPES_H__
|
|
||||||
#define __SPEEX_TYPES_H__
|
|
||||||
|
|
||||||
-#if defined HAVE_STDINT_H
|
|
||||||
-# include <stdint.h>
|
|
||||||
-#elif defined HAVE_INTTYPES_H
|
|
||||||
-# include <inttypes.h>
|
|
||||||
-#elif defined HAVE_SYS_TYPES_H
|
|
||||||
-# include <sys/types.h>
|
|
||||||
-#endif
|
|
||||||
+@INCLUDE_STDINT@
|
|
||||||
|
|
||||||
typedef @SIZE16@ spx_int16_t;
|
|
||||||
typedef @USIZE16@ spx_uint16_t;
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
||||||
+3
-17
@@ -5,11 +5,10 @@ SECTION = "libs"
|
|||||||
LICENSE = "BSD-3-Clause"
|
LICENSE = "BSD-3-Clause"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8"
|
||||||
|
|
||||||
SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz \
|
SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz"
|
||||||
file://0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "70d9d31184f7eb761192fd1ef0b73333"
|
SRC_URI[md5sum] = "b722df341576dc185d897131321008fc"
|
||||||
SRC_URI[sha256sum] = "4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1"
|
SRC_URI[sha256sum] = "682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
@@ -18,19 +17,6 @@ EXTRA_OECONF = "\
|
|||||||
${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api', '', d)} \
|
${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api', '', d)} \
|
||||||
"
|
"
|
||||||
|
|
||||||
# Workaround for a build failure when building with MACHINE=qemuarm64. I think
|
|
||||||
# aarch64 is supposed to support NEON just fine, but building for qemuarm64
|
|
||||||
# fails in NEON code:
|
|
||||||
#
|
|
||||||
# .../speexdsp-1.2rc3/libspeexdsp/resample_neon.h:148:5: error: impossible constraint in 'asm'
|
|
||||||
# asm volatile (" cmp %[len], #0\n"
|
|
||||||
# ^
|
|
||||||
#
|
|
||||||
# I sent an email about the issue to speex-dev. At the time of writing there
|
|
||||||
# are no responses yet:
|
|
||||||
# http://thread.gmane.org/gmane.comp.audio.compression.speex.devel/7360
|
|
||||||
EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--disable-neon', '', d)}"
|
|
||||||
|
|
||||||
# speexdsp was split off from speex in 1.2rc2. Older versions of speex can't
|
# speexdsp was split off from speex in 1.2rc2. Older versions of speex can't
|
||||||
# be installed together with speexdsp, since they contain overlapping files.
|
# be installed together with speexdsp, since they contain overlapping files.
|
||||||
RCONFLICTS_${PN} = "speex (< 1.2rc2)"
|
RCONFLICTS_${PN} = "speex (< 1.2rc2)"
|
||||||
Reference in New Issue
Block a user