Version: 3.0.3

DSSI, LV2 and VST plugins added.

diff --git a/ZynAddSubFX-make-jN.patch b/ZynAddSubFX-make-jN.patch
deleted file mode 100644 (file)
index fded94a..0000000
--- a/ZynAddSubFX-make-jN.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ZynAddSubFX-2.2.1/src/UI/Makefile.orig     2007-12-21 13:48:31.153320111 +0100
-+++ ZynAddSubFX-2.2.1/src/UI/Makefile  2007-12-21 13:48:38.152252380 +0100
-@@ -2,6 +2,8 @@
- 
- %.cc  : %.fl
-       fluid -c $<
-+%.h  : %.fl
-+      fluid -c $<
- 
- objects=WidgetPDial.o PresetsUI.o EnvelopeUI.o LFOUI.o FilterUI.o VirKeyboard.o ConfigUI.o\
-       SUBnoteUI.o ResonanceUI.o OscilGenUI.o ADnoteUI.o PADnoteUI.o EffUI.o BankUI.o \

diff --git a/ZynAddSubFX.desktop b/ZynAddSubFX.desktop
deleted file mode 100644 (file)
index d056744..0000000
--- a/ZynAddSubFX.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=ZynAddSubFX
-Name[pl]=ZynAddSubFX
-Comment=Software synthesizer
-Comment[pl]=Syntezator programowy
-Exec=/usr/bin/zynaddsubfx
-Icon=
-Terminal=false
-Type=Application
-Categories=Audio;
-# vi: encoding=utf-8

diff --git a/ZynAddSubFX.spec b/ZynAddSubFX.spec
index 32a36bb4366ef85f3557491c0828a102587ea3c2..5efe34826777baee48fc7b4eec786df22f1aa4df 100644 (file)
--- a/ZynAddSubFX.spec
+++ b/ZynAddSubFX.spec
@@ -2,25 +2,34 @@
 Summary:       Realtime software synthesizer
 Summary(pl.UTF-8):     Syntezator programowy działający w czasie rzeczywistym
 Name:          ZynAddSubFX
-Version:       2.4.1
+Version:       3.0.3
 Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
-Source0:       http://dl.sourceforge.net/%{namelc}/%{name}-%{version}.tar.bz2
-# Source0-md5: 59eb69ce24d6f8c605f8ba43958d0526
-Source1:       %{name}.desktop
-Patch0:                %{name}-make-jN.patch
+Source0:       http://downloads.sourceforge.net/%{namelc}/%{namelc}-%{version}.tar.bz2
+# Source0-md5: 66acae0913108f129aa979f3c4b65473
+Patch0:                cxx_flags.patch
 URL:           http://zynaddsubfx.sourceforge.net/
 BuildRequires: alsa-lib-devel
+#BuildRequires:        doxygen
+BuildRequires: dssi >= 0.9.0
 BuildRequires: fftw3-devel
 BuildRequires: fltk-devel >= 1.1.3
 BuildRequires: jack-audio-connection-kit-devel >= 0.66.3
+BuildRequires: lash-devel
+BuildRequires: liblo-devel >= 0.28
 BuildRequires: mxml-devel >= 2.2
 BuildRequires: pkgconfig
+BuildRequires: portaudio >= 19
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
+BuildRequires: xorg-lib-libICE-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoprovfiles        %{_libdir}/(dssi|lv2|vst)
+
 %description
 ZynAddSubFX is a software synthesizer capable of making a countless
 number of instruments.
@@ -29,40 +38,92 @@ number of instruments.
 ZynAddSubFX jest programowym syntezatorem zdolnym do tworzenia
 niezliczonej ilości instrumentów.
 
+%package dssi
+Summary:       Realtime software synthesizer - DSSI plugin
+Summary(pl.UTF-8):     Syntezator programowy działający w czasie rzeczywistym, plugin DSSI
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+
+%description dssi
+ZynAddSubFX software synthesizer as a DSSI plugin.
+
+%description dssi -l pl.UTF-8
+Syntezator ZynAddSubFX jako wtyczka DSSI.
+
+%package lv2
+Summary:       Realtime software synthesizer - LV2 plugin
+Summary(pl.UTF-8):     Syntezator programowy działający w czasie rzeczywistym, plugin LV2
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+
+%description lv2
+ZynAddSubFX software synthesizer as a LV2 plugin.
+
+%description lv2 -l pl.UTF-8
+Syntezator ZynAddSubFX jako wtyczka LV2.
+
+%package vst
+Summary:       Realtime software synthesizer - VST plugin
+Summary(pl.UTF-8):     Syntezator programowy działający w czasie rzeczywistym, plugin VST
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+
+%description vst
+ZynAddSubFX software synthesizer as a VST plugin.
+
+%description vst -l pl.UTF-8
+Syntezator ZynAddSubFX jako wtyczka VST.
+
 %prep
-%setup -q
+%setup -qn %{namelc}-%{version}
+
 %patch0 -p1
-sed -i -e "s|-O6|\$(OPTFLAGS)|" src/Makefile
 
 %build
-%{__make} -C src \
-%ifnarch %{ix86} %{x8664}
-       ASM_F2I=NO \
-%endif
-       OPTFLAGS="%{rpmcflags}" \
-       LINUX_AUDIOOUT="OSS_AND_JACK" \
-       CXX="%{__cxx}"
 
-%{__make} -C doc
+mkdir build
+cd build
+%cmake .. \
+       -DPluginLibDir=%{_lib} \
+       -DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags}"
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{namelc}} \
        $RPM_BUILD_ROOT%{_desktopdir}
 
-install -c src/zynaddsubfx $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install -c doc/%{namelc}.html $RPM_BUILD_ROOT%{_datadir}/%{namelc}
-cp -r examples $RPM_BUILD_ROOT%{_datadir}/%{namelc}/
-cp -r banks $RPM_BUILD_ROOT%{_datadir}/%{namelc}/
-cp -r doc/images $RPM_BUILD_ROOT%{_datadir}/%{namelc}/
+%{__make} -C build install \
+       DESTDIR="$RPM_BUILD_ROOT"
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc FAQ.txt HISTORY.txt README.txt
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{namelc}
-%{_desktopdir}/%{name}.desktop
+%doc AUTHORS.txt HISTORY.txt README.adoc
+%attr(755,root,root) %{_bindir}/zynaddsubfx
+%attr(755,root,root) %{_bindir}/zynaddsubfx-ext-gui
+%{_datadir}/zynaddsubfx
+%{_pixmapsdir}/zynaddsubfx.svg
+%{_desktopdir}/zynaddsubfx-*.desktop
+
+%files dssi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/dssi/libzynaddsubfx_dssi.so
+
+%files lv2
+%defattr(644,root,root,755)
+%dir %{_libdir}/lv2/*.lv2
+%dir %{_libdir}/lv2/ZynAddSubFX.lv2presets
+%attr(755,root,root) %{_libdir}/lv2/*.lv2/*.so
+%{_libdir}/lv2/*.lv2/*.ttl
+%{_libdir}/lv2/ZynAddSubFX.lv2presets/*.ttl
+
+%files vst
+%defattr(644,root,root,755)
+%dir %{_libdir}/vst
+%attr(755,root,root) %{_libdir}/vst/*.so

diff --git a/cxx_flags.patch b/cxx_flags.patch
new file mode 100644 (file)
index 0000000..d8ab0db
--- /dev/null
+++ b/cxx_flags.patch
@@ -0,0 +1,12 @@
+diff -dur -x '*~' zynaddsubfx-3.0.3.orig/src/CMakeLists.txt zynaddsubfx-3.0.3/src/CMakeLists.txt
+--- zynaddsubfx-3.0.3.orig/src/CMakeLists.txt  2017-10-31 02:40:45.000000000 +0100
++++ zynaddsubfx-3.0.3/src/CMakeLists.txt       2018-05-28 13:51:18.000000000 +0200
+@@ -311,7 +311,7 @@
+ else (BuildForDebug)
+       set (CMAKE_BUILD_TYPE "Release")
+       
+-      set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
++      set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_PLD})
+       
+       if (BuildForAMD_X86_64)
+               set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}")