rpms/zynaddsubfx/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zynaddsubfx.desktop, 1.1, 1.2 zynaddsubfx.spec, 1.18, 1.19 zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch, 1.1, NONE zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch, 1.1, NONE zynaddsubfx-build-flags.patch, 1.1, NONE
Orcan Ogetbil
oget at fedoraproject.org
Fri Jul 23 21:07:21 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/zynaddsubfx/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8007
Modified Files:
.cvsignore sources zynaddsubfx.desktop zynaddsubfx.spec
Removed Files:
zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch
zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch
zynaddsubfx-build-flags.patch
Log Message:
* Thu Jul 22 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.1-1
- Version update
- Build the DSSI plugin since it is fixed now
- Put the common files between standalone ad DSSI synths in a common package
- Drop patches that are not necessary anymore
- Fix .desktop file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 6 Aug 2009 07:25:48 -0000 1.3
+++ .cvsignore 23 Jul 2010 21:07:20 -0000 1.4
@@ -1 +1 @@
-ZynAddSubFX-2.4.0.tar.bz2
+ZynAddSubFX-2.4.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 6 Aug 2009 07:25:48 -0000 1.3
+++ sources 23 Jul 2010 21:07:20 -0000 1.4
@@ -1 +1 @@
-b60b3c8a61c91e1aca54866d23c69f90 ZynAddSubFX-2.4.0.tar.bz2
+59eb69ce24d6f8c605f8ba43958d0526 ZynAddSubFX-2.4.1.tar.bz2
Index: zynaddsubfx.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynaddsubfx.desktop 6 Aug 2009 07:25:48 -0000 1.1
+++ zynaddsubfx.desktop 23 Jul 2010 21:07:21 -0000 1.2
@@ -6,4 +6,4 @@ Icon=zynaddsubfx
Type=Application
Exec=zynaddsubfx
Terminal=false
-Categories=AudioVideo;X-Synthesis;Midi;X-Jack;
+Categories=Audio;AudioVideo;X-Synthesis;Midi;X-Jack;
Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- zynaddsubfx.spec 10 Feb 2010 08:58:11 -0000 1.18
+++ zynaddsubfx.spec 23 Jul 2010 21:07:21 -0000 1.19
@@ -1,8 +1,9 @@
Summary: Real-time software synthesizer
Name: zynaddsubfx
-Version: 2.4.0
-Release: 3%{?dist}
-License: GPLv2+
+Version: 2.4.1
+Release: 1%{?dist}
+# Source is a collective work, distributed by
+License: GPLv2 and GPLv2+
Group: Applications/Multimedia
URL: http://zynaddsubfx.sourceforge.net
Source0: http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{version}.tar.bz2
@@ -10,25 +11,17 @@ Source1: zynaddsubfx.desktop
Patch0: zynaddsubfx-jack-support.patch
Patch1: zynaddsubfx-fltk-config-broken.patch
Patch2: zynaddsubfx-fltk-config-broken-2.patch
-Patch3: zynaddsubfx-build-flags.patch
-# Fixed error that prevented XMLwrapper from loading files on Fedora
-# http://sourceforge.net/support/tracker.php?aid=2852148
-# Also RHBZ #518755
-Patch4: zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch
-Patch5: zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch
-# Fix DSO-linking failure
-#
Patch6: zynaddsubfx-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: fltk >= 1.1.3
Requires: mxml >= 2.2
Requires: hicolor-icon-theme
+Requires: %{name}-common = %{version}-%{release}
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
-#dssi support is broken for now
-#BuildRequires: dssi-devel
+BuildRequires: dssi-devel
BuildRequires: fftw3-devel
BuildRequires: fltk-devel
BuildRequires: fltk-fluid
@@ -46,25 +39,72 @@ countless number of instrument sounds. I
made by it sounds like those from professional keyboards. The program has
effects like Reverb, Echo, Chorus, Phaser...
+This package includes the standalone implementation of the synthesizer.
+
+%package common
+Summary: Common files for ZynAddSubFX synthesizers
+Group: Applications/Multimedia
+BuildArch: noarch
+
+%description common
+ZynAddSubFX is an open source software synthesizer capable of making a
+countless number of instrument sounds. It is microtonal, and the instruments
+made by it sounds like those from professional keyboards. The program has
+effects like Reverb, Echo, Chorus, Phaser...
+
+This package includes the common files needed by the implementations of the
+synthesizer.
+
+%package dssi
+Summary: Real-time software synthesizer for DSSI
+Group: Applications/Multimedia
+Requires: %{name}-common = %{version}-%{release}
+Requires: dssi
+
+%description dssi
+ZynAddSubFX is an open source software synthesizer capable of making a
+countless number of instrument sounds. It is microtonal, and the instruments
+made by it sounds like those from professional keyboards. The program has
+effects like Reverb, Echo, Chorus, Phaser...
+
+This package includes the DSSI implementation of the synthesizer.
+
%prep
%setup -q -n ZynAddSubFX-%{version}
%patch0 -p1 -b .jack
%patch1 -p0 -b .fltk1
%patch2 -p1 -b .fltk2
-%patch3 -p1 -b .flags
-%patch4 -p1 -b .doxy
-%patch5 -p1 -b .loadfiles
%patch6 -p1 -b .linking
-%build
+# Fix encoding
+for i in AUTHORS.txt ChangeLog; do
+ iconv -f iso8859-1 -t utf8 $i -o tmpfile
+ touch -r $i tmpfile
+ mv -f tmpfile $i
+done
+
+
+# Fix flags
+sed -i -e "s|-ggdb|$RPM_OPT_FLAGS|" src/Makefile
+
%ifarch %{ix86} x86_64
# We're ok.
%else
sed -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
%endif
+# To build the DSSI plugin
+sed -i -e "s|LINUX_DSSI=NO|LINUX_DSSI=YES|" src/Makefile.inc
+%build
+
cd src
# do not use smp flags, makefile is not smp safe
+# first build the dssi plugin
+make
+mv zynaddsubfx.so ../
+make clean
+# next build the rest
+sed -i -e "s|LINUX_DSSI=YES|LINUX_DSSI=NO|" Makefile.inc
make
# build external programs
@@ -77,19 +117,22 @@ make
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/dssi
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
tar cf - examples banks presets | \
(cd $RPM_BUILD_ROOT%{_datadir}/%{name}; tar xvpf -)
cd src
install -m 0755 zynaddsubfx $RPM_BUILD_ROOT%{_bindir}
+cd ..
+install -m 0755 zynaddsubfx.so $RPM_BUILD_ROOT%{_libdir}/dssi/
# install external programs
-cd ../ExternalPrograms
+cd ExternalPrograms
cd Controller
-install -m 0755 zynaddsubfx-controller $RPM_BUILD_ROOT%{_bindir}/controller
+install -m 0755 zynaddsubfx-controller $RPM_BUILD_ROOT%{_bindir}/
cd ../Spliter
-install -m 0755 zynaddsubfx-spliter $RPM_BUILD_ROOT%{_bindir}/spliter
+install -m 0755 zynaddsubfx-spliter $RPM_BUILD_ROOT%{_bindir}/
cd ../..
# .desktop file
@@ -130,9 +173,7 @@ gtk-update-icon-cache %{_datadir}/icons/
%files
%defattr(-,root,root,-)
-%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
%{_bindir}/*
-%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/zynaddsubfx.png
%{_datadir}/icons/hicolor/16x16/apps/zynaddsubfx.png
@@ -140,7 +181,23 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/icons/hicolor/48x48/apps/zynaddsubfx.png
%{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
+%files common
+%defattr(-,root,root,-)
+%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
+%{_datadir}/%{name}/
+
+%files dssi
+%defattr(-,root,root,-)
+%{_libdir}/dssi/*.so
+
%changelog
+* Thu Jul 22 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.1-1
+- Version update
+- Build the DSSI plugin since it is fixed now
+- Put the common files between standalone ad DSSI synths in a common package
+- Drop patches that are not necessary anymore
+- Fix .desktop file
+
* Wed Feb 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0-3
- Fix DSO-linking failure
--- zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch DELETED ---
--- zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch DELETED ---
--- zynaddsubfx-build-flags.patch DELETED ---
More information about the scm-commits
mailing list