rpms/audacity-freeworld/F-19 audacity-2.0.4-equalization-segfault.patch, NONE, 1.1 audacity-freeworld.spec, 1.28, 1.29

[David Timms]

Author: dtimms

Update of /cvs/free/rpms/audacity-freeworld/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12477/F-19

Modified Files:
	audacity-freeworld.spec 
Added Files:
	audacity-2.0.4-equalization-segfault.patch 
Log Message:
Add upstream patch to avoid segfault when starting Effects|Equalization


audacity-2.0.4-equalization-segfault.patch:
 Equalization.cpp |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

--- NEW FILE audacity-2.0.4-equalization-segfault.patch ---
--- src/effects/Equalization.cpp.orig	2013-09-01 08:03:13.000000000 +1000
+++ src/effects/Equalization.cpp	2013-09-22 13:07:32.979172233 +1000
@@ -1195,10 +1195,8 @@
 
    szrG = new wxBoxSizer( wxHORIZONTAL  );
    szrG->Add(0, 0, 0); // horizontal spacer, will be used to position LH EQ slider
-   for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+   for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
    {
-      if( i == NUMBER_OF_BANDS )
-         break;
       m_sliders[i] = new wxSliderBugfix(this, ID_SLIDER + i, 0, -20, +20,
                         wxDefaultPosition, wxSize(20, 124), wxSL_VERTICAL|
                          wxSL_INVERSE);
@@ -1965,10 +1963,8 @@
 void EqualizationDialog::OnSlider(wxCommandEvent & event)
 {
    wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject();
-   for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+   for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
    {
-      if( i == NUMBER_OF_BANDS )
-         break;
       if( s == m_sliders[i])
       {
          int posn = m_sliders[i]->GetValue();
@@ -2041,10 +2037,8 @@
    double loLog = log10(mLoFreq);
    double hiLog = log10(mHiFreq);
    double denom = hiLog - loLog;
-   for (int i = 1; thirdOct[i] <= mHiFreq; ++i)   //go along the spacers
+   for (int i = 1; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)   //go along the spacers
    {
-      if( i == NUMBER_OF_BANDS )
-         break;
       float posn = range*(log10(thirdOct[i])-loLog)/denom;   //centre of this slider, from start
       w = start + ((int)(posn+.5)) - EQsliderSize.x/2;   //LH edge of slider, from 0
       w = w - so_far;   //gap needed to put it here
@@ -2618,10 +2612,8 @@
 {
    if(!drawMode)   // Graphic (Slider) mode. Invert the sliders.
    {
-      for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+      for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
       {
-         if( i == NUMBER_OF_BANDS )
-            break;
          m_EQVals[i] = -m_EQVals[i];
          int newPosn = (int)m_EQVals[i];
          m_sliders[i]->SetValue( newPosn );


Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-19/audacity-freeworld.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- audacity-freeworld.spec	14 Sep 2013 14:39:19 -0000	1.28
+++ audacity-freeworld.spec	23 Sep 2013 11:36:47 -0000	1.29
@@ -1,7 +1,7 @@
 Name: audacity-freeworld
 
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -23,6 +23,7 @@
 # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
 Patch3: audacity-2.0.2-desktop.in.patch
 Patch4: audacity-2.0.3-non-dl-ffmpeg.patch
+Patch5: audacity-2.0.4-equalization-segfault.patch
 
 Provides: audacity-nonfree = %{version}-%{release}
 Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -82,7 +83,8 @@
 done
 
 %patch3 -b .desktop.old
-%patch4 -p1
+%patch4 -p1 -b .2.0.3-non-dl-ffmpeg
+%patch5 -b .2.0.4-equalization-segfault
 
 
 %build
@@ -169,9 +171,13 @@
 %{_datadir}/icons/hicolor/*/apps/%{realname}.*
 %{_datadir}/mime/packages/*
 %doc %{_datadir}/doc/*
+%doc lib-src/libnyquist/nyquist/license.txt lib-src/libnyquist/nyquist/Readme.txt
 
 
 %changelog
+* Sun Sep 22 2013 David Timms <iinet.net.au at dtimms> - 2.0.4-2
+- Add upstream patch to avoid segfault when starting Effects|Equalization
+
 * Sat Sep 14 2013 David Timms <iinet.net.au at dtimms> - 2.0.4-1
 - update to upstream release 2.0.4
 - rebase audacity-2.0.1-libmp3lame-default