commit: 842646ff88d3aad89dac6bc80a5aeb4a0cf9b64c Author: Peter Alfredsen <crabbedhaloablution <AT> icloud <DOT> com> AuthorDate: Fri Dec 11 18:51:40 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 21 22:28:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842646ff
media-libs/sbc: Fix 1.5 build on non-x86 platforms. Closes: https://bugs.gentoo.org/759277 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Peter Alfredsen <crabbedhaloablution <AT> icloud.com> Closes: https://github.com/gentoo/gentoo/pull/18610 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/sbc/files/sbc-1.5-ifdef-builtin.patch | 30 ++++++++++++++++++++++++ media-libs/sbc/sbc-1.5.ebuild | 2 ++ 2 files changed, 32 insertions(+) diff --git a/media-libs/sbc/files/sbc-1.5-ifdef-builtin.patch b/media-libs/sbc/files/sbc-1.5-ifdef-builtin.patch new file mode 100644 index 00000000000..cfa89958db1 --- /dev/null +++ b/media-libs/sbc/files/sbc-1.5-ifdef-builtin.patch @@ -0,0 +1,30 @@ +diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c +index 97a75be..ac79ca5 100644 +--- a/sbc/sbc_primitives.c ++++ b/sbc/sbc_primitives.c +@@ -591,6 +591,7 @@ static int sbc_calc_scalefactors_j( + return joint; + } + ++#if defined(__i386__) || defined(__x86_64__) + static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + { + __builtin_cpu_init(); +@@ -605,6 +606,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + sbc_init_primitives_sse(state); + #endif + } ++#endif + + /* + * Detect CPU features and setup function pointers +@@ -630,7 +632,9 @@ void sbc_init_primitives(struct sbc_encoder_state *state) + state->implementation_info = "Generic C"; + + /* X86/AMD64 optimizations */ ++#if defined(__i386__) || defined(__x86_64__) + sbc_init_primitives_x86(state); ++#endif + + /* ARM optimizations */ + #ifdef SBC_BUILD_WITH_ARMV6_SUPPORT diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild index 65d68e49819..91d43e28d95 100644 --- a/media-libs/sbc/sbc-1.5.ebuild +++ b/media-libs/sbc/sbc-1.5.ebuild @@ -20,6 +20,8 @@ RESTRICT="test" RDEPEND="" DEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-ifdef-builtin.patch" ) + multilib_src_configure() { ECONF_SOURCE=${S} \ econf \
