rpms/audacity/devel audacity-1.3.2-resample.patch, NONE, 1.1 audacity.spec, 1.29, 1.30

[Gérard Milmeister (gemi)]

Author: gemi

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

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.2-resample.patch 
Log Message:
added patch for compiling with libsamplerate

audacity-1.3.2-resample.patch:

--- NEW FILE audacity-1.3.2-resample.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure
--- audacity-src-1.3.2-beta-orig/configure	2006-10-29 01:05:36.000000000 +0200
+++ audacity-src-1.3.2-beta/configure	2007-02-18 21:07:34.000000000 +0100
@@ -6079,7 +6079,7 @@
 fi
 
 
-   if false ; then
+   if true ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_LIBSAMPLERATE 1
diff -Nur audacity-src-1.3.2-beta-orig/src/Resample.cpp audacity-src-1.3.2-beta/src/Resample.cpp
--- audacity-src-1.3.2-beta-orig/src/Resample.cpp	2006-10-29 01:05:28.000000000 +0200
+++ audacity-src-1.3.2-beta/src/Resample.cpp	2007-02-18 21:07:23.000000000 +0100
@@ -137,7 +137,7 @@
 
 wxString Resample::GetMethodName(int index)
 {
-   return wxString(src_get_name(index));
+   return wxString(wxString::FromAscii(src_get_name(index)));
 }
 
 int Resample::GetFastMethod()


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- audacity.spec	15 Feb 2007 23:49:37 -0000	1.29
+++ audacity.spec	18 Feb 2007 21:10:02 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.3.2
-Release:        10.20070106cvs%{?dist}
+Release:        11.20070106cvs%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -9,6 +9,7 @@
 Source:         http://dl.sf.net/sourceforge/audacity/audacity-cvs20070106.tar.bz2
 Source1:        audacity.png
 Patch4:         audacity-1.3.2-destdir.patch
+Patch5:         audacity-1.3.2-resample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -26,6 +27,8 @@
 BuildRequires:  wxGTK2-devel
 BuildRequires:  zip
 BuildRequires:  zlib-devel
+%{?_with_mp3:BuildRequires: libmad-devel}
+
 Requires(post):   shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
 
@@ -44,6 +47,7 @@
 %prep
 %setup -q -n %{name}
 %patch4 -p1 -b .destdir
+%patch5 -p1 -b .resample
 cp -a src/Languages.cpp src/Languages.cpp.orig
 iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
 cp -a locale/fr.po locale/fr.po.orig
@@ -120,6 +124,9 @@
 
 
 %changelog
+* Sun Feb 18 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.3.2-11.20070106cvs
+- added patch for compiling with libsamplerate
+
 * Thu Feb 15 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.3.2-9.20070106cvs
 - disable flac for now