From aa971165dbb92ec9f7326e2f30532a082d92c17b Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 5 Sep 2008 19:35:31 +0000 Subject: [PATCH] - link with build-id to fix rawhide build - upgrade to 1.13 (GCC4 build-fix and string fixes) (#449542) - add -plugindir patch so listplugin and friends will work by default (Anthony Green #324741) --- .cvsignore | 2 +- ladspa-1.12-gcc41.patch | 95 ----------------------------------------- ladspa.spec | 18 +++++--- sources | 2 +- 4 files changed, 14 insertions(+), 103 deletions(-) delete mode 100644 ladspa-1.12-gcc41.patch diff --git a/.cvsignore b/.cvsignore index e8c4395..1f17ad9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ladspa_sdk_1.12.tgz +ladspa_sdk_1.13.tgz diff --git a/ladspa-1.12-gcc41.patch b/ladspa-1.12-gcc41.patch deleted file mode 100644 index f33fc01..0000000 --- a/ladspa-1.12-gcc41.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- 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 f17cabc..d238631 100644 --- a/ladspa.spec +++ b/ladspa.spec @@ -1,6 +1,6 @@ Name: ladspa -Version: 1.12 -Release: 10%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: LADSPA SDK, example plug-ins and tools @@ -8,7 +8,7 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://www.ladspa.org/ Source: http://www.ladspa.org/download/%{name}_sdk_%{version}.tgz -Patch: ladspa-1.12-gcc41.patch +Patch1: ladspa-1.13-plugindir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -38,9 +38,9 @@ header file. %prep %setup -q -n ladspa_sdk -%patch -p1 +%patch1 -p0 -b .plugindir # respect RPM_OPT_FLAGS -perl -pi -e 's/^(CFLAGS.*)-O3(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' src/makefile +perl -pi -e 's/^(CFLAGS.*)-O3(.*)/$1\$\(RPM_OPT_FLAGS\)$2 -DPLUGINDIR=\$\(PLUGINDIR\)/' src/makefile # fix links to the header file in the docs cd doc @@ -49,7 +49,7 @@ perl -pi -e "s!HREF=\"ladspa.h.txt\"!href=\"file:///usr/include/ladspa.h\"!" *.h %build cd src -make targets %{?_smp_mflags} +PLUGINDIR=\\\"%{_libdir}/ladspa\\\" make targets %{?_smp_mflags} LD="ld --build-id" #make test #make check @@ -96,6 +96,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 5 2008 Michael Schwendt - 1.13-1 +- link with build-id to fix rawhide build +- upgrade to 1.13 (GCC4 build-fix and string fixes) (#449542) +- add -plugindir patch so listplugin and friends will work by default + (Anthony Green #324741) + * Tue Aug 5 2008 Tom "spot" Callaway - 1.12-10 - fix license tag diff --git a/sources b/sources index f2760d5..5e2f67c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbd63dd701d80b152943073c84565c14 ladspa_sdk_1.12.tgz +671be3e1021d0722cadc7fb27054628e ladspa_sdk_1.13.tgz