- updated to 2.0

- removed obsolete non-x86 patch

diff --git a/non-x86.patch b/non-x86.patch
deleted file mode 100644 (file)
index 21f74f0..0000000
--- a/non-x86.patch
+++ /dev/null
@@ -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
-

diff --git a/sbc.spec b/sbc.spec
index fbd9ee8fe749d3d7ac2429f0b0b53e660256c06f..6197a56e11219bff12acff7f3ec9879daf40d23e 100644 (file)
--- a/sbc.spec
+++ b/sbc.spec
@@ -1,13 +1,16 @@
+#
+# Conditional build:
+%bcond_without static_libs     # static library
+
 Summary:       SBC codec library
 Summary(pl.UTF-8):     Biblioteka kodeka SBC
 Name:          sbc
-Version:       1.5
+Version:       2.0
 Release:       1
 License:       LGPL v2.1+ (library), GPL v2+ (tools)
 Group:         Libraries
 Source0:       https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
-# Source0-md5: 6ff244dde9e5e12b26362a47ed91d3f9
-Patch0:                non-x86.patch
+# Source0-md5: 5613357181daeffd71e971c6f8470f8d
 URL:           http://www.bluez.org/
 BuildRequires: libsndfile-devel
 BuildRequires: pkgconfig
@@ -49,11 +52,12 @@ Statyczna biblioteka SBC.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
-       --disable-silent-rules
+       --disable-silent-rules \
+       %{?with_static_libs:--enable-static}
+
 %{__make}
 
 %install
@@ -86,6 +90,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/sbc
 %{_pkgconfigdir}/sbc.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsbc.a
+%endif