aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-29 16:14:44 -0800
committerKhem Raj <raj.khem@gmail.com>2019-01-30 13:34:49 -0800
commitfe08cf35450f9d10e88e48fb91cb99f1a406f3b4 (patch)
treef8146697289c9ded6e26488c883868f51972d229 /meta-oe
parente3a9b1a97612ccc13ce1b4f33ada45a1e35fa154 (diff)
downloadmeta-openembedded-contrib-fe08cf35450f9d10e88e48fb91cb99f1a406f3b4.tar.gz
jack: Fix build when using libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch27
-rw-r--r--meta-oe/recipes-multimedia/jack/jack_git.bb1
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 0000000000..d9a3ab7cc5
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch
@@ -0,0 +1,27 @@
+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-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
index 52559cb367..99bf2e3705 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"
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"