diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-01-29 16:14:44 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-01-30 13:34:49 -0800 |
commit | fe08cf35450f9d10e88e48fb91cb99f1a406f3b4 (patch) | |
tree | f8146697289c9ded6e26488c883868f51972d229 /meta-oe/recipes-multimedia/jack | |
parent | e3a9b1a97612ccc13ce1b4f33ada45a1e35fa154 (diff) | |
download | meta-openembedded-fe08cf35450f9d10e88e48fb91cb99f1a406f3b4.tar.gz |
jack: Fix build when using libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia/jack')
-rw-r--r-- | meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/jack/jack_git.bb | 1 |
2 files changed, 28 insertions, 0 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 new file mode 100644 index 000000000..d9a3ab7cc --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch | |||
@@ -0,0 +1,27 @@ | |||
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_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb index 52559cb36..99bf2e370 100644 --- a/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-oe/recipes-multimedia/jack/jack_git.bb | |||
@@ -16,6 +16,7 @@ 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 | file://0001-Python-3.7-fixes-2126.patch \ |
19 | file://0001-Fix-OSX-build.patch \ | ||
19 | " | 20 | " |
20 | SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" | 21 | SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" |
21 | PV = "1.9.12" | 22 | PV = "1.9.12" |