rpms/zynaddsubfx/devel zynaddsubfx-linking.patch, NONE, 1.1 zynaddsubfx.spec, 1.17, 1.18

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4044

Modified Files:
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-linking.patch 
Log Message:
* Wed Feb 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0-3
- Fix DSO-linking failure


zynaddsubfx-linking.patch:
 ExternalPrograms/Controller/Makefile |    2 +-
 ExternalPrograms/Spliter/Makefile    |    2 +-
 src/Makefile                         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE zynaddsubfx-linking.patch ---
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	2010-02-10 03:36:53.000000000 -0500
+++ ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile	2010-02-10 03:46:16.000000000 -0500
@@ -1,5 +1,5 @@
 controller: main.o Controller.o ControllerUI.o
-	gcc -o zynaddsubfx-controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
+	gcc -o zynaddsubfx-controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm -lstdc++
 
 ControllerUI.cxx ControllerUI.h: ControllerUI.fl
 	fluid -c ControllerUI.fl
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	2010-02-10 03:36:53.000000000 -0500
+++ ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile	2010-02-10 03:53:09.000000000 -0500
@@ -1,5 +1,5 @@
 spliter: main.o Spliter.o SpliterUI.o
-	gcc -o zynaddsubfx-spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
+	gcc -o zynaddsubfx-spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lstdc++
 
 SplitterUI.cxx SpliterUI.h: SpliterUI.fl
 	fluid -c SpliterUI.fl
diff -rupN ZynAddSubFX-2.4.0.old/src/Makefile ZynAddSubFX-2.4.0/src/Makefile
--- ZynAddSubFX-2.4.0.old/src/Makefile	2010-02-10 03:37:07.000000000 -0500
+++ ZynAddSubFX-2.4.0/src/Makefile	2010-02-10 03:39:00.000000000 -0500
@@ -22,7 +22,7 @@ endif
 
 export CXXFLAGS
 
-LIBS= -lm  -lmxml -lz
+LIBS= -lm  -lmxml -lz -lstdc++
 ifneq ($(DISABLE_GUI),YES)
     LIBS+=-lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11
 endif


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- zynaddsubfx.spec	8 Sep 2009 21:28:06 -0000	1.17
+++ zynaddsubfx.spec	10 Feb 2010 08:58:11 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -16,21 +16,29 @@ Patch3:         zynaddsubfx-build-flags.
 # 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:       jack-audio-connection-kit >= 0.101.1
 Requires:       mxml >= 2.2
 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
-
+BuildRequires:  alsa-lib-devel
+BuildRequires:  desktop-file-utils
 #dssi support is broken for now
 #BuildRequires:  dssi-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  fftw3-devel
+BuildRequires:  fltk-devel
+BuildRequires:  fltk-fluid
+BuildRequires:  ImageMagick
+BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires:  lash-devel
+BuildRequires:  libX11-devel
+BuildRequires:  mxml-devel
+BuildRequires:  zlib-devel
+
 
 %description
 ZynAddSubFX is an open source software synthesizer capable of making a
@@ -46,6 +54,7 @@ effects like Reverb, Echo, Chorus, Phase
 %patch3 -p1 -b .flags
 %patch4 -p1 -b .doxy
 %patch5 -p1 -b .loadfiles
+%patch6 -p1 -b .linking
 
 %build
 %ifarch %{ix86} x86_64 
@@ -132,6 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Wed Feb 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0-3
+- Fix DSO-linking failure
+
 * Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
 - Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)