From d2173ae787191d8cbcb06872c3d73cd2b3126462 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 16 Sep 2006 16:29:40 +0000 Subject: [PATCH] rebuilding --- ladspa-1.12-gcc41.patch | 95 +++++++++++++++++++++++++++++++++++++++++ ladspa.spec | 22 ++++++---- needs.rebuild | 1 - 3 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 ladspa-1.12-gcc41.patch delete mode 100644 needs.rebuild diff --git a/ladspa-1.12-gcc41.patch b/ladspa-1.12-gcc41.patch new file mode 100644 index 0000000..f33fc01 --- /dev/null +++ b/ladspa-1.12-gcc41.patch @@ -0,0 +1,95 @@ +--- ladspa_sdk/src/plugins/sine.cpp.bak 2002-07-06 19:23:17.000000000 +0200 ++++ ladspa_sdk/src/plugins/sine.cpp 2006-06-07 12:24:33.677978128 +0200 +@@ -92,11 +92,36 @@ + } + + friend LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, ++ unsigned long SampleRate); ++ ++ friend void connectPortToSineOscillator(LADSPA_Handle Instance, ++ unsigned long Port, ++ 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); + } + +- friend void connectPortToSineOscillator(LADSPA_Handle Instance, ++ void connectPortToSineOscillator(LADSPA_Handle Instance, + unsigned long Port, + LADSPA_Data * DataLocation) { + switch (Port) { +@@ -112,11 +137,11 @@ + } + } + +- friend void activateSineOscillator(void * pvHandle) { ++ void activateSineOscillator(void * pvHandle) { + ((SineOscillator *)pvHandle)->m_lPhase = 0; + } + +- friend void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, ++ void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { +@@ -133,7 +158,7 @@ + } + } + +- friend void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, ++ void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); +@@ -151,7 +176,7 @@ + } + } + +- friend void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, ++ void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + poSineOscillator->setPhaseStepFromFrequency +@@ -165,7 +190,7 @@ + } + } + +- friend void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, ++ void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); +@@ -180,12 +205,10 @@ + } + } + +- friend void cleanupSineOscillator(void *pvHandle) { ++ void cleanupSineOscillator(void *pvHandle) { + delete (SineOscillator *)pvHandle; + } + +-}; +- + /*****************************************************************************/ + + typedef char * char_ptr; diff --git a/ladspa.spec b/ladspa.spec index 6f8ec7e..8d76ba5 100644 --- a/ladspa.spec +++ b/ladspa.spec @@ -1,6 +1,6 @@ Name: ladspa Version: 1.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: LADSPA SDK, example plug-ins and tools @@ -8,6 +8,7 @@ Group: System Environment/Libraries License: LGPL URL: http://www.ladspa.org/ Source: http://www.ladspa.org/download/%{name}_sdk_%{version}.tgz +Patch: ladspa-1.12-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -37,7 +38,8 @@ header file. %prep %setup -q -n ladspa_sdk -# resspect RPM_OPT_FLAGS +%patch -p1 +# respect RPM_OPT_FLAGS perl -pi -e 's/^(CFLAGS.*)-O3(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' src/makefile # fix links to the header file in the docs @@ -59,15 +61,15 @@ rm -rf $RPM_BUILD_ROOT ## ladspa_sdk uses mkdirhier for install which is provided by XFree86 ## we don't want to depend on XFree86 for building ## so let's make these dirs ourselves -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ladspa -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/ladspa -mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ladspa +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ladspa +mkdir -p $RPM_BUILD_ROOT%{_includedir}/ladspa +mkdir -p $RPM_BUILD_ROOT%{_bindir}/ladspa cd src make install \ - INSTALL_PLUGINS_DIR=$RPM_BUILD_ROOT/%{_libdir}/ladspa \ - INSTALL_INCLUDE_DIR=$RPM_BUILD_ROOT/%{_includedir} \ - INSTALL_BINARY_DIR=$RPM_BUILD_ROOT/%{_bindir} + INSTALL_PLUGINS_DIR=$RPM_BUILD_ROOT%{_libdir}/ladspa \ + INSTALL_INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir} \ + INSTALL_BINARY_DIR=$RPM_BUILD_ROOT%{_bindir} %clean @@ -90,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 16 2006 Thomas Vander Stichele +- 1.12-7 +- include gcc 4.1 patch from Mandriva + * Sun Mar 05 2006 Thomas Vander Stichele - 1.12-6 - rebuilt for FE5 diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild