From c79930871e21032e0d9f8bcb43ffb07a0aa4ba4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 16 Sep 2018 00:33:39 +0200 Subject: [PATCH] zynaddsubfx: Split into zynaddsubfx (old GUI) and zyn-fusion (new GUI) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../zynaddsubfx/zyn-fusion.bb | 17 +++++++++++++++++ .../{zynaddsubfx_git.bb => zyn.inc} | 16 +++------------- .../0001-No-target-specific-asm.patch | 0 ...er-align-Makefiles-for-cross-compili.patch | 0 ...se-ps-aux-to-find-jack-busybox-s-ps-.patch | 0 .../0004-Keep-our-build-flags.patch | 0 ...Set-UI-optimization-to-O1-explicitly.patch | 0 .../zynaddsubfx/zynaddsubfx.bb | 19 +++++++++++++++++++ 8 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 recipes-misc/recipes-multimedia/zynaddsubfx/zyn-fusion.bb rename recipes-misc/recipes-multimedia/zynaddsubfx/{zynaddsubfx_git.bb => zyn.inc} (80%) rename recipes-misc/recipes-multimedia/zynaddsubfx/{files => zyn}/0001-No-target-specific-asm.patch (100%) rename recipes-misc/recipes-multimedia/zynaddsubfx/{files => zyn}/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch (100%) rename recipes-misc/recipes-multimedia/zynaddsubfx/{files => zyn}/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch (100%) rename recipes-misc/recipes-multimedia/zynaddsubfx/{files => zyn}/0004-Keep-our-build-flags.patch (100%) rename recipes-misc/recipes-multimedia/zynaddsubfx/{files => zyn}/0005-Set-UI-optimization-to-O1-explicitly.patch (100%) create mode 100644 recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx.bb diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/zyn-fusion.bb b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn-fusion.bb new file mode 100644 index 00000000..b2933d72 --- /dev/null +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn-fusion.bb @@ -0,0 +1,17 @@ +require zyn.inc + +SUMMARY = "Zyn-Fusion is an open source software synthesizer" + +EXTRA_OECMAKE += "-DGuiModule=zest" + +FILES_${PN} += " \ + ${datadir}/zynaddsubfx \ +" + +RDEPENDS_${PN} += "mruby-zest" + +RPROVIDES_${PN} += "zynaddsubfx" +RREPLACES_${PN} += "zynaddsubfx" +RCONFLICTS_${PN} += "zynaddsubfx" + + diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_git.bb b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc similarity index 80% rename from recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_git.bb rename to recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc index fd21e20c..b0dd6f4b 100644 --- a/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_git.bb +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc @@ -1,4 +1,3 @@ -SUMMARY = "ZynAddSubFX is an open source software synthesizer" HOMEPAGE = "http://zynaddsubfx.sourceforge.net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=21fa88a5e50a1c608d22612c1fbe1971" @@ -18,11 +17,11 @@ DEPENDS += " \ zlib \ mxml \ libxpm \ - ntk-native ntk \ - fltk-native fltk \ " -CXXFLAGS += "-ffast-math -DNDEBUG" +CXXFLAGS += "-ftree-vectorize -ffast-math -DNDEBUG" + +FILESEXTRAPATHS_prepend := "${THISDIR}/zyn:" SRC_URI = " \ gitsm://github.com/zynaddsubfx/zynaddsubfx.git \ @@ -49,10 +48,6 @@ do_configure_prepend() { } do_compile_append() { - # Build Controller/Spliter - oe_runmake -C ${S}/ExternalPrograms/Controller - oe_runmake -C ${S}/ExternalPrograms/Spliter - # Create dummy lv2-turtles to make install happy cd ${B}/src/Plugin/ for dir in `find -type d -mindepth 1 -maxdepth 1`; do @@ -67,11 +62,6 @@ do_compile_append() { 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 -} - FILES_${PN} += " \ ${libdir}/dssi \ ${libdir}/lv2 \ diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/files/0001-No-target-specific-asm.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0001-No-target-specific-asm.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zynaddsubfx/files/0001-No-target-specific-asm.patch rename to recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0001-No-target-specific-asm.patch diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/files/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zynaddsubfx/files/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch rename to recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/files/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zynaddsubfx/files/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch rename to recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/files/0004-Keep-our-build-flags.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0004-Keep-our-build-flags.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zynaddsubfx/files/0004-Keep-our-build-flags.patch rename to recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0004-Keep-our-build-flags.patch diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/files/0005-Set-UI-optimization-to-O1-explicitly.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0005-Set-UI-optimization-to-O1-explicitly.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zynaddsubfx/files/0005-Set-UI-optimization-to-O1-explicitly.patch rename to recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0005-Set-UI-optimization-to-O1-explicitly.patch diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx.bb b/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx.bb new file mode 100644 index 00000000..2e93014e --- /dev/null +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx.bb @@ -0,0 +1,19 @@ +require zyn.inc + +SUMMARY = "ZynAddSubFX is an open source software synthesizer" + +DEPENDS += " \ + ntk-native ntk \ + fltk-native fltk \ +" + +do_compile_append() { + # Build Controller/Spliter + oe_runmake -C ${S}/ExternalPrograms/Controller + oe_runmake -C ${S}/ExternalPrograms/Spliter +} + +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 +}