From 204c2ca7cba0901ce84b8198b579f25f3b9ec31678967ede0f14b974186fc0be Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 16:58:30 +0000 Subject: [PATCH] Accepting request 24166 from multimedia:apps Copy from multimedia:apps/audacity based on submit request 24166 from user mseben OBS-URL: https://build.opensuse.org/request/show/24166 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=23 --- ...h => audacity-1.3.9-audiodevdefaults.patch | 28 ++++++++++--------- ...h => audacity-1.3.9-gsocket-conflict.patch | 4 +-- ...etval.patch => audacity-1.3.9-retval.patch | 0 audacity-minsrc-1.3.8.tar.bz2 | 3 -- audacity-minsrc-1.3.9.tar.bz2 | 3 ++ audacity.changes | 21 ++++++++++++++ audacity.spec | 6 ++-- 7 files changed, 44 insertions(+), 21 deletions(-) rename audacity-1.3.8-audiodevdefaults.patch => audacity-1.3.9-audiodevdefaults.patch (54%) rename audacity-1.3.8-gsocket-conflict.patch => audacity-1.3.9-gsocket-conflict.patch (77%) rename audacity-1.3.8-retval.patch => audacity-1.3.9-retval.patch (100%) delete mode 100644 audacity-minsrc-1.3.8.tar.bz2 create mode 100644 audacity-minsrc-1.3.9.tar.bz2 diff --git a/audacity-1.3.8-audiodevdefaults.patch b/audacity-1.3.9-audiodevdefaults.patch similarity index 54% rename from audacity-1.3.8-audiodevdefaults.patch rename to audacity-1.3.9-audiodevdefaults.patch index ed09e0a..fd52e49 100644 --- a/audacity-1.3.8-audiodevdefaults.patch +++ b/audacity-1.3.9-audiodevdefaults.patch @@ -1,7 +1,8 @@ -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 @@ +Index: audacity-src-1.3.9/src/prefs/DevicePrefs.cpp +=================================================================== +--- audacity-src-1.3.9.orig/src/prefs/DevicePrefs.cpp ++++ audacity-src-1.3.9/src/prefs/DevicePrefs.cpp +@@ -173,6 +173,16 @@ void DevicePrefs::OnHost(wxCommandEvent wxArrayString playnames; wxArrayString recordnames; @@ -14,30 +15,31 @@ diff -Nur audacity-src-1.3.8-orig/src/prefs/DevicePrefs.cpp audacity-src-1.3.8/s + recDeviceNum = Pa_GetDefaultInputDevice(); + } + ++ + int devindex; /* temp variable to hold the numeric ID of each device in turn */ + for (int i = 0; i < nDevices; i++) { - const PaDeviceInfo *info = Pa_GetDeviceInfo(i); - if (info->hostApi == index) { -@@ -182,7 +191,10 @@ +@@ -185,7 +195,10 @@ void DevicePrefs::OnHost(wxCommandEvent if (info->maxOutputChannels > 0) { playnames.Add(name); - index = mPlay->Append(name, (void *) info); -- if (device == mPlayDevice) { + devindex = mPlay->Append(name, (void *) info); +- if (device == mPlayDevice) { /* if this is the default device, select it */ + if (playDeviceNum == i) { + mPlay->SetSelection(index); + } + else if (device == mPlayDevice) { - mPlay->SetSelection(index); + mPlay->SetSelection(devindex); } } -@@ -190,7 +202,10 @@ +@@ -193,7 +206,10 @@ void DevicePrefs::OnHost(wxCommandEvent if (info->maxInputChannels > 0) { recordnames.Add(name); - index = mRecord->Append(name, (void *) info); + devindex = mRecord->Append(name, (void *) info); - if (device == mRecordDevice) { + if (recDeviceNum == i) { + mRecord->SetSelection(index); + } + else if (device == mRecordDevice) { - mRecord->SetSelection(index); + mRecord->SetSelection(devindex); } } diff --git a/audacity-1.3.8-gsocket-conflict.patch b/audacity-1.3.9-gsocket-conflict.patch similarity index 77% rename from audacity-1.3.8-gsocket-conflict.patch rename to audacity-1.3.9-gsocket-conflict.patch index 0de5f78..9687601 100644 --- a/audacity-1.3.8-gsocket-conflict.patch +++ b/audacity-1.3.9-gsocket-conflict.patch @@ -1,6 +1,6 @@ diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp audacity-src-1.3.8/src/AudacityApp.cpp ---- audacity-src-1.3.8-orig/src/AudacityApp.cpp 2009-07-16 05:27:35.000000000 +0200 -+++ audacity-src-1.3.8/src/AudacityApp.cpp 2009-07-20 23:45:41.000000000 +0200 +--- audacity-src-1.3.9-orig/src/AudacityApp.cpp 2009-07-16 05:27:35.000000000 +0200 ++++ audacity-src-1.3.9/src/AudacityApp.cpp 2009-07-20 23:45:41.000000000 +0200 @@ -331,7 +331,9 @@ /////////////////////////////////////////////////////////////////////////////// diff --git a/audacity-1.3.8-retval.patch b/audacity-1.3.9-retval.patch similarity index 100% rename from audacity-1.3.8-retval.patch rename to audacity-1.3.9-retval.patch diff --git a/audacity-minsrc-1.3.8.tar.bz2 b/audacity-minsrc-1.3.8.tar.bz2 deleted file mode 100644 index 5d5b4f3..0000000 --- a/audacity-minsrc-1.3.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf -size 6734200 diff --git a/audacity-minsrc-1.3.9.tar.bz2 b/audacity-minsrc-1.3.9.tar.bz2 new file mode 100644 index 0000000..78aa6ac --- /dev/null +++ b/audacity-minsrc-1.3.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f47afe8dcf38165d3550160eb7e94694119f5da563674060a93c5bc66e2fa012 +size 6719955 diff --git a/audacity.changes b/audacity.changes index 3877c9e..1224de6 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 5 09:40:31 UTC 2009 - davejplater@gmail.com + +- Update to 1.3.9 adapted patches and remade audacity-1.3.9-audiodevdefaults.patch + * Crash, slow launch or excessive CPU/memory use arising from automatic VST support: + o VST instrument plug-ins should now be correctly ignored + o VST effects now scanned only at start of first session that detects them, then cached + o Effects are now not loaded or opened until needed + o New "Effects" tab in Preferences to enable/disable VST effects and enable VST rescan on next launch + * Default View Mode now works + * Chains now always apply their stored parameters rather than those last used in Effect menu + * Non-MP3 files imported via drag or Recent Files caused crash if filter in file open window set to MP3 + * AAC exports (using the optional FFmpeg library) silenced + * Generating audio always fitted the project in the window; fit now done only if generating in new track + * View menu items/shortcuts incorrectly disabled when playing or recording + * DTMF generator defaulted to zero duration on open + * Unwanted interactions between linked audio and label tracks + * Various other interface bugs + * Compressor: new option to compress based on peaks, improved attack and decay time support + * Mixer Board: improved design, more responsive meters and now interacts fully with Track Panel in main window + ------------------------------------------------------------------- Fri Jul 31 15:21:50 CEST 2009 - mseben@suse.cz diff --git a/audacity.spec b/audacity.spec index edfac42..1b518c0 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,5 +1,5 @@ # -# spec file for package audacity (Version 1.3.8) +# spec file for package audacity (Version 1.3.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,8 +41,8 @@ BuildRequires: libmad-devel BuildRequires: libtwolame-devel %endif Summary: A Free, Cross-Platform Digital Audio Editor -Version: 1.3.8 -Release: 2 +Version: 1.3.9 +Release: 1 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors BuildRoot: %{_tmppath}/%{name}-%{version}-build