From 41c848d0011dda0530064c226f0df7ba48965df9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Nov 2023 17:19:19 -0700 Subject: jack: upgrade 1.19.22 -> 2 License-Update: Update license field to reflect missing AFL-2.1 and MIT licenses Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/jack/jack_1.19.22.bb | 52 ------------------------- meta-oe/recipes-multimedia/jack/jack_2.bb | 51 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/jack/jack_1.19.22.bb create mode 100644 meta-oe/recipes-multimedia/jack/jack_2.bb diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb deleted file mode 100644 index ef9936daba..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb +++ /dev/null @@ -1,52 +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" - -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" -SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" - -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_2.bb b/meta-oe/recipes-multimedia/jack/jack_2.bb new file mode 100644 index 0000000000..1d197b32c7 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack_2.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-or-later | LGPL-2.1-or-later | MIT | AFL-2.1" +LIC_FILES_CHKSUM = "file://common/jack/control.h;beginline=2;endline=21;md5=9edb8b99b7a0dcd49dbf8741444f123d \ + file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ + " + +DEPENDS = "libsamplerate0 libsndfile1" + +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=develop;protocol=https" +SRCREV = "520dfa0ac5a72d292f5b9fc5835926f925129764" + +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