Accepting request 1271857 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1271857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbc?expand=0&rev=11

fix-build-on-non-x86.patch

@@ -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-korg
-

sbc-2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:426633cabd7c798236443516dfa8335b47e004b0ef37ff107e0c7ead3299fcc2
+size 272116

sbc.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Apr 17 10:29:41 UTC 2025 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 2.1
+  * Fix issue when compiling without SBC_BUILD_WITH_SSE_SUPPORT.
+- Update to version 2.0
+  * Fix issue with SSE primitives on non-x86.
+- Drop patch:
+  * fix-build-on-non-x86.patch (not longer needed)
+- Use ldconfig_scriptlets macro
+- Use correct Group tags
+- Specfile cleanup
+
 -------------------------------------------------------------------
 Thu May 16 14:44:18 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

sbc.spec

@@ -1,8 +1,9 @@
 #
 # spec file for package sbc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2012 B1 Systems GmbH, Vohburg, Germany.
+# Copyright (c) 2025, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +19,8 @@
 
 
 %define sonum 1
-
 Name:           sbc
-Version:        1.5
+Version:        2.1
 Release:        0
 Summary:        Bluetooth Low-Complexity, Sub-Band Codec Utilities
 License:        GPL-2.0-or-later
@@ -28,10 +28,8 @@ Group:          Hardware/Mobile
 URL:            https://www.kernel.org/pub/linux/bluetooth
 Source:         https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-Patch1:         https://git.kernel.org/pub/scm/bluetooth/sbc.git/patch/?id=909a9bdf7ab143e1f0baaf9736baebd3cd79aacf#/fix-build-on-non-x86.patch
-BuildRequires:  libsndfile-devel
-BuildRequires:  pkg-config
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(sndfile)
 
 %description
 The package contains utilities for using the SBC codec.
@@ -39,7 +37,7 @@ The package contains utilities for using the SBC codec.
 %package -n libsbc%{sonum}
 Summary:        Bluetooth Low-Complexity, Sub-Band Codec Library
 License:        LGPL-2.1-or-later
-Group:          Hardware/Mobile
+Group:          System/Libraries
 
 %description -n libsbc%{sonum}
 The package contains libraries for using the SBC codec.
@@ -47,48 +45,40 @@ The package contains libraries for using the SBC codec.
 %package devel
 Summary:        Development files for libsbc%{sonum}
 License:        GPL-2.0-or-later
-Group:          Development/Sources
+Group:          Development/Languages/C and C++
 Requires:       libsbc%{sonum} = %{version}
 
 %description devel
-Development files for the SBC library
+Development files for the SBC library.
 
 %prep
 %autosetup -p1
 
 %build
-%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 %configure
-make %{?_smp_mflags} V=1
+%make_build
 
 %install
 %make_install
-rm %{buildroot}/%{_libdir}/libsbc.la
+rm -v %{buildroot}/%{_libdir}/libsbc.la
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
-%post -n libsbc%{sonum} -p /sbin/ldconfig
-
-%postun -n libsbc%{sonum} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libsbc%{sonum}
 
 %files
-%defattr(-,root,root)
 %license COPYING
 %doc ChangeLog README
-/usr/bin/sbc*
+%{_bindir}/sbcdec
+%{_bindir}/sbcenc
+%{_bindir}/sbcinfo
 
 %files -n libsbc%{sonum}
-%defattr(-,root,root)
-%{_libdir}/libsbc.so.%{sonum}
-%{_libdir}/libsbc.so.%{sonum}.*
+%license COPYING.LIB
+%{_libdir}/libsbc.so.%{sonum}*
 
 %files devel
-%defattr(-,root,root)
-%dir /usr/include/sbc
-/usr/include/sbc/sbc.h
-%{_libdir}/pkgconfig/sbc.pc
-%{_libdir}/libsbc.a
+%dir %{_includedir}/sbc
+%{_includedir}/sbc/sbc.h
 %{_libdir}/libsbc.so
+%{_libdir}/pkgconfig/sbc.pc
 
 %changelog