From 423a01e9ef6ba326a6fe534240a2adf50d2ce514 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 5 Apr 2022 07:29:41 +0200 Subject: jack: upgrade 1.19.19 -> 1.19.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Patch to fix simdtests.cpp was merged * guess who initially wrote simdtests.cpp :) Changes * Add waf autooption --example-tools to allow optional build of executables, libraries and man pages provided by jack-example-tools (the files are built by default). * Building and installing the additional files can be disabled by using --example-tools=no or --no-example-tools. * Fix 32-bit support in ALSA driver * Fix incomplete ASIO support on Windows * Fix metadata usage with multiple users * Fix netsource tool missing on Windows * Fix semaphore usage on macOS * Official FreeBSD support Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...clients-Use-c-compiler-for-jack_simdtests.patch | 37 --------------- meta-oe/recipes-multimedia/jack/jack_1.19.19.bb | 53 ---------------------- meta-oe/recipes-multimedia/jack/jack_1.19.20.bb | 51 +++++++++++++++++++++ 3 files changed, 51 insertions(+), 90 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch delete mode 100644 meta-oe/recipes-multimedia/jack/jack_1.19.19.bb create mode 100644 meta-oe/recipes-multimedia/jack/jack_1.19.20.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch deleted file mode 100644 index 1bdc5adbc1..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 15 Jan 2020 20:21:58 -0800 -Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests - -It uses c++ sources and runtime therefore its best to use c++ compiler -to build it so it can find the correct runtime, cross compiling with -clang fails - -x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] -Signed-off-by: Khem Raj ---- - example-clients/wscript | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - ---- a/example-clients/wscript -+++ b/example-clients/wscript -@@ -49,10 +49,15 @@ def build(bld): - else: - use = ['clientlib'] - -+ if example_program == 'jack_simdtests': -+ ftrs = 'cxx cxxprogram' -+ else: -+ ftrs = 'c cprogram' -+ - if bld.env['IS_MACOSX']: -- prog = bld(features='c cprogram', framework = ['Foundation']) -+ prog = bld(features = ftrs, framework = ['Foundation']) - else: -- prog = bld(features='c cprogram') -+ prog = bld(features = ftrs) - prog.includes = os_incdir + ['../common/jack', '../common'] - prog.source = example_program_source - prog.use = use diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb deleted file mode 100644 index 97b0edeed0..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \ -server for multi-processor machines. It is a new implementation of the \ -JACK server core features that aims in removing some limitations of \ -the JACK1 design. The activation system has been changed for a data \ -flow model and lock-free programming techniques for graph access have \ -been used to have a more dynamic and robust system." -SECTION = "libs/multimedia" - -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ - file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ -" - -DEPENDS = "libsamplerate0 libsndfile1 readline" - -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ - file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ - " -SRCREV = "3e6ca6b734b69e2f5dfb85935068e15006fb5acf" - -S = "${WORKDIR}/git" - -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 -EXTRA_OECONF = "--portaudio=no" - -do_install:append() { - if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then - rm -f ${D}${bindir}/jack_control - fi -} - -PACKAGES =+ "libjack jack-server jack-utils" - -RDEPENDS:jack-dev:remove = "${PN} (= ${EXTENDPKGV})" - -FILES:libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -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/*" diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb new file mode 100644 index 0000000000..452f066559 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \ +server for multi-processor machines. It is a new implementation of the \ +JACK server core features that aims in removing some limitations of \ +the JACK1 design. The activation system has been changed for a data \ +flow model and lock-free programming techniques for graph access have \ +been used to have a more dynamic and robust system." +SECTION = "libs/multimedia" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ + file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ +" + +DEPENDS = "libsamplerate0 libsndfile1 readline" + +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRCREV = "a2fe7ec2fdbd315f112c8035282d94a429451178" + +S = "${WORKDIR}/git" + +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 +EXTRA_OECONF = "--portaudio=no" + +do_install:append() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then + rm -f ${D}${bindir}/jack_control + fi +} + +PACKAGES =+ "libjack jack-server jack-utils" + +RDEPENDS:jack-dev:remove = "${PN} (= ${EXTENDPKGV})" + +FILES:libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" +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-54-g00ecf