package/sbc: bump to version 2.0
Drop patch (already in version) https://git.kernel.org/pub/scm/bluetooth/sbc.git/tree/ChangeLog?h=2.0 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
affabe47a2
commit
05f559bacc
@ -1,49 +0,0 @@
|
||||
From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001
|
||||
From: Marius Bakke <marius@gnu.org>
|
||||
Date: Tue, 22 Dec 2020 11:04:26 +0000
|
||||
Subject: [PATCH] sbc_primitives: Fix build on non-x86.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Don't call __builtin_cpu_init unless targeting i386 or x86_64.
|
||||
Otherwise we get an error at link time:
|
||||
|
||||
CC sbc/sbc_primitives.lo
|
||||
sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’:
|
||||
sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration]
|
||||
[...]
|
||||
CCLD src/sbcdec
|
||||
ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives':
|
||||
sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init'
|
||||
|
||||
Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
|
||||
[Upstream status: backport from upstream commit 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf]
|
||||
|
||||
---
|
||||
sbc/sbc_primitives.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
|
||||
index 97a75be..09c214a 100644
|
||||
--- a/sbc/sbc_primitives.c
|
||||
+++ b/sbc/sbc_primitives.c
|
||||
@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j(
|
||||
|
||||
static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
|
||||
{
|
||||
+#if defined(__x86_64__) || defined(__i386__)
|
||||
__builtin_cpu_init();
|
||||
|
||||
#ifdef SBC_BUILD_WITH_MMX_SUPPORT
|
||||
@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
|
||||
if (__builtin_cpu_supports("sse4.2"))
|
||||
sbc_init_primitives_sse(state);
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
/*
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
|
||||
sha256 0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2 sbc-1.5.tar.xz
|
||||
sha256 8f12368e1dbbf55e14536520473cfb338c84b392939cc9b64298360fd4a07992 sbc-2.0.tar.xz
|
||||
|
||||
# sha256 locally computed
|
||||
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SBC_VERSION = 1.5
|
||||
SBC_VERSION = 2.0
|
||||
SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz
|
||||
SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
|
||||
SBC_INSTALL_STAGING = YES
|
||||
|
Loading…
Reference in New Issue
Block a user