diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/files/0005-Set-UI-optimization-to-O1-explicitly.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/files/0005-Set-UI-optimization-to-O1-explicitly.patch new file mode 100644 index 00000000..d3285ada --- /dev/null +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/files/0005-Set-UI-optimization-to-O1-explicitly.patch @@ -0,0 +1,34 @@ +From ffc923d2edf0646cda38a816d8a03d38e5aa67ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 20 Jun 2017 00:27:31 +0200 +Subject: [PATCH] Set UI optimization to -O1 explicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +at least on ARM we see segfaults for higher optimizations + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/UI/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt +index 98b3d14..73c3a43 100644 +--- a/src/UI/CMakeLists.txt ++++ b/src/UI/CMakeLists.txt +@@ -52,6 +52,9 @@ elseif(NtkGui) + install(TARGETS zynaddsubfx-ext-gui RUNTIME DESTINATION bin) + endif() + ++# At least for ARM fltk-GUI is segfaulting for -O2 -O3 ++set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1") ++ + add_library(zynaddsubfx_gui STATIC + ${UI_objs} + ${zynaddsubfx_gui_FLTK_UI_SRCS} +-- +2.9.4 + diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_2.5.4.bb b/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_3.0.1.bb similarity index 89% rename from recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_2.5.4.bb rename to recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_3.0.1.bb index af20af0e..9baf3fa6 100644 --- a/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_2.5.4.bb +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_3.0.1.bb @@ -22,21 +22,25 @@ DEPENDS += " \ libxpm \ " +CXXFLAGS += "-ffast-math" + 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 \ file://0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch \ file://0004-Keep-our-build-flags.patch \ + file://0005-Set-UI-optimization-to-O1-explicitly.patch \ " -SRC_URI[md5sum] = "7dc757512e5b6f3013bfb168ed01cfa3" -SRC_URI[sha256sum] = "014b1d9ad1750c310369676b46a4555ba6bec512c38ccba17ceb89c78552949a" +SRC_URI[md5sum] = "bca8fc104bf31103d603a3d2bcc10027" +SRC_URI[sha256sum] = "a8017f382be5af9e46e6e8771fb7d7c1fd2e480cf099bbb0c29606b217dd32e2" do_configure_prepend() { # We cannot run lv2-ttl-generator in cross environment so keep commands in # shell script. Builddir is deleted so keep our script in ${WORKDIR} # manipulate CMakeLists.txt to keep commands in script + sed -i 's|../../lv2-ttl-generator|lv2-ttl-generator|g' `find ${S} -name CMakeLists.txt` sed -i 's|lv2-ttl-generator $> ${WORKDIR}/lv2-ttl-generator-data|g' `find ${S} -name CMakeLists.txt` }