aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-11-26 21:03:32 +0000
committerKhem Raj <raj.khem@gmail.com>2019-11-27 20:07:16 -0800
commitd77753342f1ba535f45705bc3cb974b958079cb8 (patch)
tree6850306a3004b8a3c7b8f32043b7bacac9f0f903 /meta-oe/recipes-multimedia
parent8b21e77502055c8078132cdac57a4736108b3a5a (diff)
downloadmeta-openembedded-d77753342f1ba535f45705bc3cb974b958079cb8.tar.gz
jack: upgrade to 1.19.14
Notable because it uses Python 3 for the Waf scripts. Delete jack_control if DBus isn't enabled, as this tool uses DBus to communicate with the server and shouldn't be installed. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/jack/jack_1.19.14.bb (renamed from meta-oe/recipes-multimedia/jack/jack_git.bb)12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb
index 9f7d5b0b61..cebc952661 100644
--- a/meta-oe/recipes-multimedia/jack/jack_git.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "libsamplerate0 libsndfile1 readline"
SRC_URI = "git://github.com/jackaudio/jack2.git"
-SRCREV = "37250ff470277f9947fbf3ba738f943053e30525"
-PV = "1.9.13"
+SRCREV = "b54a09bf7ef760d81fdb8544ad10e45575394624"
+
S = "${WORKDIR}/git"
inherit waf pkgconfig
@@ -30,6 +30,12 @@ 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})"
@@ -42,4 +48,4 @@ FILES_jack-server = " \
"
FILES_jack-utils = "${bindir}/*"
-FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* "
+FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*"