jack: apply some improvements

- Remove the do_install append because jack_control no longer
  builds when the dbus pkgconfig is disabled.
- Add python3-core to the runtime dependencies when D-Bus is
  enabled, because jack_control requires /usr/bin/python3.
- Use PACKAGE_BEFORE_PN to enable additional packages.
- Remove the HTML documentation because it no longer builds.

Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb
index d46391d08f..d4e6447aad 100644
--- a/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb
@@ -31,28 +31,20 @@ 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[dbus] = "--dbus --classic,,dbus,python3-core"
 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"
+PACKAGE_BEFORE_PN = "libjack jack-server"
 
 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:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*"
-