The package rpms/zam-plugins.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/zam-plugins.git/commit/?id=30b616171....
Change: +%ifarch x86_64
Thanks.
Full change: ============
commit ded0166eb2e833f80a399f2c4b319ae7aaf8cd42 Author: Guido Aulisi guido.aulisi@gmail.com Date: Tue May 15 12:31:15 2018 +0000
Escape macros in changelog
diff --git a/zam-plugins.spec b/zam-plugins.spec index 31cb0a8..c599847 100644 --- a/zam-plugins.spec +++ b/zam-plugins.spec @@ -6,7 +6,7 @@
Name: zam-plugins Version: %{gittag} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of LV2/LADSPA/JACK audio plugins
License: GPLv2+ and ISC @@ -98,8 +98,11 @@ rm -rf %{buildroot}%{_libdir}/vst %{buildroot}/*-dssi* %doc README.md
%changelog +* Tue May 15 2018 Guido Aulisi guido.aulisi@gmail.com - 3.10-3 +- Escape macros in changelog + * Sun May 13 2018 Guido Aulisi guido.aulisi@gmail.com - 3.10-2 -- Use %set_build_flags macro +- Use set_build_flags macro - Document Patch0
* Wed May 9 2018 Guido Aulisi guido.aulisi@gmail.com - 3.10-1
commit 30b6161715b3bf5035cfa1eae51e6ad3c48d9d1d Author: Guido Aulisi guido.aulisi@gmail.com Date: Tue May 15 06:57:36 2018 +0000
Initial import (#1576836)
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..742b2e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/DPF-279c265.tar.gz +/zam-plugins-3.10.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 32bd8d7..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# zam-plugins - -The zam-plugins package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..cb2e807 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (DPF-279c265.tar.gz) = e924c15822a37bec8f38e75a44e9f06a4f95ca14bf41db03f882fa6cfc3d106c84043f9f62f2a6579c095ee9b61eec74c28fc46d912d8481f1aeff45d81eb37d +SHA512 (zam-plugins-3.10.tar.gz) = 8169fdb474bd0a19b877fd36496fdb3cbf197516ff721d5d14ab70361673fcb099dfe1ceb91e285f2a77a0189a9451819d5117d7c068e3cd2597917190e0d35b diff --git a/zam-plugins-unbundle-zita-convolver.patch b/zam-plugins-unbundle-zita-convolver.patch new file mode 100644 index 0000000..1f64c55 --- /dev/null +++ b/zam-plugins-unbundle-zita-convolver.patch @@ -0,0 +1,131 @@ +diff --git a/Makefile.mk b/Makefile.mk +index 7588326..87c08a1 100644 +--- a/Makefile.mk ++++ b/Makefile.mk +@@ -85,6 +85,14 @@ ifeq ($(LINUX),true) + HAVE_DGL = $(shell pkg-config --exists gl x11 && echo true) + HAVE_JACK = $(shell pkg-config --exists jack && echo true) + HAVE_LIBLO = $(shell pkg-config --exists liblo && echo true) ++ ++# Allow to use system provided libs ++ifeq ($(USE_SYSTEM_LIBS),1) ++HAVE_ZITA_CONVOLVER = true ++ZITA_CONVOLVER_LIBS = -lzita-convolver ++export HAVE_ZITA_CONVOLVER ++endif ++ + endif + + ifeq ($(MACOS),true) +diff --git a/plugins/ZamHeadX2/Makefile b/plugins/ZamHeadX2/Makefile +index 24bfe1d..cd8e06a 100644 +--- a/plugins/ZamHeadX2/Makefile ++++ b/plugins/ZamHeadX2/Makefile +@@ -12,8 +12,11 @@ NAME = ZamHeadX2 + # -------------------------------------------------------------- + # Files to build + +-OBJS_DSP = \ +- ../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o \ ++ifneq ($(HAVE_ZITA_CONVOLVER),true) ++OBJS_DSP = ../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o ++endif ++ ++OBJS_DSP += \ + convolution.cpp.o \ + ZamHeadX2Plugin.cpp.o + +@@ -48,6 +51,11 @@ else + TARGETS += lv2_dsp + endif + ++ifeq ($(HAVE_ZITA_CONVOLVER),true) ++BASE_FLAGS += -DHAVE_ZITA_CONVOLVER ++LINK_FLAGS += $(ZITA_CONVOLVER_LIBS) ++endif ++ + TARGETS += vst + + all: $(TARGETS) +diff --git a/plugins/ZamHeadX2/convolution.hpp b/plugins/ZamHeadX2/convolution.hpp +index ddf3d08..03e9d55 100644 +--- a/plugins/ZamHeadX2/convolution.hpp ++++ b/plugins/ZamHeadX2/convolution.hpp +@@ -19,7 +19,11 @@ + #ifndef CONVOLUTION_H_ + #define CONVOLUTION_H_ + ++#ifdef HAVE_ZITA_CONVOLVER ++#include "zita-convolver.h" ++#else + #include "../../lib/zita-convolver-3.1.0/zita-convolver.h" ++#endif + + #define MAX_CHANNEL_MAPS (4) + #define VERBOSE_printf(x, ...) +diff --git a/plugins/ZamVerb/Makefile b/plugins/ZamVerb/Makefile +index cfa412c..d65dd1e 100644 +--- a/plugins/ZamVerb/Makefile ++++ b/plugins/ZamVerb/Makefile +@@ -15,8 +15,11 @@ NAME = ZamVerb + OBJS_DSP = \ + ZamVerbPlugin.cpp.o \ + ZamVerbImpulses.cpp.o \ +- convolution.cpp.o \ +- ../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o ++ convolution.cpp.o ++ ++ifneq ($(HAVE_ZITA_CONVOLVER),true) ++OBJS_DSP += ../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o ++endif + + OBJS_UI = \ + ZamVerbArtwork.cpp.o \ +@@ -28,7 +31,6 @@ OBJS_UI = \ + include ../Makefile.mk + + # -------------------------------------------------------------- +-# Enable all possible plugin types + + ifeq ($(HAVE_JACK),true) + TARGETS += jack +@@ -49,6 +51,11 @@ else + TARGETS += lv2_dsp + endif + ++ifeq ($(HAVE_ZITA_CONVOLVER),true) ++BASE_FLAGS += -DHAVE_ZITA_CONVOLVER ++LINK_FLAGS += $(ZITA_CONVOLVER_LIBS) ++endif ++ + TARGETS += vst + + all: $(TARGETS) +diff --git a/plugins/ZamVerb/convolution.cpp b/plugins/ZamVerb/convolution.cpp +index 517a3cb..48a8d8c 100644 +--- a/plugins/ZamVerb/convolution.cpp ++++ b/plugins/ZamVerb/convolution.cpp +@@ -42,7 +42,6 @@ + #include <pthread.h> + #include <assert.h> + +-#include "../../lib/zita-convolver-3.1.0/zita-convolver.h" + #include <samplerate.h> + #include "convolution.hpp" + #include "ZamVerbImpulses.hpp" +diff --git a/plugins/ZamVerb/convolution.hpp b/plugins/ZamVerb/convolution.hpp +index 4eeada5..666f2a5 100644 +--- a/plugins/ZamVerb/convolution.hpp ++++ b/plugins/ZamVerb/convolution.hpp +@@ -19,7 +19,11 @@ + #ifndef CONVOLUTION_H_ + #define CONVOLUTION_H_ + ++#ifdef HAVE_ZITA_CONVOLVER ++#include "zita-convolver.h" ++#else + #include "../../lib/zita-convolver-3.1.0/zita-convolver.h" ++#endif + + #define MAX_CHANNEL_MAPS (4) + #define VERBOSE_printf(x, ...) diff --git a/zam-plugins.spec b/zam-plugins.spec new file mode 100644 index 0000000..31cb0a8 --- /dev/null +++ b/zam-plugins.spec @@ -0,0 +1,106 @@ +%global gittag 3.10 +%global dpf DPF + +%global commit1 279c265361a9da5a1491107585c75284e0dc0e18 +%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) + +Name: zam-plugins +Version: %{gittag} +Release: 2%{?dist} +Summary: A collection of LV2/LADSPA/JACK audio plugins + +License: GPLv2+ and ISC +URL: http://www.zamaudio.com/ +Source0: https://github.com/zamaudio/%%7Bname%7D/archive/%%7Bgittag%7D/%%7Bname%7D-%%... +Source1: https://github.com/DISTRHO/DPF/archive/%%7Bcommit1%7D/%%7Bdpf%7D-%%7Bshortco... +# Patch sent upstream https://github.com/zamaudio/zam-plugins/pull/62 +Patch0: %{name}-unbundle-zita-convolver.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libX11-devel +BuildRequires: mesa-libGL-devel +BuildRequires: liblo-devel +BuildRequires: lv2-devel >= 1.8.1 +BuildRequires: ladspa-devel +BuildRequires: fftw-devel >= 3.3.5 +BuildRequires: libsamplerate-devel +BuildRequires: zita-convolver-devel >= 3.1.0 + +%package -n lv2-zam-plugins +Summary: A collection of LV2/LADSPA/JACK audio plugins. LV2 version +Requires: lv2 >= 1.8.1 + +%package -n ladspa-zam-plugins +Summary: A collection of LV2/LADSPA/JACK audio plugins. LADSPA version +Requires: ladspa + +%description +zam-plugins is a collection of LV2/LADSPA/VST/JACK audio plugins +for sound processing developed in-house at ZamAudio. + +%description -n lv2-zam-plugins +zam-plugins is a collection of LV2/LADSPA/VST/JACK audio plugins +for sound processing developed in-house at ZamAudio. +This is the LV2 version. + +%description -n ladspa-zam-plugins +zam-plugins is a collection of LV2/LADSPA/VST/JACK audio plugins +for sound processing developed in-house at ZamAudio. +This is the LADSPA version. + +%prep +%autosetup -a 1 -p 1 +# Move submodule DPF to main source directory +rmdir dpf +mv %{dpf}-%{commit1} dpf + +%build +# This package does not build on all arches with upstream build flags, +# so upstream build flags are split. +# These are realtime audio plugins, so we need the fastest possible math, +# flags for x86_64 are set to be compatible with most AMD and Intel CPUs, +# and to use the best possible SIMD instruction set. +flags=" -ffast-math" + +%ifarch %{ix86} +flags+=" -msse -mfpmath=sse" +%endif + +%ifarch x86_64 +flags+=" -msse2 -mfpmath=sse" +%endif + +%set_build_flags + +%make_build PREFIX=%{_prefix} LIBDIR=%{_lib} USE_SYSTEM_LIBS=1 \ + BASE_OPTS="${flags}" LINK_OPTS="%{__global_ldflags}" + +%install +%make_install PREFIX=%{_prefix} LIBDIR=%{_lib} USE_SYSTEM_LIBS=1 +# We don't need VST and DSSI plugins +rm -rf %{buildroot}%{_libdir}/vst %{buildroot}/*-dssi* + +%files +%{_bindir}/* +%license LICENSE +%doc README.md + +%files -n lv2-zam-plugins +%{_libdir}/lv2/* +%license LICENSE +%doc README.md + +%files -n ladspa-zam-plugins +%{_libdir}/ladspa/* +%license LICENSE +%doc README.md + +%changelog +* Sun May 13 2018 Guido Aulisi guido.aulisi@gmail.com - 3.10-2 +- Use %set_build_flags macro +- Document Patch0 + +* Wed May 9 2018 Guido Aulisi guido.aulisi@gmail.com - 3.10-1 +- Version 3.10
arch-excludes@lists.fedoraproject.org