rpms/audacity/devel audacity-1.3.8-audiodevdefaults.patch, NONE, 1.1 audacity-1.3.8-libdir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 audacity.spec, 1.77, 1.78 sources, 1.12, 1.13 audacity-1.3.6-flac-import.patch, 1.2, NONE audacity-1.3.7-audiodevdefaults.patch, 1.2, NONE audacity-1.3.7-portaudio-non-mmap-alsa.patch, 1.3, NONE audacity-1.3.7-repeat.patch, 1.2, NONE
Michael Schwendt
mschwendt at fedoraproject.org
Mon Jul 20 19:55:16 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15830
Modified Files:
.cvsignore audacity.spec sources
Added Files:
audacity-1.3.8-audiodevdefaults.patch
audacity-1.3.8-libdir.patch
Removed Files:
audacity-1.3.6-flac-import.patch
audacity-1.3.7-audiodevdefaults.patch
audacity-1.3.7-portaudio-non-mmap-alsa.patch
audacity-1.3.7-repeat.patch
Log Message:
* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
- upgrade to 1.3.8-beta
- BR taglib-devel
- patches merged/obsoleted upstream:
audacity-1.3.7-portaudio-non-mmap-alsa.patch
audacity-1.3.7-repeat.patch
audacity-1.3.6-flac-import.patch
audacity-1.3.8-audiodevdefaults.patch:
DevicePrefs.cpp | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
--- NEW FILE audacity-1.3.8-audiodevdefaults.patch ---
diff -Nur audacity-src-1.3.8-orig/src/prefs/DevicePrefs.cpp audacity-src-1.3.8/src/prefs/DevicePrefs.cpp
--- audacity-src-1.3.8-orig/src/prefs/DevicePrefs.cpp 2009-07-16 05:27:35.000000000 +0200
+++ audacity-src-1.3.8/src/prefs/DevicePrefs.cpp 2009-07-20 20:55:26.000000000 +0200
@@ -172,6 +172,15 @@
wxArrayString playnames;
wxArrayString recordnames;
+ int playDeviceNum = -1; // use device name from gPrefs
+ if ( mPlayDevice == wxT("") ) {
+ playDeviceNum = Pa_GetDefaultOutputDevice();
+ }
+ int recDeviceNum = -1; // use device name from gPrefs
+ if ( mRecordDevice == wxT("") ) {
+ recDeviceNum = Pa_GetDefaultInputDevice();
+ }
+
for (int i = 0; i < nDevices; i++) {
const PaDeviceInfo *info = Pa_GetDeviceInfo(i);
if (info->hostApi == index) {
@@ -182,7 +191,10 @@
if (info->maxOutputChannels > 0) {
playnames.Add(name);
index = mPlay->Append(name, (void *) info);
- if (device == mPlayDevice) {
+ if (playDeviceNum == i) {
+ mPlay->SetSelection(index);
+ }
+ else if (device == mPlayDevice) {
mPlay->SetSelection(index);
}
}
@@ -190,7 +202,10 @@
if (info->maxInputChannels > 0) {
recordnames.Add(name);
index = mRecord->Append(name, (void *) info);
- if (device == mRecordDevice) {
+ if (recDeviceNum == i) {
+ mRecord->SetSelection(index);
+ }
+ else if (device == mRecordDevice) {
mRecord->SetSelection(index);
}
}
audacity-1.3.8-libdir.patch:
LoadLadspa.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE audacity-1.3.8-libdir.patch ---
diff -Nur audacity-src-1.3.8-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.8/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.8-orig/src/effects/ladspa/LoadLadspa.cpp 2009-07-16 05:27:35.000000000 +0200
+++ audacity-src-1.3.8/src/effects/ladspa/LoadLadspa.cpp 2009-07-20 11:40:02.000000000 +0200
@@ -278,8 +278,7 @@
#ifdef __WXGTK__
wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/lib/ladspa"), pathList);
+ wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 28 Feb 2009 14:21:16 -0000 1.10
+++ .cvsignore 20 Jul 2009 19:55:15 -0000 1.11
@@ -1 +1 @@
-audacity-minsrc-1.3.7.tar.bz2
+audacity-minsrc-1.3.8.tar.bz2
Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- audacity.spec 13 May 2009 08:37:00 -0000 1.77
+++ audacity.spec 20 Jul 2009 19:55:16 -0000 1.78
@@ -1,27 +1,24 @@
# Compile options:
# --with mp3 : enable mp3 support
-%define tartopdir audacity-src-1.3.7
+%define tartopdir audacity-src-1.3.8
Name: audacity
-Version: 1.3.7
-Release: 0.7.beta%{?dist}
+Version: 1.3.8
+Release: 0.1.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
URL: http://audacity.sourceforge.net
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-1.3.7.tar.bz2
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.bz2
Source1: audacity.png
Source2: audacity.desktop
Patch1: audacity-1.3.7-libmp3lame-default.patch
-Patch2: audacity-1.3.7-libdir.patch
-Patch3: audacity-1.3.6-flac-import.patch
-Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch
-Patch5: audacity-1.3.7-repeat.patch
+Patch2: audacity-1.3.8-libdir.patch
Patch6: audacity-1.3.7-vamp-1.3.patch
-Patch7: audacity-1.3.7-audiodevdefaults.patch
+Patch7: audacity-1.3.8-audiodevdefaults.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -32,6 +29,7 @@ BuildRequires: gettext
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
BuildRequires: libid3tag-devel
+BuildRequires: taglib-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
@@ -69,9 +67,6 @@ do
done
grep -q -s __RPM_LIB * -R && exit 1
-%patch3 -p1 -b .dumb-flac-import
-%patch4 -p1 -b .pa-non-mmap-alsa
-%patch5 -p1 -b .repeat
%if 0%{?fedora} < 11
%patch6 -p1 -b .vamp-1.3
%endif
@@ -110,6 +105,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}
make DESTDIR=${RPM_BUILD_ROOT} install
+# Audacity 1.3.8-beta complains if the help/manual directories
+# don't exist.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
+
%{find_lang} %{name}
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -147,6 +146,14 @@ update-desktop-database &> /dev/null ||
%changelog
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
+- upgrade to 1.3.8-beta
+- BR taglib-devel
+- patches merged/obsoleted upstream:
+ audacity-1.3.7-portaudio-non-mmap-alsa.patch
+ audacity-1.3.7-repeat.patch
+ audacity-1.3.6-flac-import.patch
+
* Wed May 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.7.beta
- retag up-to-date files and copy to F-10/F-11
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 28 Feb 2009 14:21:17 -0000 1.12
+++ sources 20 Jul 2009 19:55:16 -0000 1.13
@@ -1 +1 @@
-7dcbcd8ed417413fd824d446001058d9 audacity-minsrc-1.3.7.tar.bz2
+88b3c68663a06f146fe822b91608e8f1 audacity-minsrc-1.3.8.tar.bz2
--- audacity-1.3.6-flac-import.patch DELETED ---
--- audacity-1.3.7-audiodevdefaults.patch DELETED ---
--- audacity-1.3.7-portaudio-non-mmap-alsa.patch DELETED ---
--- audacity-1.3.7-repeat.patch DELETED ---
More information about the fedora-extras-commits
mailing list