| Message ID | 20191126210332.15738-1-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | d77753342f1ba535f45705bc3cb974b958079cb8 |
| Headers | show |
| Series | [oe] jack: upgrade to 1.19.14 | expand |
thanks this is better than what I had staged, I will take this one. On Tue, Nov 26, 2019 at 1:03 PM Ross Burton <ross.burton@intel.com> wrote: > > 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> > --- > .../jack/{jack_git.bb => jack_1.19.14.bb} | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > rename meta-oe/recipes-multimedia/jack/{jack_git.bb => jack_1.19.14.bb} (87%) > > diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb > similarity index 87% > rename from meta-oe/recipes-multimedia/jack/jack_git.bb > rename to 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/*" > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb similarity index 87% rename from meta-oe/recipes-multimedia/jack/jack_git.bb rename to 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/*"
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> --- .../jack/{jack_git.bb => jack_1.19.14.bb} | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) rename meta-oe/recipes-multimedia/jack/{jack_git.bb => jack_1.19.14.bb} (87%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel