diff --git a/WAH-plugins-0.0.2.tar.bz2 b/WAH-plugins-0.0.2.tar.bz2 deleted file mode 100644 index 6613acf..0000000 --- a/WAH-plugins-0.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdd76f55ff59937fdb6e4fc2e0ea1c85a462ee5587bd2809df08a9b40fd5e9ad -size 16400 diff --git a/ladspa.changes b/ladspa.changes index 15b3c23..a532af9 100644 --- a/ladspa.changes +++ b/ladspa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 22 05:12:28 UTC 2010 - davejplater@gmail.com + +- Add swh-configure-2.65.patch for autoconf-2.65 build + ------------------------------------------------------------------- Tue Jan 26 07:21:56 UTC 2010 - davejplater@gmail.com diff --git a/ladspa.spec b/ladspa.spec index e7d4b9c..80a7d53 100644 --- a/ladspa.spec +++ b/ladspa.spec @@ -88,7 +88,12 @@ Patch16: pvoc-compile-fix.dif Patch17: swh-0.4.13-gcc4-fix.diff Patch18: sooperlooper-0.93-gcc4-fix.diff Patch20: swh-libblo.dif +# swh-configure.patch changes for >= autoconf-2.65 in openSUSE 11.3 +%if %suse_version <= 1120 Patch21: swh-configure.patch +%else +Patch21: swh-configure-2.65.patch +%endif Patch22: alienwah-compile-fix.diff Patch23: alienwah-float_complex.diff Patch25: pvoc-0.1.10-depend-copts-fix.diff @@ -139,7 +144,7 @@ Authors: touch config.rpath ./autogen.sh --prefix=%{_prefix} %{?suse_update_config:%{suse_update_config -f}} -%patch21 -p1 +%patch21 -p 1 ) (cd cmt %patch2 @@ -156,6 +161,7 @@ touch config.rpath %patch6 %patch27 %patch28 +%{?suse_update_config:%{suse_update_config -f}} ) (cd vcf-%{vcf_version} %patch7 @@ -222,7 +228,7 @@ make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # Blop cd blop-%{blop_version} -autoreconf --install --force +#autoreconf --install --force ./configure --prefix=%{_prefix} \ --with-ladspa-plugin-dir=%{_libdir}/ladspa make CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DPIC -fPIC -ggdb" diff --git a/ladspa_sdk-compile-fix.diff b/ladspa_sdk-compile-fix.diff deleted file mode 100644 index c319b30..0000000 --- a/ladspa_sdk-compile-fix.diff +++ /dev/null @@ -1,221 +0,0 @@ ---- src/plugins/sine.cpp-dist 2005-10-04 16:29:44.000000000 +0200 -+++ src/plugins/sine.cpp 2005-10-05 12:13:25.000000000 +0200 -@@ -31,6 +31,8 @@ - #define OSC_AMPLITUDE 1 - #define OSC_OUTPUT 2 - -+namespace ladspa_sdk_sine { -+ - /*****************************************************************************/ - - /* Sine table size is given by (1<m_pfFrequency = DataLocation; -- break; -- case OSC_AMPLITUDE: -- ((SineOscillator *)Instance)->m_pfAmplitude = DataLocation; -- break; -- case OSC_OUTPUT: -- ((SineOscillator *)Instance)->m_pfOutput = DataLocation; -- break; -- } -- } -+ LADSPA_Data * DataLocation); -+ friend void activateSineOscillator(void * pvHandle); -+ friend void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, -+ unsigned long SampleCount); -+ friend void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, -+ unsigned long SampleCount); -+ friend void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, -+ unsigned long SampleCount); -+ friend void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, -+ unsigned long SampleCount); -+ friend void cleanupSineOscillator(void *pvHandle); - -- friend void activateSineOscillator(void * pvHandle) { -- ((SineOscillator *)pvHandle)->m_lPhase = 0; -- } -+}; - -- friend void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, -- unsigned long SampleCount) { -- SineOscillator * poSineOscillator = (SineOscillator *)Instance; -- for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -- /* Extract frequency at this point to guarantee inplace -- support. */ -- LADSPA_Data fFrequency -- = (poSineOscillator->m_pfFrequency[lIndex]); -- poSineOscillator->m_pfOutput[lIndex] -- = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -- * poSineOscillator->m_pfAmplitude[lIndex]); -- poSineOscillator->setPhaseStepFromFrequency(fFrequency); -- poSineOscillator->m_lPhase -- += poSineOscillator->m_lPhaseStep; -- } -+LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, -+ unsigned long SampleRate) -+{ -+ return new SineOscillator(SampleRate); -+} -+ -+void connectPortToSineOscillator(LADSPA_Handle Instance, -+ unsigned long Port, -+ LADSPA_Data * DataLocation) -+{ -+ switch (Port) { -+ case OSC_FREQUENCY: -+ ((SineOscillator *)Instance)->m_pfFrequency = DataLocation; -+ break; -+ case OSC_AMPLITUDE: -+ ((SineOscillator *)Instance)->m_pfAmplitude = DataLocation; -+ break; -+ case OSC_OUTPUT: -+ ((SineOscillator *)Instance)->m_pfOutput = DataLocation; -+ break; - } -+} - -- friend void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, -- unsigned long SampleCount) { -- SineOscillator * poSineOscillator = (SineOscillator *)Instance; -- LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); -- for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -- /* Extract frequency at this point to guarantee inplace -- support. */ -- LADSPA_Data fFrequency -- = (poSineOscillator->m_pfFrequency[lIndex]); -- poSineOscillator->m_pfOutput[lIndex] -- = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -- * fAmplitude); -- poSineOscillator->setPhaseStepFromFrequency(fFrequency); -- poSineOscillator->m_lPhase -- += poSineOscillator->m_lPhaseStep; -- } -+void activateSineOscillator(void * pvHandle) -+{ -+ ((SineOscillator *)pvHandle)->m_lPhase = 0; -+} -+ -+void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, -+ unsigned long SampleCount) -+{ -+ SineOscillator * poSineOscillator = (SineOscillator *)Instance; -+ for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -+ /* Extract frequency at this point to guarantee inplace -+ support. */ -+ LADSPA_Data fFrequency -+ = (poSineOscillator->m_pfFrequency[lIndex]); -+ poSineOscillator->m_pfOutput[lIndex] -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * poSineOscillator->m_pfAmplitude[lIndex]); -+ poSineOscillator->setPhaseStepFromFrequency(fFrequency); -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } -+} - -- friend void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, -- unsigned long SampleCount) { -- SineOscillator * poSineOscillator = (SineOscillator *)Instance; -- poSineOscillator->setPhaseStepFromFrequency -- (*(poSineOscillator->m_pfFrequency)); -- for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -- poSineOscillator->m_pfOutput[lIndex] -- = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -- * poSineOscillator->m_pfAmplitude[lIndex]); -- poSineOscillator->m_lPhase -- += poSineOscillator->m_lPhaseStep; -- } -+void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, -+ unsigned long SampleCount) -+{ -+ SineOscillator * poSineOscillator = (SineOscillator *)Instance; -+ LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); -+ for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -+ /* Extract frequency at this point to guarantee inplace -+ support. */ -+ LADSPA_Data fFrequency -+ = (poSineOscillator->m_pfFrequency[lIndex]); -+ poSineOscillator->m_pfOutput[lIndex] -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * fAmplitude); -+ poSineOscillator->setPhaseStepFromFrequency(fFrequency); -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } -+} - -- friend void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, -- unsigned long SampleCount) { -- SineOscillator * poSineOscillator = (SineOscillator *)Instance; -- LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); -- poSineOscillator->setPhaseStepFromFrequency -- (*(poSineOscillator->m_pfFrequency)); -- for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -- poSineOscillator->m_pfOutput[lIndex] -- = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -- * fAmplitude); -- poSineOscillator->m_lPhase -- += poSineOscillator->m_lPhaseStep; -- } -+void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, -+ unsigned long SampleCount) -+{ -+ SineOscillator * poSineOscillator = (SineOscillator *)Instance; -+ poSineOscillator->setPhaseStepFromFrequency -+ (*(poSineOscillator->m_pfFrequency)); -+ for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -+ poSineOscillator->m_pfOutput[lIndex] -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * poSineOscillator->m_pfAmplitude[lIndex]); -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } -+} - -- friend void cleanupSineOscillator(void *pvHandle) { -- delete (SineOscillator *)pvHandle; -+void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, -+ unsigned long SampleCount) -+{ -+ SineOscillator * poSineOscillator = (SineOscillator *)Instance; -+ LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); -+ poSineOscillator->setPhaseStepFromFrequency -+ (*(poSineOscillator->m_pfFrequency)); -+ for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { -+ poSineOscillator->m_pfOutput[lIndex] -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * fAmplitude); -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } -+} - --}; -+void cleanupSineOscillator(void *pvHandle) -+{ -+ delete (SineOscillator *)pvHandle; -+} - - /*****************************************************************************/ - -@@ -368,4 +394,6 @@ - - /*****************************************************************************/ - -+} -+ - /* EOF */ diff --git a/pvoc-0.1.10-gcc4-fix.diff b/pvoc-0.1.10-gcc4-fix.diff deleted file mode 100644 index 90b381b..0000000 --- a/pvoc-0.1.10-gcc4-fix.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- Plugins.cc-dist 2005-04-11 11:47:09.848541196 +0200 -+++ Plugins.cc 2005-04-11 11:48:10.464429484 +0200 -@@ -177,7 +177,8 @@ Exaggerate::port_info [] = - } - }; - --Descriptor::Descriptor() -+template <> -+Descriptor::Descriptor() - { - UniqueID = 1791; - Label = "Exaggerate"; -@@ -345,7 +346,8 @@ Transpose::port_info [] = - } - }; - --Descriptor::Descriptor() -+template <> -+Descriptor::Descriptor() - { - UniqueID = 1792; - Label = "Transpose"; -@@ -496,7 +498,8 @@ Accumulate::port_info [] = - } - }; - --Descriptor::Descriptor() -+template <> -+Descriptor::Descriptor() - { - UniqueID = 1793; - Label = "Accumulate"; diff --git a/sooperlooper-1.6.14.tar.bz2 b/sooperlooper-1.6.14.tar.bz2 deleted file mode 100644 index cc2d176..0000000 --- a/sooperlooper-1.6.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebf7542b65173ba0cfab8633fb0ecfb5e992795b222be0433b02c37b1d8dcacd -size 492664 diff --git a/swh-configure-2.65.patch b/swh-configure-2.65.patch new file mode 100644 index 0000000..c699674 --- /dev/null +++ b/swh-configure-2.65.patch @@ -0,0 +1,30 @@ +Index: swh-plugins-0.4.15/configure +=================================================================== +--- swh-plugins-0.4.15.orig/configure ++++ swh-plugins-0.4.15/configure +@@ -767,6 +767,7 @@ GMSGFMT + MSGFMT + GETTEXT_MACRO_VERSION + USE_NLS ++MKINSTALLDIRS + CPP + OTOOL64 + OTOOL +@@ -11223,6 +11224,17 @@ fi + + ALL_LINGUAS="en_GB" + ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ case "$ac_aux_dir" in ++ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; ++ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; ++ esac ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given.