guix_mirror_bot pushed a commit to branch audio-team
in repository guix.
commit 9ad134fd6498642a043686454390ad2d528da889
Author: SilverlightningY <[email protected]>
AuthorDate: Sun Apr 26 20:06:09 2026 +0200
gnu: sbc: Update to 2.2.
* gnu/packages/linux.scm (sbc): Update to 2.2. Reformat.
[source] Remove patch.
* gnu/local.mk: Remove patch.
* gnu/packages/patches/sbc-fix-build-non-x86.patch: Delete file.
Change-Id: Icb9b65173aa73b50733b2b87a55423e6cd2d4ac3
Signed-off-by: Gabriel Wicki <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/linux.scm | 23 ++++++++++-------------
gnu/packages/patches/sbc-fix-build-non-x86.patch | 17 -----------------
3 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 3cf3da283c..e3cacb89b7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2434,7 +2434,6 @@ dist_patch_DATA =
\
%D%/packages/patches/sajson-for-gemmi-numbers-as-strings.patch \
%D%/packages/patches/sajson-build-with-gcc10.patch \
%D%/packages/patches/sane-look-for-plugins-in-SANE_BACKEND_LIB_PATH.patch
\
- %D%/packages/patches/sbc-fix-build-non-x86.patch \
%D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \
%D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \
%D%/packages/patches/sbcl-ciel-repl.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0984a8b576..d64e94d7cc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7312,20 +7312,17 @@ event traces from the kernel (via the relaying through
the debug file system).")
(define-public sbc
(package
(name "sbc")
- (version "1.5")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/linux/bluetooth/sbc-"
- version ".tar.xz"))
- (patches (search-patches "sbc-fix-build-non-x86.patch"))
- (sha256
- (base32
- "1liig5856crb331dps18mp0s13zbkv7yh007zqhq97m94fcddfhc"))))
+ (version "2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kernel.org/linux/bluetooth/sbc-" version
+ ".tar.xz"))
+ (sha256
+ (base32 "17mfhc9rn25vrqgfpihpjjc8syp3r56paqyhzg1gjnjyydpagbd1"))))
(build-system gnu-build-system)
- (inputs
- (list libsndfile))
- (native-inputs
- (list pkg-config))
+ (inputs (list libsndfile))
+ (native-inputs (list pkg-config))
(home-page "https://www.kernel.org/pub/linux/bluetooth/";)
(synopsis "Bluetooth subband audio codec")
(description
diff --git a/gnu/packages/patches/sbc-fix-build-non-x86.patch
b/gnu/packages/patches/sbc-fix-build-non-x86.patch
deleted file mode 100644
index 56ea916d42..0000000000
--- a/gnu/packages/patches/sbc-fix-build-non-x86.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't refer to x86-specific function on other architectures to avoid linker
error.
-
-Submitted upstream at
<https://marc.info/?l=linux-bluetooth&m=160857625608440&w=2>
-
-diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
---- a/sbc/sbc_primitives.c
-+++ b/sbc/sbc_primitives.c
-@@ -593,7 +593,9 @@ 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();
-+#endif
-
- #ifdef SBC_BUILD_WITH_MMX_SUPPORT
- if (__builtin_cpu_supports("mmx"))
