zynaddsubfx: various enhancements but still not here..

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

recipes-misc/recipes-multimedia/zynaddsubfx/files/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch

@@ -0,0 +1,71 @@
+From 7d23dbd4dc33750c4c541f1e80eccbd9d136e5bb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 28 Feb 2017 23:35:23 +0100
+Subject: [PATCH] Controller/Spliter: align Makefiles for cross-compiling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ ExternalPrograms/Controller/Makefile | 8 ++++----
+ ExternalPrograms/Spliter/Makefile    | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/ExternalPrograms/Controller/Makefile b/ExternalPrograms/Controller/Makefile
+index 549607f..8d35e9d 100644
+--- a/ExternalPrograms/Controller/Makefile
++++ b/ExternalPrograms/Controller/Makefile
+@@ -1,17 +1,17 @@
+ controller: main.o Controller.o ControllerUI.o
+-	gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
++	$(CC) -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++ $(LDFLAGS)
+ 
+ ControllerUI.cxx ControllerUI.h: ControllerUI.fl
+ 	fluid -c ControllerUI.fl
+ 
+ ControllerUI.o: ControllerUI.cxx ControllerUI.h
+-	gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
++	$(CC) $(CFLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
+ 
+ Controller.o: Controller.C Controller.h
+-	gcc `fltk-config --cflags` -c Controller.C -o Controller.o
++	$(CC) $(CFLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o
+ 
+ main.o: main.C Controller.h ControllerUI.h
+-	gcc `fltk-config --cflags` -c main.C -o main.o
++	$(CC) $(CFLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+ 	rm -f *.o controller ControllerUI.cxx ControllerUI.h 
+diff --git a/ExternalPrograms/Spliter/Makefile b/ExternalPrograms/Spliter/Makefile
+index fe610d4..e81fc75 100644
+--- a/ExternalPrograms/Spliter/Makefile
++++ b/ExternalPrograms/Spliter/Makefile
+@@ -1,17 +1,17 @@
+ spliter: main.o Spliter.o SpliterUI.o
+-	gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
++	$(CC) -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++ $(LDFLAGS)
+ 
+ SplitterUI.cxx SpliterUI.h: SpliterUI.fl
+ 	fluid -c SpliterUI.fl
+ 
+ SpliterUI.o: SplitterUI.cxx SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
++	$(CC) $(CFLAGS) `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+ 
+ Spliter.o: Spliter.C Spliter.h
+-	gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
++	$(CC) $(CFLAGS) `fltk-config --cflags` -c Spliter.C -o Spliter.o
+ 
+ main.o: main.C Spliter.h SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c main.C -o main.o
++	$(CC) $(CFLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+ 	rm -f *.o spliter SpliterUI.cxx SpliterUI.h 
+-- 
+2.9.3
+

recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_2.5.4.bb

@@ -17,13 +17,15 @@ DEPENDS += " \
     lv2 \
     liblo \
     zlib \
-    fltk \
+    fltk fltk-native \
     mxml \
+    libxpm \
 "
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
     file://0001-No-target-specific-asm.patch \
+    file://0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch \
 "
 SRC_URI[md5sum] = "7dc757512e5b6f3013bfb168ed01cfa3"
 SRC_URI[sha256sum] = "014b1d9ad1750c310369676b46a4555ba6bec512c38ccba17ceb89c78552949a"
@@ -55,12 +57,23 @@ def qemu_run_binary_local(data, rootfs_path, binary):
             + binary
 
 do_compile_append() {
+    # Build Controller/Spliter
+    oe_runmake -C ${S}/ExternalPrograms/Controller
+    oe_runmake -C ${S}/ExternalPrograms/Spliter
+
+    # build ttl-files must be done in quemu (lv2-ttl-generator-data loads 
+    # so-files and calls functions to create ttl-files)
     for sofile in `cat ${WORKDIR}/lv2-ttl-generator-data | awk '{ print $2 }'`; do
         cd `dirname ${sofile}`
         ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${B}/src/Plugin/lv2-ttl-generator')} ${sofile}
     done
 }
 
+do_install_append() {
+    install -m 0755 ${S}/ExternalPrograms/Controller/controller ${D}${bindir}/zynaddsubfx-controller
+    install -m 0755 ${S}/ExternalPrograms/Spliter/spliter ${D}${bindir}/zynaddsubfx-spliter
+}
+
 # we are not linking against dssi - so
 RDEPENDS_${PN} += "dssi"