update to 2.0
This commit is contained in:
parent
242d28b0b9
commit
dc68ab2923
@ -1,45 +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: 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'
|
|
||||||
---
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
--
|
|
||||||
cgit 1.2.3-1.el7
|
|
||||||
|
|
||||||
BIN
sbc-1.5.tar.xz
BIN
sbc-1.5.tar.xz
Binary file not shown.
BIN
sbc-2.0.tar.xz
Normal file
BIN
sbc-2.0.tar.xz
Normal file
Binary file not shown.
7
sbc.spec
7
sbc.spec
@ -1,12 +1,11 @@
|
|||||||
Name: sbc
|
Name: sbc
|
||||||
Version: 1.5
|
Version: 2.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Bluetooth Low-Complexity, Sub-Band Codec Utilities
|
Summary: Bluetooth Low-Complexity, Sub-Band Codec Utilities
|
||||||
License: GPLv2 and LGPLv2+
|
License: GPLv2 and LGPLv2+
|
||||||
URL: https://www.bluez.org
|
URL: https://www.bluez.org
|
||||||
Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
|
Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Patch1: backport-fix-build-on-non-x86.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc libsndfile-devel
|
BuildRequires: gcc libsndfile-devel
|
||||||
|
|
||||||
@ -45,7 +44,6 @@ Header files for SBC
|
|||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_includedir}/sbc/
|
%{_includedir}/sbc/
|
||||||
%{_libdir}/*.a
|
|
||||||
%{_libdir}/libsbc.so
|
%{_libdir}/libsbc.so
|
||||||
%{_libdir}/pkgconfig/sbc.pc
|
%{_libdir}/pkgconfig/sbc.pc
|
||||||
|
|
||||||
@ -54,6 +52,9 @@ Header files for SBC
|
|||||||
%doc ChangeLog
|
%doc ChangeLog
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jul 31 2022 tianlijing <tianlijing@kylinos.cn> - 2.0-1
|
||||||
|
- upgrade to 2.0
|
||||||
|
|
||||||
* Thu Jan 28 2021 jinzhimin<jinzhimin2@huawei.com> - 1.5-1
|
* Thu Jan 28 2021 jinzhimin<jinzhimin2@huawei.com> - 1.5-1
|
||||||
- Upgrade to 1.5
|
- Upgrade to 1.5
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user