commit:     b91b343c74192ab54cffa339a44b791232aea1a2
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 14:39:06 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 14:59:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91b343c

media-libs/lsp-plugins: fix arm-on-arm64 build failure

Build profile armv8a, which is what upstream makefiles use when building
lsp-plugins on an arm64 system in 32-bit mode and which at least for the
time being is functionally the same as the profile armv8a, does not
compile Arm-specific implementation of DSP code. This is currently also
the case on upstream Git master branch, and by extension in version
1.1.30.

Fix tested in a 32-bit chroot on kamaji.

Closes: https://bugs.gentoo.org/824102
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch    | 12 ++++++++++++
 media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild             |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch 
b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
new file mode 100644
index 000000000000..2603b4c8a4c7
--- /dev/null
+++ b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
@@ -0,0 +1,12 @@
+--- a/src/dsp/Makefile
++++ b/src/dsp/Makefile
+@@ -44,6 +44,9 @@ endif
+ ifeq ($(BUILD_PROFILE), armv7ve)
+ LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
+ endif
++ifeq ($(BUILD_PROFILE), armv8a)
++LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
++endif
+ ifeq ($(BUILD_PROFILE), arm32)
+ LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
+ endif

diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild 
b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index 0247cef3a961..38269a16bc11 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -41,6 +41,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.1.29_armv8a-dsp.patch
+)
+
 src_compile() {
        use doc && MODULES+="doc"
        use jack && MODULES+=" jack"

Reply via email to