From 93b064674861da9ac97f5af429cb8bfbedba5519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 21 May 2020 22:37:46 +0200 Subject: [PATCH] yoshimi: Fix build with lv2 >= 1.1.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/yoshimi/yoshimi.bb | 5 +- ...0001-Fix-compatibility-with-lv2-1.18.patch | 61 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 recipes-musicians/yoshimi/yoshimi/0001-Fix-compatibility-with-lv2-1.18.patch diff --git a/recipes-musicians/yoshimi/yoshimi.bb b/recipes-musicians/yoshimi/yoshimi.bb index 31d1dbc..6da0a52 100644 --- a/recipes-musicians/yoshimi/yoshimi.bb +++ b/recipes-musicians/yoshimi/yoshimi.bb @@ -22,7 +22,10 @@ DEPENDS += " \ " PV = "1.7.1" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/1.7/${BPN}-${PV}.tar.bz2" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/1.7/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-compatibility-with-lv2-1.18.patch \ +" SRC_URI[md5sum] = "fb1010d11c506a9f908729a7b5be4774" SRC_URI[sha256sum] = "47f134165e24cd503f1d09cfec6d7e84dd22d347b0967992d05467e98be67381" diff --git a/recipes-musicians/yoshimi/yoshimi/0001-Fix-compatibility-with-lv2-1.18.patch b/recipes-musicians/yoshimi/yoshimi/0001-Fix-compatibility-with-lv2-1.18.patch new file mode 100644 index 0000000..e34035e --- /dev/null +++ b/recipes-musicians/yoshimi/yoshimi/0001-Fix-compatibility-with-lv2-1.18.patch @@ -0,0 +1,61 @@ +From 86996cbb235f0fe138ae814a6758c2c8ba1c2a38 Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher +Date: Sun, 10 May 2020 22:26:20 +0200 +Subject: [PATCH] Fix compatibility with lv2 1.18 + +Upstream-Status: Backport [https://github.com/Yoshimi/yoshimi/commit/86996cbb235f0fe138ae814a6758c2c8ba1c2a38] +--- + src/LV2_Plugin/YoshimiLV2Plugin.cpp | 6 +++--- + src/LV2_Plugin/YoshimiLV2Plugin.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp +index 68cd0c2a..927c05cc 100644 +--- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp ++++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp +@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init() + } + + +-LV2_Handle YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features) ++LV2_Handle YoshimiLV2Plugin::instantiate (const LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features) + { + SynthEngine *synth = new SynthEngine(0, NULL, true); + if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){ +@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init() + } + + +-LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features) ++LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features) + { +- const _LV2UI_Descriptor *desc = descriptor; ++ const LV2UI_Descriptor *desc = descriptor; + descriptor = desc; + const char *plug = plugin_uri; + plugin_uri = plug; +diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h +index a484a8bd..862a2533 100644 +--- a/src/LV2_Plugin/YoshimiLV2Plugin.h ++++ b/src/LV2_Plugin/YoshimiLV2Plugin.h +@@ -106,7 +106,7 @@ public: + virtual void registerAudioPort(int) {} + + //static methods +- static LV2_Handle instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features); ++ static LV2_Handle instantiate (const LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features); + static void connect_port(LV2_Handle instance, uint32_t port, void *data_location); + static void activate(LV2_Handle instance); + static void deactivate(LV2_Handle instance); +@@ -159,7 +159,7 @@ public: + YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features); + ~YoshimiLV2PluginUI(); + bool init(); +- static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features); ++ static LV2UI_Handle instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features); + static void cleanup(LV2UI_Handle ui); + static void static_guiClosed(void *arg); + void run(); +-- +2.21.1 +