From 5df85b7600465c8854e6eb68d6185f7256fc24fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 16 Sep 2018 22:37:19 +0200 Subject: [PATCH] zyn: Remove -O1 Patch - fltk interface is gone for long time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-multimedia/zynaddsubfx/zyn.inc | 1 - ...Set-UI-optimization-to-O1-explicitly.patch | 34 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0005-Set-UI-optimization-to-O1-explicitly.patch diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc index b0dd6f4b..3062c116 100644 --- a/recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc +++ b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn.inc @@ -29,7 +29,6 @@ SRC_URI = " \ 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 \ " SRCREV = "6f8a61f6ee74316e471495f040660318a339d0c7" PV = "3.0.3+git${SRCPV}" diff --git a/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0005-Set-UI-optimization-to-O1-explicitly.patch b/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0005-Set-UI-optimization-to-O1-explicitly.patch deleted file mode 100644 index d3285ada..00000000 --- a/recipes-misc/recipes-multimedia/zynaddsubfx/zyn/0005-Set-UI-optimization-to-O1-explicitly.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 -