rpms/zynaddsubfx/devel zynaddsubfx-build-flags.patch, NONE, 1.1 zynaddsubfx-jack-support.patch, NONE, 1.1 zynaddsubfx.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zynaddsubfx-fltk-config-broken-2.patch, 1.1, 1.2 zynaddsubfx.spec, 1.15, 1.16 zyn_lash-0.5.0pre0.diff, 1.1, NONE zynaddsubfx-unzombify.patch, 1.1, NONE
Orcan Ogetbil
oget at fedoraproject.org
Thu Aug 6 07:25:49 UTC 2009
Author: oget
Update of /cvs/pkgs/rpms/zynaddsubfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25521
Modified Files:
.cvsignore sources zynaddsubfx-fltk-config-broken-2.patch
zynaddsubfx.spec
Added Files:
zynaddsubfx-build-flags.patch zynaddsubfx-jack-support.patch
zynaddsubfx.desktop
Removed Files:
zyn_lash-0.5.0pre0.diff zynaddsubfx-unzombify.patch
Log Message:
* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
- Update to 2.4.0
- Update scriptlets according to new guidelines
- Update the .desktop file
- Use Fedora specific flags during compilation
- License is GPLv2+ (just run the program on the command line :))
zynaddsubfx-build-flags.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE zynaddsubfx-build-flags.patch ---
--- ZynAddSubFX-2.4.0.old/src/Makefile 2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile 2009-08-06 01:49:58.000000000 -0400
@@ -1,7 +1,7 @@
include Makefile.inc
ifneq ($(MAKECMDGOALS),debug)
- CXXFLAGS= -O6 -Wall -g
+ CXXFLAGS= $(RPM_OPT_FLAGS)
else
CXXFLAGS= -O0 -Wall -Wpointer-arith
endif
zynaddsubfx-jack-support.patch:
Makefile.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE zynaddsubfx-jack-support.patch ---
diff -rupN ZynAddSubFX-2.4.0.old/src/Makefile.inc ZynAddSubFX-2.4.0/src/Makefile.inc
--- ZynAddSubFX-2.4.0.old/src/Makefile.inc 2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile.inc 2009-08-06 00:52:56.000000000 -0400
@@ -29,9 +29,9 @@ LINUX_MIDIIN=ALSA
#parameters (run 'zynaddsubfx --help' for help)
#LINUX_AUDIOOUT=OSS_AND_JACK
-LINUX_AUDIOOUT=OSS
+#LINUX_AUDIOOUT=OSS
#LINUX_AUDIOOUT=NONE
-#LINUX_AUDIOOUT=JACK
+LINUX_AUDIOOUT=JACK
#LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken
#for PortAudio (PA)
#LINUX_AUDIOOUT=PA
--- NEW FILE zynaddsubfx.desktop ---
[Desktop Entry]
Name=ZynAddSubFX
Comment=Real-time software synthesizer
GenericName=Software Synthesizer
Icon=zynaddsubfx
Type=Application
Exec=zynaddsubfx
Terminal=false
Categories=AudioVideo;X-Synthesis;Midi;X-Jack;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 2 Sep 2006 04:54:47 -0000 1.2
+++ .cvsignore 6 Aug 2009 07:25:48 -0000 1.3
@@ -1 +1 @@
-ZynAddSubFX-2.2.1.tar.bz2
+ZynAddSubFX-2.4.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 2 Sep 2006 04:54:47 -0000 1.2
+++ sources 6 Aug 2009 07:25:48 -0000 1.3
@@ -1 +1 @@
-fca8560e37d799bd20d17e22b11674d6 ZynAddSubFX-2.2.1.tar.bz2
+b60b3c8a61c91e1aca54866d23c69f90 ZynAddSubFX-2.4.0.tar.bz2
zynaddsubfx-fltk-config-broken-2.patch:
Controller/Makefile | 10 +++++-----
Spliter/Makefile | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
Index: zynaddsubfx-fltk-config-broken-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx-fltk-config-broken-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynaddsubfx-fltk-config-broken-2.patch 2 Sep 2006 04:54:47 -0000 1.1
+++ zynaddsubfx-fltk-config-broken-2.patch 6 Aug 2009 07:25:48 -0000 1.2
@@ -1,32 +1,53 @@
---- ExternalPrograms/Controller/compile.sh~ 2006-07-20 23:56:05.000000000 -0700
-+++ ExternalPrograms/Controller/compile.sh 2006-07-20 23:55:48.000000000 -0700
-@@ -1,10 +1,10 @@
- ./clean.sh
- fluid -c ControllerUI.fl
--gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
--gcc `fltk-config --cflags` -c Controller.C -o Controller.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
-
-
-
--gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm
-+gcc -o controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
-
---- ExternalPrograms/Spliter/compile.sh~ 2005-03-12 10:16:26.000000000 -0800
-+++ ExternalPrograms/Spliter/compile.sh 2006-07-20 23:54:51.000000000 -0700
-@@ -1,8 +1,8 @@
- ./clean.sh
- fluid -c SpliterUI.fl
--gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
--gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
-
--gcc -o spliter *.o `fltk-config --ldflags` -lasound
-+gcc -o spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
-
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile 2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile 2009-08-06 01:45:49.000000000 -0400
+@@ -1,18 +1,18 @@
+ controller: main.o Controller.o ControllerUI.o
+- gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
++ gcc -o zynaddsubfx-controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
+
+ ControllerUI.cxx ControllerUI.h: ControllerUI.fl
+ fluid -c ControllerUI.fl
+
+ ControllerUI.o: ControllerUI.cxx ControllerUI.h
+- gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
++ gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
+
+ Controller.o: Controller.C Controller.h
+- gcc `fltk-config --cflags` -c Controller.C -o Controller.o
++ gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o
+
+ main.o: main.C Controller.h ControllerUI.h
+- gcc `fltk-config --cflags` -c main.C -o main.o
++ gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+
+ clean:
+- rm -f *.o controller ControllerUI.cxx ControllerUI.h
++ rm -f *.o zynaddsubfx-controller ControllerUI.cxx ControllerUI.h
+
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile 2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile 2009-08-06 01:46:05.000000000 -0400
+@@ -1,17 +1,17 @@
+ spliter: main.o Spliter.o SpliterUI.o
+- gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
++ gcc -o zynaddsubfx-spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
+
+ SplitterUI.cxx SpliterUI.h: SpliterUI.fl
+ fluid -c SpliterUI.fl
+
+ SpliterUI.o: SplitterUI.cxx SpliterUI.h
+- gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
++ gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+
+ Spliter.o: Spliter.C Spliter.h
+- gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
++ gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Spliter.C -o Spliter.o
+
+ main.o: main.C Spliter.h SpliterUI.h
+- gcc -g `fltk-config --cflags` -c main.C -o main.o
++ gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+
+ clean:
+- rm -f *.o spliter SpliterUI.cxx SpliterUI.h
++ rm -f *.o zynaddsubfx-spliter SpliterUI.cxx SpliterUI.h
Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- zynaddsubfx.spec 27 Jul 2009 09:05:22 -0000 1.15
+++ zynaddsubfx.spec 6 Aug 2009 07:25:48 -0000 1.16
@@ -1,15 +1,16 @@
Summary: Real-time software synthesizer
Name: zynaddsubfx
-Version: 2.2.1
-Release: 21%{?dist}
-License: GPLv2
+Version: 2.4.0
+Release: 1%{?dist}
+License: GPLv2+
Group: Applications/Multimedia
URL: http://zynaddsubfx.sourceforge.net
Source0: http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{version}.tar.bz2
-Patch0: zyn_lash-0.5.0pre0.diff
+Source1: zynaddsubfx.desktop
+Patch0: zynaddsubfx-jack-support.patch
Patch1: zynaddsubfx-fltk-config-broken.patch
Patch2: zynaddsubfx-fltk-config-broken-2.patch
-Patch3: zynaddsubfx-unzombify.patch
+Patch3: zynaddsubfx-build-flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: fltk >= 1.1.3
@@ -20,55 +21,42 @@ Requires: hicolor-icon-theme
BuildRequires: alsa-lib-devel fftw3-devel fltk-devel mxml-devel
BuildRequires: jack-audio-connection-kit-devel zlib-devel lash-devel
BuildRequires: libX11-devel fltk-fluid
-BuildRequires: ImageMagick perl
+BuildRequires: ImageMagick
-BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+#dssi support is broken for now
+#BuildRequires: dssi-devel
+BuildRequires: desktop-file-utils
%description
ZynAddSubFX is an open source software synthesizer capable of making a
-countless number of instrument sounds.
-
-%package doc
-Summary: Documentation and examples for ZynAddSubFX
-Group: Applications/Multimedia
-Requires: %{name} = %{version}
-
-%description doc
-Documentation and examples for ZynAddSubFX
+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...
%prep
%setup -q -n ZynAddSubFX-%{version}
%patch0 -p1
%patch1 -p0
-%patch2 -p0
+%patch2 -p1
%patch3 -p1
%build
-# fix microtuning bug (no keyboard mapping being done)
-%{__perl} -p -i -e "s|tmp=Pmapping\[tx\]|Pmapping\[tx\]=tmp|g" src/Misc/Microtonal.C
-
%ifarch %{ix86} x86_64
# We're ok.
%else
-%{__perl} -p -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
+sed -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
%endif
cd src
# do not use smp flags, makefile is not smp safe
-%ifarch %{ix86} x86_64
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_YES `fltk-config --cflags` -DJACKAUDIOOUT `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%else
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_NO `fltk-config --cflags` -DJACKAUDIOOUT `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%endif
+make
# build external programs
cd ../ExternalPrograms
cd Controller
-./compile.sh
+make
cd ../Spliter
-./compile.sh
+make
%install
rm -rf $RPM_BUILD_ROOT
@@ -83,31 +71,16 @@ install -m 0755 zynaddsubfx $RPM_BUILD_R
# install external programs
cd ../ExternalPrograms
cd Controller
-install -m 0755 controller $RPM_BUILD_ROOT%{_bindir}/controller
+install -m 0755 zynaddsubfx-controller $RPM_BUILD_ROOT%{_bindir}/controller
cd ../Spliter
-install -m 0755 spliter $RPM_BUILD_ROOT%{_bindir}/spliter
+install -m 0755 zynaddsubfx-spliter $RPM_BUILD_ROOT%{_bindir}/spliter
cd ../..
-BASE="Application;AudioVideo;"
-CATS="X-Synthesis;X-MIDI;X-Jack;"
-%{__cat} << EOF > %{name}.desktop
-[Desktop Entry]
-Name=ZynAddSubFX
-Comment=Real-time software synthesizer
-Icon=zynaddsubfx
-Type=Application
-Exec=%{_bindir}/%{name}
-Terminal=false
-Categories=${BASE}${CATS}
-Encoding=UTF-8
-EOF
+# .desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
- --add-category AudioVideo \
- --add-category Application \
- %{name}.desktop
+desktop-file-install --vendor fedora \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -128,18 +101,20 @@ install -m 644 zynaddsubfx-64.png $RPM_B
rm -rf $RPM_BUILD_ROOT
%post
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
-%doc COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
+%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
@@ -150,6 +125,13 @@ touch --no-create %{_datadir}/icons/hico
%{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
%changelog
+* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
+- Update to 2.4.0
+- Update scriptlets according to new guidelines
+- Update the .desktop file
+- Use Fedora specific flags during compilation
+- License is GPLv2+ (just run the program on the command line :))
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- zyn_lash-0.5.0pre0.diff DELETED ---
--- zynaddsubfx-unzombify.patch DELETED ---
More information about the fedora-extras-commits
mailing list