rpms/ladspa/devel ladspa-1.12-gcc41.patch, NONE, 1.1 ladspa.spec, 1.10, 1.11 needs.rebuild, 1.1, NONE

[Thomas Vander Stichele (thomasvs)]

Author: thomasvs

Update of /cvs/extras/rpms/ladspa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8380

Modified Files:
	ladspa.spec 
Added Files:
	ladspa-1.12-gcc41.patch 
Removed Files:
	needs.rebuild 
Log Message:
rebuilding

ladspa-1.12-gcc41.patch:

--- NEW FILE ladspa-1.12-gcc41.patch ---
--- 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;


Index: ladspa.spec
===================================================================
RCS file: /cvs/extras/rpms/ladspa/devel/ladspa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ladspa.spec	5 Mar 2006 14:22:08 -0000	1.10
+++ ladspa.spec	16 Sep 2006 16:29:40 -0000	1.11
@@ -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 @@
 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 @@
 
 %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 @@
 ## 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 @@
 
 
 %changelog
+* Sat Sep 16 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 1.12-7
+- include gcc 4.1 patch from Mandriva
+
 * Sun Mar 05 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 1.12-6
 - rebuilt for FE5


--- needs.rebuild DELETED ---