diff --git a/classes/lv2-postinst-helper.bbclass b/classes/lv2-postinst-helper.bbclass index 88e4df6..a6198ae 100644 --- a/classes/lv2-postinst-helper.bbclass +++ b/classes/lv2-postinst-helper.bbclass @@ -14,6 +14,8 @@ LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string" # paths as installed on target a stored in a file called lv2-postinst-manifest LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest" +inherit audio-plugin-common + do_install_append() { # remove dummy lv2-turtles again cd ${D}/${libdir}/lv2 @@ -31,7 +33,7 @@ do_install_append() { } -pkg_postinst_ontarget_${PN}-lv2() { +pkg_postinst_ontarget_${PN_LV2}() { oldpath=`pwd` for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do cd `dirname "$sofile"` @@ -40,7 +42,7 @@ pkg_postinst_ontarget_${PN}-lv2() { cd $oldpath } -pkg_prerm_${PN}-lv2() { +pkg_prerm_${PN_LV2}() { for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do path=`dirname "$sofile"` for turtle in `find $path -name '*.ttl'`; do @@ -49,5 +51,5 @@ pkg_prerm_${PN}-lv2() { done } -FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}" -RDEPENDS_${PN}-lv2 += "lv2-ttl-generator" +FILES_${PN_LV2} += "${LV2-POSTINST-MANIFEST}" +RDEPENDS_${PN_LV2} += "lv2-ttl-generator" diff --git a/recipes-musicians/distrho/distrho-ports-extra.bb b/recipes-musicians/distrho/distrho-ports-extra.bb index 8ca9ba4..9664215 100644 --- a/recipes-musicians/distrho/distrho-ports-extra.bb +++ b/recipes-musicians/distrho/distrho-ports-extra.bb @@ -62,8 +62,8 @@ FILES_${PN} += " \ " # for common (?) cabbage files -RDEPENDS_${PN}-lv2 += "${PN}" -RDEPENDS_${PN}-vst += "${PN}" +RDEPENDS_${PN_LV2} += "${PN}" +RDEPENDS_${PN_VST} += "${PN}" # Have not found what causes stripping - debugging of plugins is unlikely INSANE_SKIP_${PN} = "already-stripped" diff --git a/recipes-musicians/distrho/distrho-ports.bb b/recipes-musicians/distrho/distrho-ports.bb index 29177c9..d5c0ff5 100644 --- a/recipes-musicians/distrho/distrho-ports.bb +++ b/recipes-musicians/distrho/distrho-ports.bb @@ -85,7 +85,7 @@ do_install() { } PACKAGES =+ "${PN}-presets" -RDEPENDS_${PN}-presets = "${PN}-lv2" +RDEPENDS_${PN}-presets = "${PN_LV2}" FILES_${PN}-presets = "${libdir}/lv2/*.preset.lv2" diff --git a/recipes-musicians/linuxsampler/linuxsampler_2.1.1.bb b/recipes-musicians/linuxsampler/linuxsampler_2.1.1.bb index 9eec532..6135217 100644 --- a/recipes-musicians/linuxsampler/linuxsampler_2.1.1.bb +++ b/recipes-musicians/linuxsampler/linuxsampler_2.1.1.bb @@ -57,8 +57,8 @@ FILES_${PN}-tools = " \ ${bindir}/ls_instr_script \ " -RDEPENDS_${PN}-dssi += "${PN}" -RDEPENDS_${PN}-lv2 += "${PN}" -RDEPENDS_${PN}-vst += "${PN}" +RDEPENDS_${PN_DSSI} += "${PN}" +RDEPENDS_${PN_LV2} += "${PN}" +RDEPENDS_${PN_VST} += "${PN}" RDEPENDS_${PN}-standalone += "${PN}" diff --git a/recipes-musicians/zyn/zyn.inc b/recipes-musicians/zyn/zyn.inc index 0d02d0c..df46853 100644 --- a/recipes-musicians/zyn/zyn.inc +++ b/recipes-musicians/zyn/zyn.inc @@ -66,8 +66,8 @@ FILES_${PN}-standalone = " \ ${bindir}/zynaddsubfx \ " -RDEPENDS_${PN}-dssi += "${PN}" -RDEPENDS_${PN}-lv2 += "${PN}" -RDEPENDS_${PN}-vst += "${PN}" +RDEPENDS_${PN_DSSI} += "${PN}" +RDEPENDS_${PN_LV2} += "${PN}" +RDEPENDS_${PN_VST} += "${PN}" RDEPENDS_${PN}-standalone += "${PN}"