Accepting request 883844 from multimedia:apps

- Update to release 3.0.0 and add patch for wxWidgets test:
  audacity-remove-wx-test.patch
- Add another useless return after assert to:
  audacity-no_return_in_nonvoid.patch

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

Audacity-2.4.2.tar.gz

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

Audacity-3.0.0.tar.gz

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

audacity-misc-errors.patch

@@ -23,10 +23,10 @@ I: Program uses operation a <= b <= c, which is not well defined.
 E: audacity mathmeaning SplashDialog.cpp:148
 
 
-Index: audacity-Audacity-2.4.1/lib-src/portmidi/pm_linux/finddefault.c
+Index: b/lib-src/portmidi/pm_linux/finddefault.c
 ===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/portmidi/pm_linux/finddefault.c	2020-05-19 11:43:53.000000000 +0200
+--- a/lib-src/portmidi/pm_linux/finddefault.c	2021-03-09 12:19:38.000000000 +0200
-+++ audacity-Audacity-2.4.1/lib-src/portmidi/pm_linux/finddefault.c	2020-06-08 11:50:49.379072582 +0200
++++ b/lib-src/portmidi/pm_linux/finddefault.c	2021-03-23 08:53:08.077749524 +0200
 @@ -5,6 +5,8 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -36,10 +36,10 @@ Index: audacity-Audacity-2.4.1/lib-src/portmidi/pm_linux/finddefault.c
  #include "portmidi.h"
  
  #define STRING_MAX 256
-Index: audacity-Audacity-2.4.1/include/audacity/EffectAutomationParameters.h
+Index: b/include/audacity/EffectAutomationParameters.h
 ===================================================================
---- audacity-Audacity-2.4.1.orig/include/audacity/EffectAutomationParameters.h	2020-05-19 11:43:53.000000000 +0200
+--- a/include/audacity/EffectAutomationParameters.h	2021-03-09 12:19:38.000000000 +0200
-+++ audacity-Audacity-2.4.1/include/audacity/EffectAutomationParameters.h	2020-06-08 11:50:49.379072582 +0200
++++ b/include/audacity/EffectAutomationParameters.h	2021-03-23 08:53:08.077749524 +0200
 @@ -135,7 +135,7 @@ public:
  
     bool ReadFloat(const wxString & key, float *pf) const

audacity-no_buildstamp.patch

@@ -1,7 +1,7 @@
-Index: audacity-Audacity-2.4.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c
+Index: b/lib-src/portaudio-v19/qa/loopback/src/paqa.c
 ===================================================================
---- audacity-Audacity-2.4.2.orig/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2020-06-19 17:16:47.000000000 +0200
+--- a/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2021-03-23 08:54:14.352557632 +0200
-+++ audacity-Audacity-2.4.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2020-06-28 09:53:36.618593507 +0200
++++ b/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2021-03-23 08:54:38.785492888 +0200
 @@ -1460,7 +1460,7 @@ int main( int argc, char **argv )
  	int justMath = 0;
      char *executableName = argv[0];
@@ -11,11 +11,11 @@ Index: audacity-Audacity-2.4.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c
  
  	if( argc > 1 ){
  		printf("running with arguments:");
-Index: audacity-Audacity-2.4.2/src/AboutDialog.cpp
+Index: b/src/AboutDialog.cpp
 ===================================================================
---- audacity-Audacity-2.4.2.orig/src/AboutDialog.cpp	2020-06-19 17:16:47.000000000 +0200
+--- a/src/AboutDialog.cpp	2021-03-23 08:54:14.352557632 +0200
-+++ audacity-Audacity-2.4.2/src/AboutDialog.cpp	2020-06-28 09:53:36.618593507 +0200
++++ b/src/AboutDialog.cpp	2021-03-23 08:54:38.785492888 +0200
-@@ -70,7 +70,7 @@ hold information about one contributor t
+@@ -69,7 +69,7 @@ hold information about one contributor t
  #endif
  
  #ifdef REV_LONG
@@ -24,7 +24,7 @@ Index: audacity-Audacity-2.4.2/src/AboutDialog.cpp
  #else
  #define REV_IDENT (XO("No revision identifier was provided").Translation())
  #endif
-@@ -751,8 +751,8 @@ void AboutDialog::PopulateInformationPag
+@@ -750,8 +750,8 @@ void AboutDialog::PopulateInformationPag
        << XO("Build Information")
        << wxT("</h3>\n<table>");
  

audacity-no_return_in_nonvoid.patch

@@ -1,8 +1,8 @@
 Index: b/src/widgets/NumericTextCtrl.cpp
 ===================================================================
---- a/src/widgets/NumericTextCtrl.cpp	2020-06-19 17:16:47.000000000 +0200
+--- a/src/widgets/NumericTextCtrl.cpp	2021-03-09 12:19:38.000000000 +0200
-+++ b/src/widgets/NumericTextCtrl.cpp	2020-06-28 11:27:53.709676198 +0200
++++ b/src/widgets/NumericTextCtrl.cpp	2021-04-08 10:00:19.126519391 +0200
-@@ -654,6 +654,7 @@ static const BuiltinFormatString Bandwid
+@@ -677,6 +677,7 @@ static const BuiltinFormatString Bandwid
           case NumericConverter::BANDWIDTH:
              return WXSIZEOF(BandwidthConverterFormats_);
        }
@@ -12,8 +12,8 @@ Index: b/src/widgets/NumericTextCtrl.cpp
  
 Index: b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
 ===================================================================
---- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c	2020-06-19 17:16:47.000000000 +0200
+--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c	2021-03-09 12:19:38.000000000 +0200
-+++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c	2020-06-28 11:27:53.773678563 +0200
++++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c	2021-04-08 10:00:19.174520965 +0200
 @@ -603,7 +603,10 @@ LVAL xcleanup(void)
  {
      xllastarg();
@@ -28,8 +28,8 @@ Index: b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
  /* xtoplevel - special form 'top-level' */
 Index: b/lib-src/portsmf/allegro.cpp
 ===================================================================
---- a/lib-src/portsmf/allegro.cpp	2020-06-19 17:16:47.000000000 +0200
+--- a/lib-src/portsmf/allegro.cpp	2021-03-09 12:19:38.000000000 +0200
-+++ b/lib-src/portsmf/allegro.cpp	2020-06-28 12:38:54.119640838 +0200
++++ b/lib-src/portsmf/allegro.cpp	2021-04-08 10:00:19.186521359 +0200
 @@ -2885,6 +2885,9 @@ Alg_event_ptr &Alg_seq::operator[](int i
          tr++;
      }
@@ -42,13 +42,13 @@ Index: b/lib-src/portsmf/allegro.cpp
  
 Index: b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c
 ===================================================================
---- a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c	2020-06-19 17:16:47.000000000 +0200
+--- a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c	2021-03-09 12:19:38.000000000 +0200
-+++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c	2020-06-28 11:54:14.043499973 +0200
++++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c	2021-04-08 11:22:54.394897011 +0200
-@@ -596,6 +596,7 @@ double pv_get_effective_pos(Phase_vocode
+@@ -600,6 +600,7 @@ double pv_get_effective_pos(Phase_vocode
          return -(pv->ratio * pv->fftsize / 2.0);
-     } else { // I can't think of any other case.
+     } // I can't think of any other case.
-         assert(FALSE);
+     assert(FALSE);
-+	return -(pv->ratio * pv->fftsize / 2.0); //Another false positive ignoring assert as a return value
++    return(0);
-     }
  }
  
+ 

audacity-remove-wx-test.patch

@@ -0,0 +1,30 @@
+From: Dave Plater <davejplater@gmail.com>
+Date: Thu  8 Apr 10:29:11 SAST 2021
+Subject: Remove test for audacity's fork of wxWidgets
+References: Audacity-devel list
+Upstream: Supplied via email
+
+Audacity 3.0.0 has a test requiring their fork of wxWidgets 3.1.3
+but all the fixes are in standard wxWidgets 3.1.4 as in openSUSE:Tumbleweed.
+This patch removes the test.
+Index: b/cmake-proxies/wxWidgets/CMakeLists.txt
+===================================================================
+--- a/cmake-proxies/wxWidgets/CMakeLists.txt	2021-03-09 12:19:38.000000000 +0200
++++ b/cmake-proxies/wxWidgets/CMakeLists.txt	2021-04-08 10:24:32.927995434 +0200
+@@ -237,16 +237,6 @@ file(
+       "^#define +wxVERSION_STRING +"
+ )
+ 
+-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
+-if( NOT ours )
+-   message( FATAL_ERROR
+-      "\n########################################################################\n"
+-      "Audacity version 3.0.0 or higher requires use of a customized version of "
+-      "wxWidgets.  For details:\n"
+-      "  https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
+-      "########################################################################\n"
+-   )
+-endif()
+ 
+ target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
+ target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )

audacity.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Apr  8 08:39:08 UTC 2021 - Dave Plater <davejplater@gmail.com>
+
+- Update to release 3.0.0 and add patch for wxWidgets test:
+  audacity-remove-wx-test.patch
+- Add another useless return after assert to:
+  audacity-no_return_in_nonvoid.patch
+- Upstream changes:
+ *Audacity 3.0.0 is a major update on our previous release
+  We’ve changed the format in which we save Audacity projects! 
+  Previously we saved projects as a sometimes large number of small
+  files, with an ‘.aup’ file to coordinate the lot. This way of
+  doing things is sometimes called ‘pile of files’ storage.
+ *We did have time to improve our ‘Noise Gate’ effect and add a
+  new analyzer, ‘Label Sounds’, that can label sounds and silences
+  We also made a few small tweaks elsewhere. You can now import
+  and export macros, and there are a couple of new commands for
+  using the last used tool or last used analyzer that you can give
+  shortcuts to.
+ *We also fixed over 160 bugs that had been accumulating over the
+  years. This is quite a staggering amount of work. The majority
+  of these bugs were minor problems, easily worked around.
+  Some though were really juicy high priority bugs that would have
+  mattered a lot to the people affected by them. We’re really glad
+  to have these bugs fixed now.
+
 -------------------------------------------------------------------
 Thu Oct  1 09:05:10 UTC 2020 - Dave Plater <davejplater@gmail.com>
 

audacity.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package audacity
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           audacity
-Version:        2.4.2
+Version:        3.0.0
 Release:        0
 Summary:        A Multi Track Digital Audio Editor
 License:        GPL-2.0-or-later
@@ -32,17 +32,14 @@ Patch0:         audacity-no_buildstamp.patch
 Patch2:         audacity-misc-errors.patch
 # PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch - Fix false positive errors Two new gcc10 ones ignoring assert
 Patch3:         audacity-no_return_in_nonvoid.patch
+Patch4:         audacity-remove-wx-test.patch
 BuildRequires:  cmake >= 3.15
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 #!BuildIgnore:  gstreamer-0_10-plugins-base
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libmp3lame-devel
-%if 0%{?suse_version} && 0%{?suse_version} > 1520
 BuildRequires:  wxWidgets-3_2-nostl-devel
-%else
-BuildRequires:  wxWidgets-3_0-nostl-devel
-%endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(flac) >= 1.3.1
@@ -146,6 +143,14 @@ rm -rf %{buildroot}%{_datadir}/pixmaps/
 rm -rf %{buildroot}%{_datadir}/doc
 cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt
 
+# Why make install installs these is a mystery
+rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu-suse-nostl.so.4.0.0
+rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu_net-suse-nostl.so.4.0.0
+rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu_xml-suse-nostl.so.4.0.0
+rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_core-suse-nostl.so.4.0.0
+rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_html-suse-nostl.so.4.0.0
+rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_qa-suse-nostl.so.4.0.0
+
 %find_lang %{name}
 
 %files