From b9b607bf09dc8c1f78382d5e1a3e512009916168 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 21 Jun 2022 12:48:11 +0000
Subject: [PATCH] sbc: update to 2.0

update:
- to https and xz URI
- from 1.5 (2020-12-07) to 2.0 (2022-06-20)
- incorporates upstream patch
  - sbc_primitives: Fix build on non-x86 patch

log:
- https://git.kernel.org/pub/scm/bluetooth/sbc.git/
---
 packages/audio/sbc/package.mk                 |  6 +--
 .../sbc_primitives-Fix-build-on-non-x86.patch | 39 -------------------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 packages/audio/sbc/patches/sbc_primitives-Fix-build-on-non-x86.patch

diff --git a/packages/audio/sbc/package.mk b/packages/audio/sbc/package.mk
index e7e2db72a1..f22fdecea5 100644
--- a/packages/audio/sbc/package.mk
+++ b/packages/audio/sbc/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sbc"
-PKG_VERSION="1.5"
-PKG_SHA256="51d4e385237e9d4780c7b20e660e30fb6a7a6d75ca069f1ed630fa6105232aba"
+PKG_VERSION="2.0"
+PKG_SHA256="8f12368e1dbbf55e14536520473cfb338c84b392939cc9b64298360fd4a07992"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
-PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-${PKG_VERSION}.tar.gz"
+PKG_URL="https://www.kernel.org/pub/linux/bluetooth/sbc-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="standalone SBC library"
 PKG_BUILD_FLAGS="+pic"
diff --git a/packages/audio/sbc/patches/sbc_primitives-Fix-build-on-non-x86.patch b/packages/audio/sbc/patches/sbc_primitives-Fix-build-on-non-x86.patch
deleted file mode 100644
index b060a59ad4..0000000000
--- a/packages/audio/sbc/patches/sbc_primitives-Fix-build-on-non-x86.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Marius Bakke <marius@xxxxxxx>
-
-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
- }
- 
- /*
--- 
-2.29.2
-