From 915692d44055a80bf6ee6f7ccc62f9ce865e2c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Sun, 24 Jul 2022 10:48:38 +0100 Subject: [PATCH] sbc: update to 2.0. --- .../sbc/patches/fix-build-on-non-x86.patch | 43 ------------------- srcpkgs/sbc/template | 4 +- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/sbc/patches/fix-build-on-non-x86.patch diff --git a/srcpkgs/sbc/patches/fix-build-on-non-x86.patch b/srcpkgs/sbc/patches/fix-build-on-non-x86.patch deleted file mode 100644 index 87b545078118..000000000000 --- a/srcpkgs/sbc/patches/fix-build-on-non-x86.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001 -From: Marius Bakke -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 - } - - /* --- diff --git a/srcpkgs/sbc/template b/srcpkgs/sbc/template index 6fdca20e3e9c..6d3408eee62c 100644 --- a/srcpkgs/sbc/template +++ b/srcpkgs/sbc/template @@ -1,6 +1,6 @@ # Template file for 'sbc' pkgname=sbc -version=1.5 +version=2.0 revision=1 build_style=gnu-configure configure_args="--enable-pie --disable-static" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.bluez.org/" distfiles="${KERNEL_SITE}/bluetooth/${pkgname}-${version}.tar.xz" -checksum=0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2 +checksum=8f12368e1dbbf55e14536520473cfb338c84b392939cc9b64298360fd4a07992 sbc-devel_package() { depends="sbc>=${version}_${revision}"