From b80fda9067498fd23d42c316d3933057378c9c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 3 Oct 2015 16:26:04 +0200 Subject: [PATCH] New package: zynaddsubfx-2.5.1 + Add dependency mxml-2.9 (Minimal XML library) --- common/shlibs | 1 + srcpkgs/mxml-devel | 1 + srcpkgs/mxml/template | 37 ++++++++++++++ srcpkgs/zynaddsubfx-data | 1 + srcpkgs/zynaddsubfx/patches/fix-memset.patch | 11 +++++ srcpkgs/zynaddsubfx/patches/musl-isnan.patch | 15 ++++++ srcpkgs/zynaddsubfx/template | 51 ++++++++++++++++++++ 7 files changed, 117 insertions(+) create mode 120000 srcpkgs/mxml-devel create mode 100644 srcpkgs/mxml/template create mode 120000 srcpkgs/zynaddsubfx-data create mode 100644 srcpkgs/zynaddsubfx/patches/fix-memset.patch create mode 100644 srcpkgs/zynaddsubfx/patches/musl-isnan.patch create mode 100644 srcpkgs/zynaddsubfx/template diff --git a/common/shlibs b/common/shlibs index 8b66154742..7431fbbd9b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2220,3 +2220,4 @@ libkeximain.so.14 calligra-kexi-2.9.7_1 libcalligrastageprivate.so.14 calligra-stage-2.9.7_1 libfts.so.0 musl-fts-1.2_2 libgavl.so.1 gavl-1.40_1 +libmxml.so.1 mxml-2.9_1 diff --git a/srcpkgs/mxml-devel b/srcpkgs/mxml-devel new file mode 120000 index 0000000000..07067b0fe7 --- /dev/null +++ b/srcpkgs/mxml-devel @@ -0,0 +1 @@ +mxml \ No newline at end of file diff --git a/srcpkgs/mxml/template b/srcpkgs/mxml/template new file mode 100644 index 0000000000..3778bb21d3 --- /dev/null +++ b/srcpkgs/mxml/template @@ -0,0 +1,37 @@ +# Template file for 'mxml' +pkgname=mxml +version=2.9 +revision=1 +build_style=gnu-configure +configure_args="--enable-static --enable-shared" +short_desc="Minimal XML library" +maintainer="Jürgen Buchmüller " +license="GPL-2" +homepage="http://www.minixml.org/" +distfiles="http://www.msweet.org/files/project3/${pkgname}-${version}.tar.gz" +checksum=cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92 + +pre_configure() { + # Disable testxml (fixes cross builds) + sed -i Makefile.in \ + -e "s;testmxml mxml.xml;mxml.xml;" + if [ "$CROSS_BUILD" ]; then + # Disable generating mxml.xml + sed -i Makefile.in \ + -e "/.*\.\/mxmldoc-static.*/d" + fi +} +do_install() { + make DSTROOT="${DESTDIR}" install +} + +mxml-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.a + vmove usr/lib/*.so + } +} diff --git a/srcpkgs/zynaddsubfx-data b/srcpkgs/zynaddsubfx-data new file mode 120000 index 0000000000..c896b602ef --- /dev/null +++ b/srcpkgs/zynaddsubfx-data @@ -0,0 +1 @@ +zynaddsubfx \ No newline at end of file diff --git a/srcpkgs/zynaddsubfx/patches/fix-memset.patch b/srcpkgs/zynaddsubfx/patches/fix-memset.patch new file mode 100644 index 0000000000..f7b32cd23c --- /dev/null +++ b/srcpkgs/zynaddsubfx/patches/fix-memset.patch @@ -0,0 +1,11 @@ +--- src/globals.h 2015-06-28 00:25:59.000000000 +0200 ++++ src/globals.h 2015-10-03 15:34:18.914712672 +0200 +@@ -25,6 +25,8 @@ + #ifndef GLOBALS_H + #define GLOBALS_H + ++#include /* memset(3) */ ++ + #if defined(__clang__) + #define REALTIME __attribute__((annotate("realtime"))) + #define NONREALTIME __attribute__((annotate("nonrealtime"))) diff --git a/srcpkgs/zynaddsubfx/patches/musl-isnan.patch b/srcpkgs/zynaddsubfx/patches/musl-isnan.patch new file mode 100644 index 0000000000..a672f84f09 --- /dev/null +++ b/srcpkgs/zynaddsubfx/patches/musl-isnan.patch @@ -0,0 +1,15 @@ +--- src/DSP/FFTwrapper.h 2015-06-28 00:25:59.000000000 +0200 ++++ src/DSP/FFTwrapper.h 2015-10-03 16:51:40.456350543 +0200 +@@ -58,10 +58,10 @@ + FFTpolar(const _Tp& __rho, const _Tp& __theta = _Tp(0)) + { + _Tp __x = __rho * cos(__theta); +- if (isnan(__x)) ++ if (std::isnan(__x)) + __x = 0; + _Tp __y = __rho * sin(__theta); +- if (isnan(__y)) ++ if (std::isnan(__y)) + __y = 0; + return std::complex<_Tp>(__x, __y); + } diff --git a/srcpkgs/zynaddsubfx/template b/srcpkgs/zynaddsubfx/template new file mode 100644 index 0000000000..324ce931f2 --- /dev/null +++ b/srcpkgs/zynaddsubfx/template @@ -0,0 +1,51 @@ +# Template file for 'zynaddsubfx' +pkgname=zynaddsubfx +version=2.5.1 +revision=1 +build_style=cmake +configure_args="-DDefaultOutput=jack -DDefaultInput=jack -DGuiModule=fltk" +hostmakedepends="cmake doxygen fltk pkg-config" +makedepends="fltk-devel fftw-devel liblo-devel libXpm-devel mxml-devel + jack-devel portaudio-devel" +depends="zynaddsubfx-data>=0" +short_desc="Open Source software synthesizer" +maintainer="Jürgen Buchmüller " +license="GPL-2" +homepage="http://zynaddsubfx.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=e2e3b92cfc4c2add5e7af6afc81dc74e31509459034b0680372dabbf68d98405 + +pre_configure() { + case "${XBPS_TARGET_MACHINE}" in + armv[67]*) + # Disable sse, sse2 and fpmath=sse + sed -i src/CMakeLists.txt \ + -e "s; -msse -msse2 -mfpmath=sse;;" + sed -i src/globals.h \ + -e "/#ifdef ASM_F2I_YES/i #undef ASM_F2I_YES" + ;; + esac +} +post_build() { + local ext + for ext in Spliter Controller; do + cd ${wrksrc}/ExternalPrograms/${ext} + # Replace gcc with the target C compiler + sed -i Makefile -e "s;gcc;${CC};g" + # Build external program + make ${makejobs} + done +} +post_install() { + # Install external programs + vbin ${wrksrc}/ExternalPrograms/Spliter/spliter + vdoc ${wrksrc}/ExternalPrograms/Spliter/readme.txt SPLITER.txt + vbin ${wrksrc}/ExternalPrograms/Controller/controller +} +zynaddsubfx-data_package() { + short_desc+=" - data" + noarch=yes + pkg_install() { + vmove usr/share/${sourcepkg} + } +}