From 6ead88f7fbe319db2868528b65a7a3eef50a554a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 29 Mar 2020 09:06:14 +0200 Subject: [PATCH] zynaddsubfx: patch out ill-conceived code; fix armv5* --- .../zynaddsubfx/patches/fix-bogus-strstr.patch | 16 ++++++++++++++++ srcpkgs/zynaddsubfx/template | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 srcpkgs/zynaddsubfx/patches/fix-bogus-strstr.patch diff --git a/srcpkgs/zynaddsubfx/patches/fix-bogus-strstr.patch b/srcpkgs/zynaddsubfx/patches/fix-bogus-strstr.patch new file mode 100644 index 00000000000..ed9a60a8d44 --- /dev/null +++ b/srcpkgs/zynaddsubfx/patches/fix-bogus-strstr.patch @@ -0,0 +1,16 @@ +Source: @pullmoll +Upstream: no +Reason: This piece of code is ill-conceived and cannot work. Remove it. + +--- rtosc/src/dispatch.c 2019-03-10 17:16:45.000000000 +0100 ++++ rtosc/src/dispatch.c 2020-03-29 09:02:42.916119722 +0200 +@@ -289,8 +289,7 @@ + return false; + } else if(type == 4) { + //extract substring +- const char *sub=NULL; +- return strstr(a,sub); ++ return false; + } else if(type == RTOSC_MATCH_OPTIONS || type == 6) { + return false; + } else if(type == RTOSC_MATCH_ENUMERATED) { diff --git a/srcpkgs/zynaddsubfx/template b/srcpkgs/zynaddsubfx/template index 4ab054f4485..2361d8bd548 100644 --- a/srcpkgs/zynaddsubfx/template +++ b/srcpkgs/zynaddsubfx/template @@ -17,6 +17,9 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${ver checksum=7447322268114a1e0ac5f281ac37a09a78e761a7be61999caf79100049789f63 pre_configure() { + case "$XBPS_TARGET_MACHINE" in + armv5*) configure_args+=" -DSUPPORT_NEON=NO";; + esac # The x86 assembler check is broken for cross compiling case "$XBPS_TARGET_MACHINE" in x86_64*|i686*);;