Accepting request 815625 from multimedia:apps

- Fix Leap:15.1 build with audacity-implicit-fortify-decl.patch.
- Update to release 2.4.1 and remove:
  0001-Bug2436-Cross-project-paste-should-duplicate-block-f.patch
- Now needs wxWidgets >=3.1.1 to build.

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

Audacity-2.3.3.tar.gz

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

Audacity-2.4.1.tar.gz

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

audacity-implicit-fortify-decl.patch

@@ -0,0 +1,17 @@
+Index: b/lib-src/libnyquist/nyquist/xlisp/security.c
+===================================================================
+--- a/lib-src/libnyquist/nyquist/xlisp/security.c	2020-06-15 10:39:50.030730823 +0200
++++ b/lib-src/libnyquist/nyquist/xlisp/security.c	2020-06-15 10:59:45.779010172 +0200
+@@ -4,12 +4,7 @@
+  */
+ 
+ #include <stdlib.h>
+-#if defined(UNIX) || defined(__APPLE__)
+ #include <unistd.h>
+-#endif
+-#ifdef WIN32
+-#include <direct.h>
+-#endif
+ #include <string.h>
+ #include <xlisp.h>
+ 

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.3.3/lib-src/portmidi/pm_linux/finddefault.c
+Index: audacity-Audacity-2.4.1/lib-src/portmidi/pm_linux/finddefault.c
 ===================================================================
---- audacity-Audacity-2.3.3.orig/lib-src/portmidi/pm_linux/finddefault.c	2019-11-15 13:14:55.000000000 +0200
+--- audacity-Audacity-2.4.1.orig/lib-src/portmidi/pm_linux/finddefault.c	2020-05-19 11:43:53.000000000 +0200
-+++ audacity-Audacity-2.3.3/lib-src/portmidi/pm_linux/finddefault.c	2020-02-02 15:41:26.235929851 +0200
++++ audacity-Audacity-2.4.1/lib-src/portmidi/pm_linux/finddefault.c	2020-06-08 11:50:49.379072582 +0200
 @@ -5,6 +5,8 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -36,10 +36,10 @@ Index: audacity-Audacity-2.3.3/lib-src/portmidi/pm_linux/finddefault.c
  #include "portmidi.h"
  
  #define STRING_MAX 256
-Index: audacity-Audacity-2.3.3/include/audacity/EffectAutomationParameters.h
+Index: audacity-Audacity-2.4.1/include/audacity/EffectAutomationParameters.h
 ===================================================================
---- audacity-Audacity-2.3.3.orig/include/audacity/EffectAutomationParameters.h	2019-11-15 13:14:55.000000000 +0200
+--- audacity-Audacity-2.4.1.orig/include/audacity/EffectAutomationParameters.h	2020-05-19 11:43:53.000000000 +0200
-+++ audacity-Audacity-2.3.3/include/audacity/EffectAutomationParameters.h	2020-02-02 15:41:26.235929851 +0200
++++ audacity-Audacity-2.4.1/include/audacity/EffectAutomationParameters.h	2020-06-08 11:50:49.379072582 +0200
 @@ -135,7 +135,7 @@ public:
  
     bool ReadFloat(const wxString & key, float *pf) const

audacity-no_buildstamp.patch

@@ -1,31 +1,7 @@
-Index: audacity-Audacity-2.3.3/src/AboutDialog.cpp
+Index: audacity-Audacity-2.4.0/lib-src/portaudio-v19/qa/loopback/src/paqa.c
 ===================================================================
---- audacity-Audacity-2.3.3.orig/src/AboutDialog.cpp	2019-11-15 13:14:55.000000000 +0200
+--- audacity-Audacity-2.4.0.orig/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2020-05-18 12:54:40.106763016 +0200
-+++ audacity-Audacity-2.3.3/src/AboutDialog.cpp	2020-02-02 15:40:57.718746982 +0200
++++ audacity-Audacity-2.4.0/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2020-05-18 12:55:07.291841573 +0200
-@@ -65,7 +65,7 @@ hold information about one contributor t
- #ifdef REV_LONG
- #define REV_IDENT wxString( "[[https://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " +  REV_TIME 
- #else
--#define REV_IDENT wxT("No revision identifier was provided")
-+#define REV_IDENT wxT("Official openSUSE Build")
- #endif
- 
- extern wxString FormatHtmlText( const wxString & Text );
-@@ -604,8 +604,8 @@ void AboutDialog::PopulateInformationPag
-    informationStr += _("Build Information");
-    informationStr += wxT("</h3>\n<table>");
- 
--   // Current date
--   AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
-+   /*/ Current date
-+   AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);*/
-    AddBuildinfoRow(&informationStr, _("Commit Id:"), REV_IDENT );
- 
-    // Not translated in 2.3.1.
-Index: audacity-Audacity-2.3.3/lib-src/portaudio-v19/qa/loopback/src/paqa.c
-===================================================================
---- audacity-Audacity-2.3.3.orig/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2019-11-15 13:14:55.000000000 +0200
-+++ audacity-Audacity-2.3.3/lib-src/portaudio-v19/qa/loopback/src/paqa.c	2020-02-02 15:40:57.718746982 +0200
 @@ -1460,7 +1460,7 @@ int main( int argc, char **argv )
  	int justMath = 0;
      char *executableName = argv[0];
@@ -35,3 +11,27 @@ Index: audacity-Audacity-2.3.3/lib-src/portaudio-v19/qa/loopback/src/paqa.c
  
  	if( argc > 1 ){
  		printf("running with arguments:");
+Index: audacity-Audacity-2.4.0/src/AboutDialog.cpp
+===================================================================
+--- audacity-Audacity-2.4.0.orig/src/AboutDialog.cpp	2020-05-18 12:55:07.291841573 +0200
++++ audacity-Audacity-2.4.0/src/AboutDialog.cpp	2020-05-18 13:03:11.727062253 +0200
+@@ -69,7 +69,7 @@ hold information about one contributor t
+ #endif
+ 
+ #ifdef REV_LONG
+-#define REV_IDENT wxString( "[[https://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " +  REV_TIME 
++#define REV_IDENT wxString( "Official openSUSE Build" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " +  REV_TIME
+ #else
+ #define REV_IDENT (XO("No revision identifier was provided").Translation())
+ #endif
+@@ -701,8 +701,8 @@ void AboutDialog::PopulateInformationPag
+       << XO("Build Information")
+       << wxT("</h3>\n<table>");
+ 
+-   // Current date
+-   AddBuildinfoRow(&informationStr, XO("Program build date:"), __TDATE__);
++   /*/ Current date
++   AddBuildinfoRow(&informationStr, XO("Program build date:"), __TDATE__);*/
+    AddBuildinfoRow(&informationStr, XO("Commit Id:"), REV_IDENT );
+ 
+    auto buildType =

audacity.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Mon Jun 15 09:28:20 UTC 2020 - Dave Plater <davejplater@gmail.com>
+
+- Fix Leap:15.1 build with audacity-implicit-fortify-decl.patch.
+
+-------------------------------------------------------------------
+Mon Jun  8 09:37:32 UTC 2020 - Dave Plater <davejplater@gmail.com>
+
+- Update to release 2.4.1 and remove:
+  0001-Bug2436-Cross-project-paste-should-duplicate-block-f.patch
+- Now needs wxWidgets >=3.1.1 to build.
+- Upstream changes:
+  * A new Time Toolbar showing current record/playback time has been
+    split from the Selection Toolbar.  It can be resized large.
+  * Presets for more effects can be imported and exported.
+  * A new Multi-View mode for tracks.  In this mode both 
+    spectrogram and waveform views are shown at the same time.
+  * Opus available as a new audio export format on Windows and Linux.
+  * Easier to convert labels between point labels and range labels.
+  * New Loudness Normalization effect.
+  * New RMS measurement analyzer.
+  * New Noise Gate effect.
+  * New Spectral Delete effect.
+  * 2237 - Equalization effects have no Import or Export for curves
+  * 2261 - Graphic EQ sliders have no frequency labels
+  * 2265 - Track heights are reset to default on project re-opening
+  * 2303 - Playback does not start at the saved cursor position on
+    reopening a saved project.
+  * 2314 - Zoom in fail when playing
+  See also: 
+  https://wiki.audacityteam.org/wiki/New_features_in_Audacity_2.4.1
+
+-------------------------------------------------------------------
+Mon May 18 11:11:10 UTC 2020 - Dave Plater <davejplater@gmail.com>
+
+- Update to release 2.4.0 and rebase audacity-no_buildstamp.patch.
+- Add patch from git:
+  0001-Bug2436-Cross-project-paste-should-duplicate-block-f.patch
+- Add plugins sub package.
+- Upstream changes:
+  *have split the recording/playing time off from the selection
+   toolbar and it can now be dragged to make it larger.
+  *added a new optional mode for viewing audio. In this new mode
+   you can see both the waveform and a spectrogram at the same time.
+   Previously you would switch back and forth between them if you
+   wanted both.
+
 -------------------------------------------------------------------
 Thu Feb 13 14:51:29 CET 2020 - sbrabec@suse.com
 

audacity.spec

@@ -16,14 +16,8 @@
 #
 
 
-%if 0%{?suse_version} >= 1330 || 0%{?leap_version} >= 420300
-%bcond_without mad
-%else
-%bcond_with mad
-%endif
-
 Name:           audacity
-Version:        2.3.3
+Version:        2.4.1
 Release:        0
 Summary:        A Multi Track Digital Audio Editor
 License:        GPL-2.0-or-later
@@ -40,22 +34,18 @@ Patch1:         audacity-flacversion.patch
 Patch2:         audacity-misc-errors.patch
 # PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch
 Patch3:         audacity-no_return_in_nonvoid.patch
+# PATCH-FIX-OPENSUSE audacity-implicit-fortify-decl.patch davejplater@gmail.com -- Leap:15.1's build misses "UNIX" definition in nyquist/xlisp/security.c
+Patch4:         audacity-implicit-fortify-decl.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
-#Audacity only builds with gcc >= 4.9
-# WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff and gcc >= 5
-%if 0%{?suse_version} == 1315
-BuildRequires:  cpp7
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
-%else
 BuildRequires:  gcc-c++
-%endif
 #!BuildIgnore:  gstreamer-0_10-plugins-base
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  wxWidgets-3_0-nostl-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libwx_gtk3u_core-suse-nostl3_1_3
+BuildRequires:  wxWidgets-3_2-nostl-devel
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(flac) >= 1.3.1
@@ -67,27 +57,25 @@ BuildRequires:  pkgconfig(libavformat) >= 52.12
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(lilv-0) >= 0.16
 BuildRequires:  pkgconfig(lv2)
+BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(soundtouch)
 BuildRequires:  pkgconfig(soxr)
 BuildRequires:  pkgconfig(suil-0) >= 0.8.2
+BuildRequires:  pkgconfig(twolame)
 BuildRequires:  pkgconfig(vamp-hostsdk)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vorbisenc)
 BuildRequires:  pkgconfig(vorbisfile)
-%if %{with mad}
-BuildRequires:  libmp3lame-devel
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(twolame)
-%endif
 # This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio.
 #BuildRequires:  portaudio-devel
 Recommends:     %{name}-lang
 # WARNING Nothing provides libavutil without a suffix
 Requires:       ffmpeg
 Recommends:     libmp3lame0
+Requires:       %{name}-plugins = %{version}
 Requires:       libFLAC++6 >= 1.3.1
 Requires:       libFLAC8 >= 1.3.1
 
@@ -100,27 +88,27 @@ physical memory size can be edited.
 
 %lang_package
 
+%package plugins
+Summary:        Enhancments for Audacity
+Group:          Productivity/Multimedia/Sound
+Requires:       %{name} =  %{version}
+
+%description plugins
+This package contains extra plugins for audacity.
+
+
 %prep
 %setup -q -n %{name}-Audacity-%{version}
 %autopatch -p1
 
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
-rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/
+rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/
-%if %{with mad}
-rm -rf lib-src/lame
-%endif
 
 %build
-%if 0%{suse_version} == 1315
+export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb"
-# WARNING: Do not alter, only for Leap.
-export CC="%{_bindir}/gcc-7"
-export CXX="%{_bindir}/g++-7"
-export CPP="%{_bindir}/cpp-7"
-%endif
-
-export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="$CFLAGS -std=gnu++11"
+%if 1 == 1
 aclocal -I m4
 autoconf
 %configure \
@@ -131,15 +119,13 @@ autoconf
   --disable-dynamic-loading \
   %endif
   --with-ffmpeg=system \
-%if %{with mad}
   --with-libmad=system \
   --with-libtwolame=system \
   --with-lame=system \
-%else
-  --without-libmad \
-  --without-libtwolame \
-%endif
   --docdir=%{_docdir}/%{name}/
+%else
+%cmake
+%endif
 
 make %{?_smp_mflags}
 
@@ -152,22 +138,18 @@ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project.
   %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm
 rm -rf %{buildroot}%{_datadir}/pixmaps/
 rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt
+cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt
 %find_lang %{name}
 
-%post
+%files plugins
-%desktop_database_post
+%license LICENSE.txt
-%icon_theme_cache_post
+%dir %{_libdir}/%{name}
-%mime_database_post
+%{_libdir}/%{name}/libsuil*.so
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-%mime_database_postun
 
 %files
 %defattr(-,root,root)
 %doc README.txt
-%license LICENSE.txt LICENSE_NYQUIST.txt
+%license LICENSE.txt LICENSE_NYQUIST.txt portmixer.LICENSE.txt
 %doc %{_docdir}/%{name}/
 %{_bindir}/%{name}
 %{_datadir}/%{name}/