From 33a38ea4ef6959512b42d0f6ce920d3e0d370c3b Mon Sep 17 00:00:00 2001 From: Aldas Nabazas Date: Thu, 2 Oct 2008 19:42:22 +0300 Subject: [PATCH] ladspa: Updated (1.12 -> 1.13) and removed NOPARALLEL --- audio/ladspa/disable-sound.patch | 14 +-- audio/ladspa/gcc41.patch | 176 ------------------------------- audio/ladspa/ladspa.desc | 9 +- audio/ladspa/mkdir.patch | 18 ++-- 4 files changed, 24 insertions(+), 193 deletions(-) delete mode 100644 audio/ladspa/gcc41.patch diff --git a/audio/ladspa/disable-sound.patch b/audio/ladspa/disable-sound.patch index e0666cd9a..d606d96fb 100644 --- a/audio/ladspa/disable-sound.patch +++ b/audio/ladspa/disable-sound.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../ladspa/disable-sound.patch +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -13,18 +14,19 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./makefile.orig 2002-07-06 13:34:20.000000000 -0400 -+++ ./makefile 2004-02-21 01:48:43.000000000 -0500 -@@ -51,12 +51,10 @@ + +--- ./makefile.orig 2008-01-15 08:08:55.000000000 +0000 ++++ ./makefile 2008-01-15 08:09:40.000000000 +0000 +@@ -50,12 +50,10 @@ @echo --------------------------------------------- @echo First listen to the white noise input signal: @echo --------------------------------------------- -- play ../snd/noise.wav +- -sndfile-play ../snd/noise.wav @echo ------------------------- @echo Compare to plugin output. @echo ------------------------- @echo Should be a noise band around 6000Hz, repeated quietly after 1s. -- play /tmp/test.wav +- -sndfile-play /tmp/test.wav + @echo Test complete. install: targets - -mkdirhier $(INSTALL_PLUGINS_DIR) \ diff --git a/audio/ladspa/gcc41.patch b/audio/ladspa/gcc41.patch deleted file mode 100644 index 58168889a..000000000 --- a/audio/ladspa/gcc41.patch +++ /dev/null @@ -1,176 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../ladspa/gcc41.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- src/plugins/sine.cpp.vanilla 2006-03-04 20:47:26.038153500 +0100 -+++ src/plugins/sine.cpp 2006-03-04 20:56:45.961146500 +0100 -@@ -92,13 +92,38 @@ - } - - friend LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, -- unsigned long SampleRate) { -- return new SineOscillator(SampleRate); -- } -+ unsigned long SampleRate); - - friend void connectPortToSineOscillator(LADSPA_Handle Instance, - unsigned long Port, -- LADSPA_Data * DataLocation) { -+ 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); -+ -+}; -+ -+ 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; -@@ -110,81 +135,81 @@ - ((SineOscillator *)Instance)->m_pfOutput = DataLocation; - break; - } -- } -- -- friend void activateSineOscillator(void * pvHandle) { -+ } -+ -+ void activateSineOscillator(void * pvHandle) { - ((SineOscillator *)pvHandle)->m_lPhase = 0; - } - -- friend void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, -- unsigned long SampleCount) { -+ 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. */ -+ support. */ - LADSPA_Data fFrequency -- = (poSineOscillator->m_pfFrequency[lIndex]); -+ = (poSineOscillator->m_pfFrequency[lIndex]); - poSineOscillator->m_pfOutput[lIndex] -- = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -- * poSineOscillator->m_pfAmplitude[lIndex]); -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * poSineOscillator->m_pfAmplitude[lIndex]); - poSineOscillator->setPhaseStepFromFrequency(fFrequency); -- poSineOscillator->m_lPhase -- += poSineOscillator->m_lPhaseStep; -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } - } - -- friend void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, -- unsigned long SampleCount) { -+ 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. */ -+ support. */ - LADSPA_Data fFrequency -- = (poSineOscillator->m_pfFrequency[lIndex]); -+ = (poSineOscillator->m_pfFrequency[lIndex]); - poSineOscillator->m_pfOutput[lIndex] -- = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -- * fAmplitude); -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * fAmplitude); - poSineOscillator->setPhaseStepFromFrequency(fFrequency); -- poSineOscillator->m_lPhase -- += poSineOscillator->m_lPhaseStep; -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } - } - -- friend void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, -- unsigned long SampleCount) { -+ 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; -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * poSineOscillator->m_pfAmplitude[lIndex]); -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } - } - -- friend void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, -- unsigned long SampleCount) { -+ 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; -+ = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] -+ * fAmplitude); -+ poSineOscillator->m_lPhase -+ += poSineOscillator->m_lPhaseStep; - } - } - -- friend void cleanupSineOscillator(void *pvHandle) { -+ void cleanupSineOscillator(void *pvHandle) { - delete (SineOscillator *)pvHandle; - } - --}; -+ - - /*****************************************************************************/ - diff --git a/audio/ladspa/ladspa.desc b/audio/ladspa/ladspa.desc index 5f24ca37c..14d40b326 100644 --- a/audio/ladspa/ladspa.desc +++ b/audio/ladspa/ladspa.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../ladspa/ladspa.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -22,15 +22,14 @@ [A] Richard Furse [M] The OpenSDE Community -[F] NOPARALLEL NO-AS-NEEDED +[F] NO-AS-NEEDED [C] extra/multimedia [L] LGPL [S] Stable -[V] 1.12 +[V] 1.13 [P] X -----5---9 156.500 [O] . $base/package/*/ladspa/ladspa.in -[D] 3776488631 ladspa_sdk_1.12.tgz http://www.ladspa.org/download/ - +[D] 2254948225 ladspa_sdk_1.13.tgz http://www.ladspa.org/download/ diff --git a/audio/ladspa/mkdir.patch b/audio/ladspa/mkdir.patch index e93b88ad0..90edc71d1 100644 --- a/audio/ladspa/mkdir.patch +++ b/audio/ladspa/mkdir.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../ladspa/mkdir.patch +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -13,14 +14,19 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- + --- ./makefile.orig 2002-07-06 19:34:20.000000000 +0200 +++ ./makefile 2005-10-20 12:22:39.293911320 +0200 -@@ -59,7 +59,7 @@ - play /tmp/test.wav +@@ -57,9 +57,9 @@ + @echo Test complete. install: targets -- -mkdirhier $(INSTALL_PLUGINS_DIR) \ -+ mkdir -p $(INSTALL_PLUGINS_DIR) \ - $(INSTALL_INCLUDE_DIR) \ - $(INSTALL_BINARY_DIR) +- -mkdirhier $(INSTALL_PLUGINS_DIR) +- -mkdirhier $(INSTALL_INCLUDE_DIR) +- -mkdirhier $(INSTALL_BINARY_DIR) ++ -mkdir $(INSTALL_PLUGINS_DIR) ++ -mkdir $(INSTALL_INCLUDE_DIR) ++ -mkdir $(INSTALL_BINARY_DIR) cp ../plugins/* $(INSTALL_PLUGINS_DIR) + cp ladspa.h $(INSTALL_INCLUDE_DIR) + cp ../bin/* $(INSTALL_BINARY_DIR)