diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest.bb b/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest.bb index 76d7b3ac..049e461c 100644 --- a/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest.bb +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest.bb @@ -7,6 +7,7 @@ inherit autotools-brokensep distro_features_check SRC_URI += " \ file://0005-mruby-Use-native-mrbc.patch \ file://0006-mruby-regexp-pcre-link-against-libpcre.patch \ + file://0007-Load-schema-from-usr-share-zyn-fusion-schema.patch \ " DEPENDS += " \ @@ -47,11 +48,17 @@ do_install() { install -d ${D}${bindir} install -m 755 ${B}/package/zest ${D}${bindir}/zyn-fusion + install -d ${D}/${datadir}/zyn-fusion + cp -r ${B}/package/schema ${D}/${datadir}/zyn-fusion/ + install -d ${D}/opt/zyn-fusion - cp -a ${B}/package/{libzest.so,font,schema} ${D}/opt/zyn-fusion/ + cp -r ${B}/package/{libzest.so,font} ${D}/opt/zyn-fusion/ install -d ${D}/opt/zyn-fusion/qml touch ${D}/opt/zyn-fusion/qml/MainWindow.qml } -FILES_${PN} += "/opt/zyn-fusion/*" +FILES_${PN} += " \ + ${datadir}/zyn-fusion \ + /opt/zyn-fusion/* \ +" diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch new file mode 100644 index 00000000..f13a7649 --- /dev/null +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch @@ -0,0 +1,31 @@ +From 6866d2085b362adcc23edac712b7d504950d0594 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 16 Sep 2018 15:01:49 +0200 +Subject: [PATCH] Load schema from /usr/share/zyn-fusion/schema +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + src/osc-bridge/src/bridge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osc-bridge/src/bridge.c b/src/osc-bridge/src/bridge.c +index c32ace3..c2bc1a8 100644 +--- a/src/osc-bridge/src/bridge.c ++++ b/src/osc-bridge/src/bridge.c +@@ -430,7 +430,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri) + schema_t sch; + + //printf("[debug] loading json file\n"); +- FILE *f = fopen("schema/test.json", "r"); ++ FILE *f = fopen("/usr/share/zyn-fusion/schema/test.json", "r"); + if(!f && br->search_path) { + char tmp[256]; + snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json"); +-- +2.14.4 +