From 17b7fe9959864f7239b2764d5d0aed81dcce767f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 21 May 2020 23:31:26 +0200 Subject: [PATCH] xpolymonk.lv2: 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 --- ...{xpolymonk.lv2_git.bb => xpolymonk.lv2.bb} | 1 + .../0003-Fix-build-with-lv2-1.1.18.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) rename recipes-musicians/xmonk.lv2/{xpolymonk.lv2_git.bb => xpolymonk.lv2.bb} (94%) create mode 100644 recipes-musicians/xmonk.lv2/xpolymonk.lv2/0003-Fix-build-with-lv2-1.1.18.patch diff --git a/recipes-musicians/xmonk.lv2/xpolymonk.lv2_git.bb b/recipes-musicians/xmonk.lv2/xpolymonk.lv2.bb similarity index 94% rename from recipes-musicians/xmonk.lv2/xpolymonk.lv2_git.bb rename to recipes-musicians/xmonk.lv2/xpolymonk.lv2.bb index 5fc78a0..90e6c8f 100644 --- a/recipes-musicians/xmonk.lv2/xpolymonk.lv2_git.bb +++ b/recipes-musicians/xmonk.lv2/xpolymonk.lv2.bb @@ -17,6 +17,7 @@ SRC_URI = " \ gitsm://github.com/brummer10/XPolyMonk.lv2.git;protocol=https \ file://0001-Adjust-to-oe-build.patch \ file://0002-Do-not-use-host-machine-s-ld-to-pack-resources.patch \ + file://0003-Fix-build-with-lv2-1.1.18.patch \ " SRCREV = "512d109d20e0a46d87ece9fea9576052da60ab86" PV = "0.6" diff --git a/recipes-musicians/xmonk.lv2/xpolymonk.lv2/0003-Fix-build-with-lv2-1.1.18.patch b/recipes-musicians/xmonk.lv2/xpolymonk.lv2/0003-Fix-build-with-lv2-1.1.18.patch new file mode 100644 index 0000000..dafaf41 --- /dev/null +++ b/recipes-musicians/xmonk.lv2/xpolymonk.lv2/0003-Fix-build-with-lv2-1.1.18.patch @@ -0,0 +1,33 @@ +From 686bd0eb5f8c7095f70ebf3dbfaa770e22684e1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 21 May 2020 23:24:52 +0200 +Subject: [PATCH] Fix build with lv2 >= 1.1.18 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +_LV2UI_Descriptor was never meant to be used by clients - use typedef name + +Upstream-Status Submitted [https://github.com/brummer10/XPolyMonk.lv2/pull/4] + +Signed-off-by: Andreas Müller +--- + XPolyMonk/gui/XPolyMonk_x11ui.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/XPolyMonk/gui/XPolyMonk_x11ui.c b/XPolyMonk/gui/XPolyMonk_x11ui.c +index 02baafb..c200443 100644 +--- a/XPolyMonk/gui/XPolyMonk_x11ui.c ++++ b/XPolyMonk/gui/XPolyMonk_x11ui.c +@@ -347,7 +347,7 @@ Widget_t* add_polymonk_knob(Widget_t *w, PortIndex index, const char * label, + } + + // init the xwindow and return the LV2UI handle +-static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor * descriptor, ++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, +-- +2.21.1 +