commit:     95eafe73daf6e7017a525075c01bf2aef2b9c69e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 19:48:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 19:48:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95eafe73

media-libs/opus: fix build on arm64

Closes: https://bugs.gentoo.org/904739
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opus/files/opus-1.4-arm64-neon.patch | 24 ++++++++++++++++++++++++
 media-libs/opus/opus-1.4.ebuild                 |  1 +
 2 files changed, 25 insertions(+)

diff --git a/media-libs/opus/files/opus-1.4-arm64-neon.patch 
b/media-libs/opus/files/opus-1.4-arm64-neon.patch
new file mode 100644
index 000000000000..544d480505ea
--- /dev/null
+++ b/media-libs/opus/files/opus-1.4-arm64-neon.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/904739
+https://github.com/xiph/opus/issues/273
+https://github.com/xiph/opus/pull/267
+
+From d94583359bcf8f1b52cc93b7ca6ced9664fb2a7e Mon Sep 17 00:00:00 2001
+From: Vilius <orion...@protonmail.com>
+Date: Sun, 27 Nov 2022 03:13:09 +0200
+Subject: [PATCH] Meson: Fix unknown variable have_arm_intrinsics_or_asm
+
+--- a/silk/meson.build
++++ b/silk/meson.build
+@@ -25,6 +25,11 @@ if host_cpu_family in ['x86', 'x86_64'] and 
opus_conf.has('OPUS_HAVE_RTCD')
+   silk_sources +=  sources['SILK_SOURCES_X86_RTCD']
+ endif
+ 
++have_arm_intrinsics_or_asm = have_arm_ne10
++if (intrinsics_support.length() + asm_optimization.length() + 
inline_optimization.length()) > 0
++  have_arm_intrinsics_or_asm = true
++endif
++
+ if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
+   if opus_conf.has('OPUS_HAVE_RTCD')
+     silk_sources +=  sources['SILK_SOURCES_ARM_RTCD']
+

diff --git a/media-libs/opus/opus-1.4.ebuild b/media-libs/opus/opus-1.4.ebuild
index 5c116f4d9edc..5468589c3ad0 100644
--- a/media-libs/opus/opus-1.4.ebuild
+++ b/media-libs/opus/opus-1.4.ebuild
@@ -27,6 +27,7 @@ BDEPEND="
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch
+       "${FILESDIR}"/${PN}-1.4-arm64-neon.patch
 )
 
 multilib_src_configure() {

Reply via email to