From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../jack/jack/0001-Fix-OSX-build.patch | 27 ++++++++++++++++++++++ .../meta-oe/recipes-multimedia/jack/jack_git.bb | 10 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch (limited to 'meta-openembedded/meta-oe/recipes-multimedia/jack') 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 new file mode 100644 index 000000000..d9a3ab7cc --- /dev/null +++ b/meta-openembedded/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 +Date: Sat, 24 Nov 2018 14:29:58 +0100 +Subject: [PATCH] Fix OSX build + +Signed-off-by: Khem Raj +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(&fRecvAddr), sizeof(socket_address_t)); ++ return ::bind(fSockfd, reinterpret_cast(&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_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb index 52559cb36..477af8ced 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-openembedded/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" @@ -25,6 +26,8 @@ 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 @@ -35,6 +38,11 @@ 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/* " -- cgit v1.2.3