Accepting request 406665 from multimedia:apps

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/406665
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=70

audacity-2.1.1-fix-tempdir.patch

@@ -1,11 +0,0 @@
---- a/src/AudacityApp.cpp
-+++ b/src/AudacityApp.cpp
-@@ -1640,7 +1640,7 @@ bool AudacityApp::CreateSingleInstanceCh
-    mChecker = new wxSingleInstanceChecker();
- 
- #if defined(__UNIX__)
--   wxString sockFile(defaultTempDir + wxT("/.audacity.sock"));
-+   wxString sockFile(dir + wxT("/.audacity.sock"));
- #endif
- 
-    wxString runningTwoCopiesStr = _("Running two copies of Audacity simultaneously may cause\ndata loss or cause your system to crash.\n\n");

audacity-ffmpeg.patch

@@ -1,6 +1,8 @@
---- src/FFmpeg.h.orig	2015-03-03 20:56:22.816742627 +0100
+Index: src/FFmpeg.h
-+++ src/FFmpeg.h	2015-03-03 20:56:22.851741975 +0100
+===================================================================
-@@ -688,7 +688,7 @@
+--- src/FFmpeg.h.orig
++++ src/FFmpeg.h
+@@ -689,7 +689,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVOutputFormat*,
        av_oformat_next,
@@ -9,7 +11,7 @@
        (f)
     );
     FFMPEG_FUNCTION_WITH_RETURN(
-@@ -755,7 +755,7 @@
+@@ -756,7 +756,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        int,
        av_fifo_size,
@@ -18,7 +20,7 @@
        (f)
     );
     FFMPEG_FUNCTION_WITH_RETURN(
-@@ -801,7 +801,7 @@
+@@ -802,7 +802,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVDictionaryEntry *,
        av_dict_get,

audacity-gcc6.patch

@@ -1,7 +1,8 @@
-diff -r -u /tmp/audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp
+Index: src/effects/vamp/LoadVamp.cpp
---- audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp	2015-07-10 19:35:40.000000000 +0200
+===================================================================
-+++ audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp	2016-06-17 11:18:54.897140407 +0200
+--- src/effects/vamp/LoadVamp.cpp.orig
-@@ -266,7 +266,7 @@
++++ src/effects/vamp/LoadVamp.cpp
+@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
     Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
     if (!vp)
     {
@@ -10,10 +11,11 @@ diff -r -u /tmp/audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp audacity-min
     }
  
     // We limit the listed plugin outputs to those whose results can
-diff -r -u /tmp/audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp
+Index: src/import/ImportFLAC.cpp
---- audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp	2015-07-10 19:35:40.000000000 +0200
+===================================================================
-+++ audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp	2016-06-17 11:17:46.555821274 +0200
+--- src/import/ImportFLAC.cpp.orig
-@@ -296,7 +296,7 @@
++++ src/import/ImportFLAC.cpp
+@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
     int cnt;
     wxFile binaryFile;
     if (!binaryFile.Open(filename)) {
@@ -22,7 +24,7 @@ diff -r -u /tmp/audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp audacity-minsrc-
     }
  
  #ifdef USE_LIBID3TAG
-@@ -313,7 +313,7 @@
+@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
  
     if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
        // File is not a FLAC file
@@ -31,33 +33,3 @@ diff -r -u /tmp/audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp audacity-minsrc-
     }
  
     // Open the file for import
-diff -r -u /tmp/audacity-minsrc-2.1.1/src/WaveTrack.cpp audacity-minsrc-2.1.1/src/WaveTrack.cpp
---- audacity-minsrc-2.1.1/src/WaveTrack.cpp	2015-07-10 19:35:40.000000000 +0200
-+++ audacity-minsrc-2.1.1/src/WaveTrack.cpp	2016-06-17 11:17:12.099156221 +0200
-@@ -2561,7 +2561,7 @@
-             const sampleCount len0 = mPTrack->GetBestBlockSize(start0);
-             wxASSERT(len0 <= mBufferSize);
-             if (!mPTrack->Get(samplePtr(mBuffers[0].data), floatSample, start0, len0))
--               return false;
-+               return 0;
-             mBuffers[0].start = start0;
-             mBuffers[0].len = len0;
-             if (!fillSecond &&
-@@ -2587,7 +2587,7 @@
-                const sampleCount len1 = mPTrack->GetBestBlockSize(start1);
-                wxASSERT(len1 <= mBufferSize);
-                if (!mPTrack->Get(samplePtr(mBuffers[1].data), floatSample, start1, len1))
--                  return false;
-+                  return 0;
-                mBuffers[1].start = start1;
-                mBuffers[1].len = len1;
-                mNValidBuffers = 2;
-@@ -2637,7 +2637,7 @@
-          // Very big request!
-          // Fall back to direct fetch
-          if (!mPTrack->Get(buffer, format, start, remaining))
--            return false;
-+            return 0;
-       }
- 
-       return mOverlapBuffer.ptr();

audacity-minsrc-2.1.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872
-size 7154008

audacity-minsrc-2.1.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44
+size 7233500

audacity-no_buildstamp.patch

@@ -1,7 +1,7 @@
 Index: lib-src/portaudio-v19/src/common/pa_front.c
 ===================================================================
---- a/lib-src/portaudio-v19/src/common/pa_front.c
+--- lib-src/portaudio-v19/src/common/pa_front.c.orig
-+++ b/lib-src/portaudio-v19/src/common/pa_front.c
++++ lib-src/portaudio-v19/src/common/pa_front.c
 @@ -78,7 +78,7 @@
  
  
@@ -13,9 +13,9 @@ Index: lib-src/portaudio-v19/src/common/pa_front.c
  
 Index: src/AboutDialog.cpp
 ===================================================================
---- a/src/AboutDialog.cpp
+--- src/AboutDialog.cpp.orig
-+++ b/src/AboutDialog.cpp
++++ src/AboutDialog.cpp
-@@ -523,9 +523,6 @@
+@@ -520,9 +520,6 @@ void AboutDialog::PopulateInformationPag
     informationStr += _("Build Information");
     informationStr += wxT("</h3>\n<table>");
  

audacity.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Mon Jun 27 13:19:29 UTC 2016 - davejplater@gmail.com
+
+- Update to audacity-2.1.2 which builds with wxWidgets-3_0-nostl
+  and can use rpm's internal dependency generator. This enables it
+  to provide appdata.xml and desktop files and fixes boo#952324 and
+  duplicate boo#963592.
+- Refreshed patches.
+- Removed audacity-2.1.1-fix-tempdir.patch incorporated in this
+  version.
+- Upstream changes:
+  Changes and Improvements:
+  *Interface:
+   * Spectrogram settings are now available per track.
+   * Clearer (sharper) display of pitch (EAC).
+   * New 'Spectral Reassignment' option in spectrogram.
+  Bug fixes:
+  *Crashes
+   *Crash using 'space' in Selection toolbar context menu fixed.
+   *Crash setting equalization effect parameters in chains fixed.
+   *Crash pressing both mouse buttons over toolbar buttons fixed.
+   *(Rare) crash or freeze in sound activated recording fixed.
+   *(Rare) crash on using plot spectrum for first time fixed.
+  *Interface
+   * Equalization effect settings are now saved.
+   * Oversized Export Options window now OK on smaller screens.
+   * FLAC import/export fast again.
+   * Can now set undefined frequency in Spectral Selection bar.
+   * Imported presets on custom FFmpeg export fixed.
+   * Text input boxes working with VAMP
+   * Keyboard playback commands now work again.
+   * Import Raw Data now works when in Polish language.
+
 -------------------------------------------------------------------
 Fri Jun 17 09:37:05 UTC 2016 - martin.liska@suse.com
 

audacity.spec

@@ -16,13 +16,11 @@
 #
 
 
-%define _use_internal_dependency_generator 0
-%define __find_requires %{wx_requires}
 %bcond_with mad
 %bcond_with lame
 %bcond_with twolame
 Name:           audacity
-Version:        2.1.1
+Version:        2.1.2
 Release:        0
 Summary:        A Free, Cross-Platform Digital Audio Editor
 License:        GPL-2.0+
@@ -39,8 +37,6 @@ Patch1:         %{name}-flac_assert.h.patch
 Patch2:         %{name}-fix-nonsense.patch
 # PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf@opensuse.org -- Patch to compile with latest ffmpeg.
 Patch3:         %{name}-ffmpeg.patch
-# PATCH-FIX-UPSTREAM audacity-2.1.1-fix-tempdir.patch boo#976964 -- Fix usage of custom temp directories (commit 2a6d423).
-Patch4:         %{name}-2.1.1-fix-tempdir.patch
 # PATCH-FIX-UPSTREAM audacity-gcc6.patch mliska@suse.cz -- Fix GCC6 warnings.
 Patch5:         %{name}-gcc6.patch
 BuildRequires:  autoconf
@@ -49,7 +45,7 @@ BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  wxWidgets-devel = 2.8.12
+BuildRequires:  wxWidgets-3_0-nostl-devel
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(flac)
@@ -97,12 +93,11 @@ than the physical memory size of your computer.
 
 %prep
 %setup -q -n %{name}-minsrc-%{version}
-%patch0 -p1
+%patch0
 %patch1 -p1
 %patch2 -p1
 %patch3
-%patch4 -p1
+%patch5
-%patch5 -p1
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
 rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/