diff options
Diffstat (limited to 'meta-oe/recipes-multimedia')
3 files changed, 3 insertions, 59 deletions
diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch deleted file mode 100644 index d9a3ab7cc5..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From dd65685c24bb25a800ed42388ed0a1e8792b2ed2 Mon Sep 17 00:00:00 2001 | ||
2 | From: falkTX <falktx@gmail.com> | ||
3 | Date: Sat, 24 Nov 2018 14:29:58 +0100 | ||
4 | Subject: [PATCH] Fix OSX build | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Backport [https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583] | ||
8 | --- | ||
9 | posix/JackNetUnixSocket.cpp | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/posix/JackNetUnixSocket.cpp b/posix/JackNetUnixSocket.cpp | ||
13 | index 7a5585ef..a4cb5036 100644 | ||
14 | --- a/posix/JackNetUnixSocket.cpp | ||
15 | +++ b/posix/JackNetUnixSocket.cpp | ||
16 | @@ -169,7 +169,7 @@ namespace Jack | ||
17 | |||
18 | int JackNetUnixSocket::Bind() | ||
19 | { | ||
20 | - return bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t)); | ||
21 | + return ::bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t)); | ||
22 | } | ||
23 | |||
24 | int JackNetUnixSocket::BindWith(const char* ip) | ||
25 | -- | ||
26 | 2.20.1 | ||
27 | |||
diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch deleted file mode 100644 index e6021cd706..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 72564b04151b61fa8d954bbb43afc58108ee50ec Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Nagy <tnagy@waf.io> | ||
3 | Date: Mon, 12 Mar 2018 20:42:55 +0100 | ||
4 | Subject: [PATCH] Python 3.7 fixes #2126 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | [https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c] | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | waflib/Node.py | 2 -- | ||
12 | 1 file changed, 2 deletions(-) | ||
13 | |||
14 | diff --git a/waflib/Node.py b/waflib/Node.py | ||
15 | index fb3cd273..405a6fec 100644 | ||
16 | --- a/waflib/Node.py | ||
17 | +++ b/waflib/Node.py | ||
18 | @@ -537,8 +537,6 @@ class Node(object): | ||
19 | if maxdepth: | ||
20 | for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove): | ||
21 | yield k | ||
22 | - raise StopIteration | ||
23 | - | ||
24 | def ant_glob(self, *k, **kw): | ||
25 | """ | ||
26 | This method is used for finding files across folders. It behaves like ant patterns: | ||
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb index 477af8ced0..9f7d5b0b61 100644 --- a/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-oe/recipes-multimedia/jack/jack_git.bb | |||
@@ -14,12 +14,9 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS = "libsamplerate0 libsndfile1 readline" | 15 | DEPENDS = "libsamplerate0 libsndfile1 readline" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/jackaudio/jack2.git \ | 17 | SRC_URI = "git://github.com/jackaudio/jack2.git" |
18 | file://0001-Python-3.7-fixes-2126.patch \ | 18 | SRCREV = "37250ff470277f9947fbf3ba738f943053e30525" |
19 | file://0001-Fix-OSX-build.patch \ | 19 | PV = "1.9.13" |
20 | " | ||
21 | SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" | ||
22 | PV = "1.9.12" | ||
23 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
24 | 21 | ||
25 | inherit waf pkgconfig | 22 | inherit waf pkgconfig |