From 664d505be63c45245aebefd96c08f2e9428d1852 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 17 Apr 2021 19:29:51 +0300 Subject: [PATCH] sbc: update to 1.5. --- .../sbc/patches/fix-build-on-non-x86.patch | 43 +++++++++++++++++++ srcpkgs/sbc/template | 5 ++- 2 files changed, 46 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 000000000000..87b545078118 --- /dev/null +++ b/srcpkgs/sbc/patches/fix-build-on-non-x86.patch @@ -0,0 +1,43 @@ +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 9a94af746ef9..7645ce469d68 100644 --- a/srcpkgs/sbc/template +++ b/srcpkgs/sbc/template @@ -1,6 +1,6 @@ # Template file for 'sbc' pkgname=sbc -version=1.4 +version=1.5 revision=1 build_style=gnu-configure configure_args="--enable-pie --disable-static" @@ -11,7 +11,8 @@ 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=518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9 +checksum=0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2 +patch_args="-Np1" sbc-devel_package() { depends="sbc>=${version}_${revision}"