zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-01-29 17:18:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

zynaddsubfx/zyn-fusion: upgrade 3.0.5 -> 3.0.6

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-05-21 13:18:52 +02:00
parent 13e2cb6f94
commit 427d5f489d
4 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
recipes-musicians/zyn/zyn.inc
View File

@@ -2,7 +2,7 @@ HOMEPAGE = "http://zynaddsubfx.sourceforge.net"
LICENSE = "GPL-2.0-only" LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=21fa88a5e50a1c608d22612c1fbe1971" LIC_FILES_CHKSUM = "file://COPYING;md5=21fa88a5e50a1c608d22612c1fbe1971"
inherit cmake qemu-ext-musicians pkgconfig gtk-icon-cache features_check pack_audio_plugins inherit cmake qemu-ext-musicians pkgconfig gtk-icon-cache features_check pack_audio_plugins bash-completion
REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES = "x11"
@@ -30,11 +30,14 @@ SRC_URI = " \
file://0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.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://0004-Keep-our-build-flags.patch \
" "
SRCREV = "4d4aedf834dbd13c6e5f07ac512c9da74732fd58" SRCREV = "be9fc502748c8b19fc4ab67751428734549d958b"
PV = "3.0.5" PV = "3.0.6"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
EXTRA_OECMAKE += "-DPluginLibDir=${baselib}" EXTRA_OECMAKE += " \
-DCompileTests=OFF \
-DPluginLibDir=${baselib} \
"
do_configure:prepend() { do_configure:prepend() {
# reconfigure? # reconfigure?

21
recipes-musicians/zyn/zyn/0001-No-target-specific-asm.patch
View File

@@ -14,25 +14,28 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 file changed, 8 deletions(-) 1 file changed, 8 deletions(-)
diff --git a/src/globals.h b/src/globals.h diff --git a/src/globals.h b/src/globals.h
index f3fb1c7..e6a908d 100644 index 81eef126..d7140482 100644
--- a/src/globals.h --- a/src/globals.h
+++ b/src/globals.h +++ b/src/globals.h
@@ -252,15 +252,7 @@ enum LegatoMsg { @@ -256,18 +256,10 @@ enum LegatoMsg {
}; };
//is like i=(int)(floor(f)) //is like i=(int)(floor(f))
-#ifdef ASM_F2I_YES -#ifdef ASM_F2I_YES
-#define F2I(f, \ -#define F2I(f, i)\
- i) __asm__ __volatile__ ("fistpl %0" : "=m" (i) : "t" (f \ - do {\
- - \ - __asm__ __volatile__\
- 0.49999999f) \ - ("fistpl %0" : "=m" (i) : "t" (f - 0.49999999f) : "st");\
- : "st"); - } while (false)
-#else -#else
#define F2I(f, i) (i) = ((f > 0) ? ((int)(f)) : ((int)(f - 1.0f))); #define F2I(f, i)\
do {\
(i) = ((f > 0) ? ((int)(f)) : ((int)(f - 1.0f)));\
} while (false)
-#endif -#endif
-- --
2.5.5 2.34.1

17
recipes-musicians/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch
View File

@@ -11,14 +11,14 @@ Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
--- ---
src/Nio/Nio.cpp | 15 +-------------- src/Nio/Nio.cpp | 13 -------------
1 file changed, 1 insertion(+), 14 deletions(-) 1 file changed, 13 deletions(-)
diff --git a/src/Nio/Nio.cpp b/src/Nio/Nio.cpp diff --git a/src/Nio/Nio.cpp b/src/Nio/Nio.cpp
index 1e26b65..9bbb5bc 100644 index 1b3056c3..6df2059d 100644
--- a/src/Nio/Nio.cpp --- a/src/Nio/Nio.cpp
+++ b/src/Nio/Nio.cpp +++ b/src/Nio/Nio.cpp
@@ -136,21 +136,8 @@ string Nio::getSink() @@ -136,19 +136,6 @@ string Nio::getSink()
#include <jack/jack.h> #include <jack/jack.h>
void Nio::preferredSampleRate(unsigned &rate) void Nio::preferredSampleRate(unsigned &rate)
{ {
@@ -29,18 +29,15 @@ index 1e26b65..9bbb5bc 100644
- while(fgets(buffer, sizeof(buffer), ps)) - while(fgets(buffer, sizeof(buffer), ps))
- if(strstr(buffer, "jack")) - if(strstr(buffer, "jack"))
- break; - break;
- fclose(ps); - pclose(ps);
- -
- if(!strstr(buffer, "jack")) - if(!strstr(buffer, "jack"))
- return; - return;
-#endif -#endif
- -
jack_client_t *client = jack_client_open("temp-client", jack_client_t *client = jack_client_open("temp-client",
- JackNoStartServer, 0); JackNoStartServer, 0);
+ JackNullOption, 0);
if(client) { if(client) {
rate = jack_get_sample_rate(client);
jack_client_close(client);
-- --
2.9.4 2.34.1

37
recipes-musicians/zyn/zyn/0004-Keep-our-build-flags.patch
View File

@@ -10,32 +10,29 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
--- ---
src/CMakeLists.txt | 5 +---- src/CMakeLists.txt | 4 ----
1 file changed, 1 insertion(+), 4 deletions(-) 1 file changed, 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 365c129..1fa1b24 100644 index 2900f4b7..fa6f9e10 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -44,9 +44,6 @@ CHECK_CXX_SOURCE_COMPILES( @@ -251,15 +251,11 @@ set (BuildOptions_NEON
#endif CACHE STRING "Cortex_a9 compiler options"
int main(){return 0;}" HAVE_ASYNC) )
-check_cxx_compiler_flag("-msse2" SUPPORT_SSE) -check_cxx_compiler_flag("${BuildOptions_NEON} -Werror" SUPPORT_NEON)
-check_cxx_compiler_flag("-mfpu=neon -Werror" SUPPORT_NEON)
- -
set(CMAKE_REQUIRED_FLAGS "") set (BuildOptions_SSE
"-msse -msse2 -mfpmath=sse"
CACHE STRING "SSE compiler options"
)
-check_cxx_compiler_flag("${BuildOptions_SSE} -Werror" SUPPORT_SSE)
@@ -328,7 +325,7 @@ if (BuildForDebug) -
else (BuildForDebug) set (BuildOptionsBasic
set (CMAKE_BUILD_TYPE "Release") "-std=c++11 -Wno-unused-parameter -O3 -ffast-math -fomit-frame-pointer"
CACHE STRING "basic X86 compiler options"
- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+ set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS})
if (BuildForAMD_X86_64)
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}")
-- --
2.9.4 2.34.1