rpms/ladspa-swh-plugins/F-9 swh-plugins-0.4.15-pic.patch, NONE, 1.1 swh-plugins-0.4.15-riceitdown.patch, NONE, 1.1 ladspa-swh-plugins.spec, 1.7, 1.8

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/ladspa-swh-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7206/F-9

Modified Files:
	ladspa-swh-plugins.spec 
Added Files:
	swh-plugins-0.4.15-pic.patch 
	swh-plugins-0.4.15-riceitdown.patch 
Log Message:
fix this package so it builds properly, with the right optflags, and without tons of missing symbols

swh-plugins-0.4.15-pic.patch:

--- NEW FILE swh-plugins-0.4.15-pic.patch ---
diff -up swh-plugins-0.4.15/gverb/Makefile.am.pic swh-plugins-0.4.15/gverb/Makefile.am
--- swh-plugins-0.4.15/gverb/Makefile.am.pic	2004-03-16 17:49:00.000000000 -0500
+++ swh-plugins-0.4.15/gverb/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,9 +3,9 @@ RANLIB=ranlib
 
 noinst_HEADERS = gverb.h gverbdsp.h
 
-noinst_LIBRARIES = libgverb.a
+noinst_LTLIBRARIES = libgverb.la
 
-libgverb_a_SOURCES = gverb.c gverbdsp.c
+libgverb_la_SOURCES = gverb.c gverbdsp.c
 
 # Disable autoheader. 
 AUTOHEADER=echo
diff -up swh-plugins-0.4.15/Makefile.am.pic swh-plugins-0.4.15/Makefile.am
--- swh-plugins-0.4.15/Makefile.am.pic	2009-04-07 10:55:49.000000000 -0400
+++ swh-plugins-0.4.15/Makefile.am	2009-04-07 11:14:51.000000000 -0400
@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
 DISTFN = $(distdir)
 
 # Files needed for FFT based plugins
-pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
-pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
 mbeq_1197_la_LIBADD = $(FFTW_LIBS)
@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
 imp_1199_la_LIBADD = $(FFTW_LIBS)
 imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
 imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
-hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
-hermes_filter_1200_la_LIBADD = util/libblo.a
-fm_osc_1415_la_DEPENDENCIES = util/libblo.a
-fm_osc_1415_la_LIBADD = util/libblo.a
-analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
-analogue_osc_1416_la_LIBADD = util/libblo.a
-sc1_1425_la_LIBADD = util/libdb.a util/librms.a
-sc2_1426_la_LIBADD = util/libdb.a util/librms.a
-sc3_1427_la_LIBADD = util/libdb.a util/librms.a
-sc4_1882_la_LIBADD = util/libdb.a util/librms.a
-sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
-se4_1883_la_LIBADD = util/libdb.a util/librms.a
+hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
+hermes_filter_1200_la_LIBADD = util/libblo.la
+fm_osc_1415_la_DEPENDENCIES = util/libblo.la
+fm_osc_1415_la_LIBADD = util/libblo.la
+analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
+analogue_osc_1416_la_LIBADD = util/libblo.la
+sc1_1425_la_LIBADD = util/libdb.la util/librms.la
+sc2_1426_la_LIBADD = util/libdb.la util/librms.la
+sc3_1427_la_LIBADD = util/libdb.la util/librms.la
+sc4_1882_la_LIBADD = util/libdb.la util/librms.la
+sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
+se4_1883_la_LIBADD = util/libdb.la util/librms.la
 gsm_1215_la_LIBADD = -lgsm
-gverb_1216_la_LIBADD = gverb/libgverb.a
+gverb_1216_la_LIBADD = gverb/libgverb.la
 lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
 
-highpass_iir_1890_la_LIBADD = util/libiir.a
+highpass_iir_1890_la_LIBADD = util/libiir.la
 highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
-lowpass_iir_1891_la_LIBADD = util/libiir.a
+lowpass_iir_1891_la_LIBADD = util/libiir.la
 lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
-bandpass_iir_1892_la_LIBADD = util/libiir.a
+bandpass_iir_1892_la_LIBADD = util/libiir.la
 bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
-bandpass_a_iir_1893_la_LIBADD = util/libiir.a
+bandpass_a_iir_1893_la_LIBADD = util/libiir.la
 bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
-notch_iir_1894_la_LIBADD = util/libiir.a
+notch_iir_1894_la_LIBADD = util/libiir.la
 notch_iir_1894_la_SOURCES = notch_iir_1894.c
-butterworth_1902_la_LIBADD = util/libiir.a
+butterworth_1902_la_LIBADD = util/libiir.la
 butterworth_1902_la_SOURCES = butterworth_1902.c
 
 # Rule to build .c files from XML source
diff -up swh-plugins-0.4.15/util/Makefile.am.pic swh-plugins-0.4.15/util/Makefile.am
--- swh-plugins-0.4.15/util/Makefile.am.pic	2005-06-01 05:52:00.000000000 -0400
+++ swh-plugins-0.4.15/util/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,16 +3,16 @@ RANLIB=ranlib
 
 noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h iir.h buffer.h ls_filter.h
 
-noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
+noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
 
-librms_a_SOURCES = rms.c
-libdb_a_SOURCES = db.c
-libblo_a_SOURCES = blo.c
-libblo_a_CFLAGS = -I at top_srcdir@
-libpitchscale_a_SOURCES = pitchscale.c
-libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
+librms_la_SOURCES = rms.c
+libdb_la_SOURCES = db.c
+libblo_la_SOURCES = blo.c
+libblo_la_CFLAGS = -I at top_srcdir@
+libpitchscale_la_SOURCES = pitchscale.c
+libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
 #libpitchscale_a_LIBS = $(FFTW_LIBS)
-libiir_a_SOURCES = iir.c
+libiir_la_SOURCES = iir.c
 #libbuffer_a_SOURCES = buffer.c
 # Disable autoheader. 
 AUTOHEADER=echo

swh-plugins-0.4.15-riceitdown.patch:

--- NEW FILE swh-plugins-0.4.15-riceitdown.patch ---
Index: swh-plugins-0.4.15/configure.in
===================================================================
--- swh-plugins-0.4.15.orig/configure.in
+++ swh-plugins-0.4.15/configure.in
@@ -99,12 +99,12 @@ else
   AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
   AC_MSG_WARN([May result in non-portable code])
   dnl For gcc use:
-  MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
+  # MACHINE="-march=${build_cpu}"
+  # if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
+  # if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
+  # if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
+  # 
+  # CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
 
   dnl For Intel's C compiler use:
   dnl CC="icc"


Index: ladspa-swh-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-swh-plugins/F-9/ladspa-swh-plugins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ladspa-swh-plugins.spec	19 Feb 2008 04:11:31 -0000	1.7
+++ ladspa-swh-plugins.spec	7 Apr 2009 15:31:29 -0000	1.8
@@ -3,12 +3,14 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         ladspa-%{pkgname}
 Version:      0.4.15
-Release:      12%{?dist}
+Release:      15%{?dist}
 License:      GPLv2+
 Group:        Applications/Multimedia
-Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
+Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-%{version}.tar.gz
 Patch0:       ladspa-swh-plugins-libgsm.patch
 Patch1:       swh-plugins-plugin-Makefile.am.patch
+Patch2:       swh-plugins-0.4.15-pic.patch
+Patch3:       swh-plugins-0.4.15-riceitdown.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,9 +28,11 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 
 %build
-autoreconf
+autoreconf -f -i
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
@@ -47,6 +51,15 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Tue Apr 07 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.15-15
+- fix this package so it builds properly, with the right optflags, and without tons of missing symbols
+
+* Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 0.4.15-14
+- make it build
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.15-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.15-12
 - Autorebuild for GCC 4.3