diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-multimedia/jack')
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch | 43 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch (renamed from external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch) | 29 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 31 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb | 28 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch | 26 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch | 33 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb (renamed from external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb) | 25 |
7 files changed, 91 insertions, 124 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch deleted file mode 100644 index d17d311b..00000000 --- a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch +++ /dev/null @@ -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 - diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch index b344f542..af6612e8 100644 --- a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch +++ b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch @@ -1,31 +1,24 @@ -Consider compiler define for aarch64 +Add riscv specific checks to choose correct gregs and context structure definitions +Upstream-Status: Pending 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 +--- a/sigsegv.c ++++ b/sigsegv.c +@@ -91,7 +91,7 @@ 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__) +-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) ++#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__) - ucontext->uc_mcontext.uc_regs[i] --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(__sparc__) || defined(__arch64__) - ucontext->uc_mcontext.mc_gregs[i] - #else + #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 */ -+#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */ +-#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) diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb deleted file mode 100644 index 7dcaaf68..00000000 --- a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ /dev/null @@ -1,31 +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 \ -" -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" diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb new file mode 100644 index 00000000..5fffe77c --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb @@ -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" diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch deleted file mode 100644 index e6021cd7..00000000 --- a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 72564b04151b61fa8d954bbb43afc58108ee50ec Mon Sep 17 00:00:00 2001 -From: Thomas Nagy <tnagy@waf.io> -Date: Mon, 12 Mar 2018 20:42:55 +0100 -Subject: [PATCH] Python 3.7 fixes #2126 - -Upstream-Status: Backport -[https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - waflib/Node.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/waflib/Node.py b/waflib/Node.py -index fb3cd273..405a6fec 100644 ---- a/waflib/Node.py -+++ b/waflib/Node.py -@@ -537,8 +537,6 @@ class Node(object): - if maxdepth: - for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove): - yield k -- raise StopIteration -- - def ant_glob(self, *k, **kw): - """ - This method is used for finding files across folders. It behaves like ant patterns: diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch new file mode 100644 index 00000000..dda21a32 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch @@ -0,0 +1,33 @@ +From 76b8a389268275cc13f3b4e61394d40b24ec56f1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 15 Jan 2020 20:21:58 -0800 +Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests + +It uses c++ sources and runtime therefore its best to use c++ compiler +to build it so it can find the correct runtime, cross compiling with +clang fails + +x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' + +Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + example-clients/wscript | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/example-clients/wscript b/example-clients/wscript +index a8857aa7..df9435aa 100644 +--- a/example-clients/wscript ++++ b/example-clients/wscript +@@ -69,6 +69,8 @@ def build(bld): + + if bld.env['IS_MACOSX']: + prog = bld(features='c cprogram', framework = ['Foundation']) ++ elif example_program == 'jack_simdtests': ++ prog = bld(features='cxx cxxprogram') + else: + prog = bld(features='c cprogram') + prog.includes = os_incdir + ['../common/jack', '../common'] +-- +2.25.0 + diff --git a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb index 52559cb3..e954341f 100644 --- a/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb @@ -15,26 +15,39 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" SRC_URI = "git://github.com/jackaudio/jack2.git \ - file://0001-Python-3.7-fixes-2126.patch \ - " -SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" -PV = "1.9.12" + file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ + " +SRCREV = "b54a09bf7ef760d81fdb8544ad10e45575394624" + S = "${WORKDIR}/git" inherit waf pkgconfig PACKAGECONFIG ??= "alsa" PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib" +# --dbus only stops building jackd -> add --classic +PACKAGECONFIG[dbus] = "--dbus --classic,,dbus" PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" # portaudio is for windows builds only EXTRA_OECONF = "--portaudio=no" +do_install_append() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then + rm -f ${D}${bindir}/jack_control + fi +} + PACKAGES =+ "libjack jack-server jack-utils" RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES_jack-server = "${bindir}/jackd" +FILES_jack-server = " \ + ${datadir}/dbus-1/services \ + ${bindir}/jackdbus \ + ${bindir}/jackd \ +" FILES_jack-utils = "${bindir}/*" -FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* " + +FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" |