helm: cleanup and fix multilib installation

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-01-29 18:20:46 +01:00
parent 3242255031
commit 52b15dcaf6
6 changed files with 8 additions and 79 deletions

View File

@@ -1,40 +0,0 @@
From 67d0e6ca6474cddc181d137e5a3b1a2d7d665a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 1 Aug 2017 23:44:30 +0200
Subject: [PATCH] Makefile: remove machine detection - it won't work for oe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Inappropriate [openembedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/Makefile b/Makefile
index b652a8b..d2fe67f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,17 +18,6 @@ ifdef DPKG
PDEBLDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
endif
-MACHINE := $(shell sh -c 'uname -m 2> /dev/null || echo not')
-ifneq (,$(findstring aarch,$(MACHINE)))
- SIMDFLAGS := -march=armv8-a -mtune=cortex-a53
-else
-ifneq (,$(findstring arm,$(MACHINE)))
- SIMDFLAGS := -march=armv8-a -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
-else
- SIMDFLAGS := -msse2
-endif
-endif
-
PROGRAM = helm
BIN = $(DESTDIR)/usr/bin
--
2.9.4

View File

@@ -1,31 +0,0 @@
From b6937b83618cee3e88c42071a5353fcb684d31bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 2 Aug 2017 00:06:26 +0200
Subject: [PATCH] use standard vst path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b652a8b..61e223b 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ PROGRAM = helm
BIN = $(DESTDIR)/usr/bin
BINFILE = $(BIN)/$(PROGRAM)
LV2 = $(DESTDIR)/$(LIBDIR)/lv2/$(PROGRAM).lv2
-VSTDIR = $(DESTDIR)/$(LIBDIR)/lxvst
+VSTDIR = $(DESTDIR)/$(LIBDIR)/vst
VST = $(VSTDIR)/$(PROGRAM).so
SYSDATA = $(DESTDIR)/usr/share/$(PROGRAM)
IMAGES = $(SYSDATA)/icons
--
2.9.4

View File

@@ -3,7 +3,7 @@ HOMEPAGE = "http://tytel.org/helm/"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
inherit autotools-brokensep qemu-ext distro_features_check gtk-icon-cache pack_audio_plugins
inherit qemu-ext distro_features_check gtk-icon-cache pack_audio_plugins
REQUIRED_DISTRO_FEATURES = "x11"
@@ -22,11 +22,9 @@ DEPENDS += " \
SRC_URI += " \
git://github.com/mtytel/helm.git \
file://0001-Makefile-remove-machine-detection-it-won-t-work-for-.patch \
file://0002-do-not-create-ttl-files-it-won-t-work-fo-cross.patch \
file://0003-use-standard-vst-path.patch \
file://0004-set-VECTORIZE_LOOP-for-gcc.patch \
file://0005-use-single-precision-floats-it-performs-much-better.patch \
file://0001-do-not-create-ttl-files-it-won-t-work-fo-cross.patch \
file://0002-set-VECTORIZE_LOOP-for-gcc.patch \
file://0003-use-single-precision-floats-it-performs-much-better.patch \
"
SRCREV = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e"
PV = "0.9.0"
@@ -49,12 +47,14 @@ do_configure_prepend() {
IFS="$OIFS"
}
do_compile_append() {
do_compile() {
oe_runmake 'SIMDFLAGS='
${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/builds/linux/LV2/lv2_ttl_generator')} ${S}/builds/linux/LV2/build/helm.so
cp *.ttl ${S}/builds/linux/LV2/helm.lv2/
}
do_install_append() {
do_install() {
oe_runmake 'DESTDIR=${D}' 'SIMDFLAGS=' 'LIBDIR=${libdir}' 'VSTDIR=${D}${libdir}/vst' install
rm -f ${datadir}/helm/patches/*.patch
rm -f ${datadir}/helm/patches/series
}