summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-multimedia/jack
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-14 18:06:18 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-14 18:06:23 +0300
commit00ab237b1727155ac1fe8bc97ab3579439f98407 (patch)
tree343ef47048ef2f3d5a4da7e5b2301b737ae74247 /meta-openembedded/meta-oe/recipes-multimedia/jack
parent3e6b296400821b1e59b416242b3c9f952710731e (diff)
downloadopenbmc-00ab237b1727155ac1fe8bc97ab3579439f98407.tar.xz
meta-openembedded: subtree update:fd1a0c9210..1bfaa2e63a
Alex Kiernan (1): ostree: Upgrade 2019.3 -> 2019.4 Alexander Kanavin (1): lua: change a hard readline dependency into an optional one Andreas Müller (5): catfish: upgrade 1.4.9 -> 1.4.10 polkit-group-rules: Fix error in do_rootfs for rpm package-manager jack: upgrade 1.9.12 -> 1.9.13 fluidsynth: upgrade 2.0.6 -> 2.0.7 xfce4-panel: upgrade 4.14.0 -> 4.14.1 Bartosz Golaszewski (3): networkd-dispatcher: use distro_features_check to check for systemd networkd-dispatcher: remove unneeded RDEPENDS networkd-dispatcher: inherit systemd class Changqing Li (1): multipath-tools: upgrade 0.8.1 -> 0.8.2 Hongxu Jia (1): lvm2: remove unsupported OPTIONS+="event_timeout" rule Khem Raj (6): nvme-cli: Use install-spec target jsonrpc: Disable coverage in default build bdwgc: Enable C++ support and Additional options for musl a2jmidid: Fix build on risv tinyalsa: Update to latest packagegroup-meta-multimedia: Remove libsquish from rdeps Martin Schwan (1): python-waitress: Add recipes Paul Eggleton (1): mosquitto: update to 1.6.7 Peiran Hong (1): tcpdump: Delete unused patch Peter Kjellerstedt (1): kconfig-frontends: Retrieve the Git repository from GitLab Randy MacLeod (1): rwmem: add DESCRIPTION since the summary is vague Trevor Gamblin (1): rsyslog: fix CVE-2019-17040 Zang Ruochen (7): firewalld: upgrade 0.7.1 -> 0.7.2 fetchmail: upgrade 6.3.26 -> 6.4.1 python-asn1crypto: upgrade 0.24.0 -> 1.0.1 python-attrs: upgrade 19.1.0 -> 19.2.0 python-beautifulsoup4: upgrade 4.8.0 -> 4.8.1 python-cmd2: upgrade 0.9.17 -> 0.9.18 python-jinja2: upgrade 2.10.1 -> 2.10.3 Change-Id: Ief2d129403b43b308c19093ac63a498c8d51eb50 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia/jack')
-rw-r--r--meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch24
-rw-r--r--meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb1
-rw-r--r--meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch27
-rw-r--r--meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch26
-rw-r--r--meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb9
5 files changed, 28 insertions, 59 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch
new file mode 100644
index 000000000..23618f18a
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch
@@ -0,0 +1,24 @@
+Add riscv specific checks to choose correct gregs and context structure definitions
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- 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__) && !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__)
+@@ -102,7 +102,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 */
+
+ #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
+ # if defined(SIGSEGV_STACK_IA64)
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
index 7dcaaf682..a0aa41223 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
@@ -13,6 +13,7 @@ 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"
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch
deleted file mode 100644
index d9a3ab7cc..000000000
--- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dd65685c24bb25a800ed42388ed0a1e8792b2ed2 Mon Sep 17 00:00:00 2001
-From: falkTX <falktx@gmail.com>
-Date: Sat, 24 Nov 2018 14:29:58 +0100
-Subject: [PATCH] Fix OSX build
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport [https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583]
----
- posix/JackNetUnixSocket.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/posix/JackNetUnixSocket.cpp b/posix/JackNetUnixSocket.cpp
-index 7a5585ef..a4cb5036 100644
---- a/posix/JackNetUnixSocket.cpp
-+++ b/posix/JackNetUnixSocket.cpp
-@@ -169,7 +169,7 @@ namespace Jack
-
- int JackNetUnixSocket::Bind()
- {
-- return bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t));
-+ return ::bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t));
- }
-
- int JackNetUnixSocket::BindWith(const char* ip)
---
-2.20.1
-
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch
deleted file mode 100644
index e6021cd70..000000000
--- a/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/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
index 477af8ced..9f7d5b0b6 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
@@ -14,12 +14,9 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "libsamplerate0 libsndfile1 readline"
-SRC_URI = "git://github.com/jackaudio/jack2.git \
- file://0001-Python-3.7-fixes-2126.patch \
- file://0001-Fix-OSX-build.patch \
- "
-SRCREV = "c1647819eed6d11f94b21981d9c869629299f357"
-PV = "1.9.12"
+SRC_URI = "git://github.com/jackaudio/jack2.git"
+SRCREV = "37250ff470277f9947fbf3ba738f943053e30525"
+PV = "1.9.13"
S = "${WORKDIR}/git"
inherit waf pkgconfig