mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
a2jmidid: Upgrade to release 9
- Switch to using git for SRC_URI, since 9 is not available in original location - Drop upstreamed aarch64 support patch - Drop waf patch as it uses meson now - Disable lto for now, meson needs to pass full CC to LTO plugin otherwise we get linking errors since LTO objects are not compiled with right ABI especially on arm ( mixing hard/soft float) Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
parent
e95c5b704b
commit
324dec2a55
|
|
@ -1,43 +0,0 @@
|
|||
From 488dc9b00239976caac6bd9ed76b38d9d1659dd9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 4 Oct 2016 23:44:49 +0200
|
||||
Subject: [PATCH] wscript: add pthread library dependency to fix linking
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Stolen from [1]
|
||||
|
||||
[1] http://pkgs.fedoraproject.org/cgit/rpms/a2jmidid.git/tree/a2jmidid-linking.patch
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
wscript | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 664625b..66a532a 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -67,6 +67,7 @@ def configure(conf):
|
||||
conf.env['DBUS_ENABLED'] = False
|
||||
|
||||
conf.env['LIB_DL'] = ['dl']
|
||||
+ conf.env['LIB_PTHREAD'] = ['pthread']
|
||||
|
||||
#conf.check_header('expat.h', mandatory=True)
|
||||
#conf.env['LIB_EXPAT'] = ['expat']
|
||||
@@ -152,7 +153,7 @@ def build(bld):
|
||||
|
||||
prog.includes = '.' # make waf dependency tracking work
|
||||
prog.target = 'a2jmidid'
|
||||
- prog.uselib = 'ALSA JACK DL'
|
||||
+ prog.uselib = 'ALSA JACK DL PTHREAD'
|
||||
if bld.env()['DBUS_ENABLED']:
|
||||
prog.uselib += " DBUS-1"
|
||||
prog = bld.create_obj('cc', 'program')
|
||||
--
|
||||
2.5.5
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
Consider compiler define for aarch64
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status:Pending
|
||||
|
||||
Index: a2jmidid-8/sigsegv.c
|
||||
===================================================================
|
||||
--- a2jmidid-8.orig/sigsegv.c
|
||||
+++ a2jmidid-8/sigsegv.c
|
||||
@@ -91,18 +91,18 @@ static void signal_segv(int signum, sigi
|
||||
a2j_error("info.si_errno = %d", info->si_errno);
|
||||
a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
|
||||
a2j_error("info.si_addr = %p", info->si_addr);
|
||||
-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
|
||||
+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
|
||||
for(i = 0; i < NGREG; i++)
|
||||
a2j_error("reg[%02d] = 0x" REGFORMAT, i,
|
||||
#if defined(__powerpc__)
|
||||
ucontext->uc_mcontext.uc_regs[i]
|
||||
-#elif defined(__sparc__) && defined(__arch64__)
|
||||
+#elif defined(__sparc__) || defined(__arch64__)
|
||||
ucontext->uc_mcontext.mc_gregs[i]
|
||||
#else
|
||||
ucontext->uc_mcontext.gregs[i]
|
||||
#endif
|
||||
);
|
||||
-#endif /* alpha, ia64, kFreeBSD, arm, hppa */
|
||||
+#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */
|
||||
|
||||
#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
|
||||
# if defined(SIGSEGV_STACK_IA64)
|
||||
|
|
@ -12,13 +12,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv)
|
||||
for(i = 0; i < NGREG; i++)
|
||||
a2j_error("reg[%02d] = 0x" REGFORMAT, i,
|
||||
#if defined(__powerpc__)
|
||||
@@ -102,7 +102,7 @@ static void signal_segv(int signum, sigi
|
||||
#if defined(__powerpc__) && !defined(__powerpc64__)
|
||||
@@ -104,7 +104,7 @@ static void signal_segv(int signum, sigi
|
||||
ucontext->uc_mcontext.gregs[i]
|
||||
#endif
|
||||
);
|
||||
-#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */
|
||||
+#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 riscv */
|
||||
-#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64 */
|
||||
+#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64 riscv */
|
||||
|
||||
#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
|
||||
# if defined(SIGSEGV_STACK_IA64)
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
SUMMARY = "a2jmidid is daemon for exposing ALSA sequencer applications as JACK MIDI"
|
||||
SECTION = "libs/multimedia"
|
||||
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://gpl2.txt;md5=751419260aa954499f7abaabaa882bbe \
|
||||
"
|
||||
|
||||
DEPENDS = "alsa-lib jack dbus"
|
||||
DEPENDS_append_libc-musl = " libexecinfo"
|
||||
|
||||
SRC_URI = " \
|
||||
http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||
file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \
|
||||
file://0002-aarch64.patch \
|
||||
file://riscv_ucontext.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd"
|
||||
SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f"
|
||||
|
||||
inherit waf pkgconfig
|
||||
|
||||
LDFLAGS_append_libc-musl = " -lexecinfo"
|
||||
|
||||
export LINKFLAGS="${LDFLAGS}"
|
||||
|
||||
do_configure() {
|
||||
sed -i 's|/usr/bin/.*python$|/usr/bin/env python2|' ${S}/a2j_control ${S}/waf ${S}/wscript
|
||||
(cd ${B} && ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF})
|
||||
}
|
||||
|
||||
FILES_${PN} += "${datadir}/dbus-1/services"
|
||||
28
meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
Normal file
28
meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
SUMMARY = "a2jmidid is daemon for exposing ALSA sequencer applications as JACK MIDI"
|
||||
SECTION = "libs/multimedia"
|
||||
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE;md5=751419260aa954499f7abaabaa882bbe \
|
||||
"
|
||||
|
||||
DEPENDS = "alsa-lib jack dbus"
|
||||
DEPENDS_append_libc-musl = " libexecinfo"
|
||||
|
||||
SRCREV = "de37569c926c5886768f892c019e3f0468615038"
|
||||
SRC_URI = " \
|
||||
git://github.com/linuxaudio/a2jmidid;protocol=https \
|
||||
file://riscv_ucontext.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit meson pkgconfig
|
||||
|
||||
EXTRA_OEMESON = "-Db_lto=false"
|
||||
|
||||
LDFLAGS_append_libc-musl = " -lexecinfo"
|
||||
|
||||
export LINKFLAGS="${LDFLAGS}"
|
||||
|
||||
FILES_${PN} += "${datadir}/dbus-1/services"
|
||||
Loading…
Reference in New Issue
Block a user