From d22ca099a09b81a00e7f4cd2589f119d3bf0aee97dda38ac757e301324ece818 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 18 Mar 2017 15:28:01 +0000 Subject: [PATCH 1/2] Accepting request 481027 from home:plater Update to 2.1.3 OBS-URL: https://build.opensuse.org/request/show/481027 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=96 --- Audacity-2.1.3.tar.gz | 3 ++ audacity-ffmpeg.patch | 31 -------------------- audacity-fix-nonsense.patch | 20 +++++++------ audacity-gcc6.patch | 35 ---------------------- audacity-minsrc-2.1.2.tar.xz | 3 -- audacity-no_buildstamp.patch | 56 ++++++++++++++++++++---------------- audacity.changes | 29 +++++++++++++++++++ audacity.spec | 49 +++++++++++++++++++++---------- 8 files changed, 110 insertions(+), 116 deletions(-) create mode 100644 Audacity-2.1.3.tar.gz delete mode 100644 audacity-ffmpeg.patch delete mode 100644 audacity-gcc6.patch delete mode 100644 audacity-minsrc-2.1.2.tar.xz diff --git a/Audacity-2.1.3.tar.gz b/Audacity-2.1.3.tar.gz new file mode 100644 index 0000000..6c75a9c --- /dev/null +++ b/Audacity-2.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86 +size 24106855 diff --git a/audacity-ffmpeg.patch b/audacity-ffmpeg.patch deleted file mode 100644 index 0c20745..0000000 --- a/audacity-ffmpeg.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: src/FFmpeg.h -=================================================================== ---- src/FFmpeg.h.orig -+++ src/FFmpeg.h -@@ -689,7 +689,7 @@ extern "C" { - FFMPEG_FUNCTION_WITH_RETURN( - AVOutputFormat*, - av_oformat_next, -- (AVOutputFormat *f), -+ (const AVOutputFormat *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -756,7 +756,7 @@ extern "C" { - FFMPEG_FUNCTION_WITH_RETURN( - int, - av_fifo_size, -- (AVFifoBuffer *f), -+ (const AVFifoBuffer *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -802,7 +802,7 @@ extern "C" { - FFMPEG_FUNCTION_WITH_RETURN( - AVDictionaryEntry *, - av_dict_get, -- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), -+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), - (m, key, prev, flags) - ); - FFMPEG_FUNCTION_WITH_RETURN( diff --git a/audacity-fix-nonsense.patch b/audacity-fix-nonsense.patch index 5bd8acd..baa9d14 100644 --- a/audacity-fix-nonsense.patch +++ b/audacity-fix-nonsense.patch @@ -1,24 +1,28 @@ ---- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c -+++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c -@@ -603,7 +603,10 @@ +Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c +=================================================================== +--- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig 2017-03-03 21:27:17.000000000 +0200 ++++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2017-03-12 10:16:53.207654852 +0200 +@@ -603,7 +603,10 @@ LVAL xcleanup(void) { xllastarg(); xlcleanup(); - /* compiler might (wrongly) complain there is no return value */ + /* this point will never be reached because xlcleanup() does a -+ longjmp(). The return is added to avoid false positive ++ longjmp(). The return is added to avoid false positive + error messages from static analyzers and compilers */ + return (NIL); } /* xtoplevel - special form 'top-level' */ ---- a/src/PluginManager.h -+++ b/src/PluginManager.h -@@ -161,7 +161,6 @@ +Index: src/PluginManager.h +=================================================================== +--- src/PluginManager.h.orig 2017-03-03 21:27:17.000000000 +0200 ++++ src/PluginManager.h 2017-03-12 10:16:53.207654852 +0200 +@@ -167,7 +167,6 @@ typedef std::maploadPlugin(key, 48000); // rate doesn't matter here - if (!vp) - { -- return false; -+ return 0; - } - - // We limit the listed plugin outputs to those whose results can -Index: src/import/ImportFLAC.cpp -=================================================================== ---- src/import/ImportFLAC.cpp.orig -+++ src/import/ImportFLAC.cpp -@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open - int cnt; - wxFile binaryFile; - if (!binaryFile.Open(filename)) { -- return false; // File not found -+ return NULL; // File not found - } - - #ifdef USE_LIBID3TAG -@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open - - if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) { - // File is not a FLAC file -- return false; -+ return NULL; - } - - // Open the file for import diff --git a/audacity-minsrc-2.1.2.tar.xz b/audacity-minsrc-2.1.2.tar.xz deleted file mode 100644 index e4e0019..0000000 --- a/audacity-minsrc-2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 -size 7233500 diff --git a/audacity-no_buildstamp.patch b/audacity-no_buildstamp.patch index 8d46155..fe18427 100644 --- a/audacity-no_buildstamp.patch +++ b/audacity-no_buildstamp.patch @@ -1,27 +1,35 @@ -Index: lib-src/portaudio-v19/src/common/pa_front.c -=================================================================== ---- lib-src/portaudio-v19/src/common/pa_front.c.orig -+++ lib-src/portaudio-v19/src/common/pa_front.c -@@ -78,7 +78,7 @@ - - - #define PA_VERSION_ 1899 --#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__ " " __TIME__ ")" -+#define PA_VERSION_TEXT_ "PortAudio V19-devel" - - - Index: src/AboutDialog.cpp =================================================================== ---- src/AboutDialog.cpp.orig -+++ src/AboutDialog.cpp -@@ -520,9 +520,6 @@ void AboutDialog::PopulateInformationPag - informationStr += _("Build Information"); - informationStr += wxT("\n"); +--- src/AboutDialog.cpp.orig 2017-03-13 23:02:21.000000000 +0200 ++++ src/AboutDialog.cpp 2017-03-18 16:42:02.355788390 +0200 +@@ -59,7 +59,7 @@ hold information about one contributor t + #ifdef REV_LONG + #define REV_IDENT wxString( "[[http://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 -- // Current date -- AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__); -- - // Uncomment the next two lines to test hyperlinks work from here. - // AddBuildinfoRow(&informationStr, wxT("Link Test:"), - // wxT("Click bait") ); + extern wxString FormatHtmlText( const wxString & Text ); +@@ -70,7 +70,7 @@ const wxString VerCheckArgs(){ + #ifdef REV_LONG + result += wxString("&CommitId=")+wxString(REV_LONG).Left(6); + #endif +- result += wxString("&Time=") + wxString( __DATE__ ) + wxString( __TIME__ ); ++ result += wxString("&Time=") + wxString( "17 March 2017" ) + wxString( "23:15" ); + result.Replace(" ",""); + return result; + } +Index: lib-src/portaudio-v19/qa/loopback/src/paqa.c +=================================================================== +--- lib-src/portaudio-v19/qa/loopback/src/paqa.c.orig 2017-03-13 23:02:21.000000000 +0200 ++++ lib-src/portaudio-v19/qa/loopback/src/paqa.c 2017-03-18 15:32:00.553429177 +0200 +@@ -1460,7 +1460,7 @@ int main( int argc, char **argv ) + int justMath = 0; + char *executableName = argv[0]; + +- printf("PortAudio LoopBack Test built " __DATE__ " at " __TIME__ "\n"); ++ printf("PortAudio LoopBack Test built " "17 March 2017" " at " "23:15" "\n"); + + if( argc > 1 ){ + printf("running with arguments:"); diff --git a/audacity.changes b/audacity.changes index 4b29039..4bd707a 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Sat Mar 18 13:53:54 UTC 2017 - davejplater@gmail.com + +- Update to release 2.1.3 +- Recreated audacity-no_buildstamp.patch with 2.1.3 release date + and time. +- Rebased audacity-fix-nonsense.patch +- Deleted audacity-ffmpeg.patch and audacity-gcc6.patch +- Upstream changes: + * Interface: + * Pinned option on waveform so waveform moves and + recording/playing head stays still. + * Timer Record options to save/export/exit after recording. + * Scrub Ruler and optional Scrub Toolbar. + * New shortcuts ALT+RIGHT and ALT+LEFT (move to labels without + editing). + * Effects: + * Effects no longer grayed out when paused. + * New Distortion effect (replaces Leveller). + * SBSMS (higher quality but slower) option on Change + Tempo/Change Pitch effects. + * New Rhythm Track generator (replaces Click Track). + * New Generator for Sample Data Import. + * Nyquist effects now significantly faster. + * Other Changes: + * Upgraded the PortAudio library to v19 rev r1966. + * Bug fixes: + * Over 60 bugs fixed, including five longstanding bugs. + ------------------------------------------------------------------- Mon Jun 27 13:19:29 UTC 2016 - davejplater@gmail.com diff --git a/audacity.spec b/audacity.spec index 4cf0e9e..d035355 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,7 +1,7 @@ # # spec file for package audacity # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,48 +19,60 @@ %bcond_with mad %bcond_with lame %bcond_with twolame +%bcond_without ffmpeg + Name: audacity -Version: 2.1.2 +Version: 2.1.3 Release: 0 Summary: A Free, Cross-Platform Digital Audio Editor License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://audacityteam.org/ -Source: %{name}-minsrc-%{version}.tar.xz +Source: https://github.com/audacity/audacity/archive/Audacity-%{version}.tar.gz +#Source: %%{name}-minsrc-%%{version}.tar.xz Source1: %{name}-license-nyquist Source2: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch reddwarf@opensuse.org -- Remove the buildstamp. +# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp. Patch0: %{name}-no_buildstamp.patch # PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to fix build against libflac 1.3.0+. Patch1: %{name}-flac_assert.h.patch # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason. 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-gcc6.patch mliska@suse.cz -- Fix GCC6 warnings. -Patch5: %{name}-gcc6.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 +%if 0%{?suse_version} < 1330 +BuildRequires: cpp5 +BuildRequires: gcc5 +BuildRequires: gcc5-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: hicolor-icon-theme BuildRequires: wxWidgets-3_0-nostl-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(flac) >= 1.3.1 BuildRequires: pkgconfig(flac++) BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) +%if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) >= 51.53 BuildRequires: pkgconfig(libavformat) >= 52.12 BuildRequires: pkgconfig(libavutil) +%endif +BuildRequires: pkgconfig(lilv-0) >= 0.16 +BuildRequires: pkgconfig(lv2) 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(vamp-hostsdk) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) @@ -92,12 +104,11 @@ than the physical memory size of your computer. %lang_package %prep -%setup -q -n %{name}-minsrc-%{version} +%setup -q -n %{name}-Audacity-%{version} %patch0 %patch1 -p1 -%patch2 -p1 -%patch3 -%patch5 +%patch2 -p0 +#%%patch5 cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ @@ -106,17 +117,25 @@ rm -rf lib-src/lame/ %endif %build +%if 0%{?suse_version} < 1330 +export CC=gcc-5 +export CPP=cpp-5 +export CXX=g++-5 +%endif export CFLAGS="%{optflags} -fno-strict-aliasing" -export CXXFLAGS="$CFLAGS" +export CXXFLAGS="$CFLAGS -std=gnu++11" aclocal -I m4 autoconf %configure \ %ifnarch %ix86 x86_64 --disable-sse \ +%endif +%if %{with ffmpeg} + --with-ffmpeg=system \ %endif --docdir=%{_docdir}/%{name}/ -make %{?_smp_mflags} +make %{?_smp_mflags} %install %make_install From 8e1b36c8b777b8e058603a6339ef5105a66bf69f874dec8ac02bb2daf9c8a4a2 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 18 Mar 2017 16:47:01 +0000 Subject: [PATCH 2/2] Accepting request 481031 from home:plater Fix patches OBS-URL: https://build.opensuse.org/request/show/481031 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=97 --- ...flac_assert.h.patch => audacity-flacversion.patch | 12 +++++++----- audacity.changes | 5 ++++- audacity.spec | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) rename audacity-flac_assert.h.patch => audacity-flacversion.patch (73%) diff --git a/audacity-flac_assert.h.patch b/audacity-flacversion.patch similarity index 73% rename from audacity-flac_assert.h.patch rename to audacity-flacversion.patch index 3fbbe74..da05ce7 100644 --- a/audacity-flac_assert.h.patch +++ b/audacity-flacversion.patch @@ -1,22 +1,24 @@ ---- a/m4/audacity_checklib_libflac.m4 -+++ b/m4/audacity_checklib_libflac.m4 +Index: m4/audacity_checklib_libflac.m4 +=================================================================== +--- m4/audacity_checklib_libflac.m4.orig 2017-03-13 23:02:21.000000000 +0200 ++++ m4/audacity_checklib_libflac.m4 2017-03-18 18:39:01.009659215 +0200 @@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ dnl See if FLAC is installed in the system - PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0], -+ PKG_CHECK_MODULES([FLAC], [flac >= 1.5.0 flac++ >= 1.5.0], ++ PKG_CHECK_MODULES([FLAC], [flac >= 1.3.1 flac++ >= 1.3.1], [LIBFLAC_SYSTEM_AVAILABLE="yes"], [LIBFLAC_SYSTEM_AVAILABLE="no"]) - dnl Check for flac < 1.3.0 -+ dnl Check for flac < 1.5.0 ++ dnl Check for flac < 1.3.1 if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then PKG_CHECK_MODULES([FLAC], [flac flac++], [LIBFLAC_SYSTEM_AVAILABLE="yes"], [LIBFLAC_SYSTEM_AVAILABLE="no"]) - dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search -+ dnl flac < 1.5.0 adds its own FLAC and FLAC++ subdirectories to the search ++ dnl flac < 1.3.1 adds its own FLAC and FLAC++ subdirectories to the search dnl path and ships a assert.h file there. This assert.h overwrites the dnl assert.h header from the C standard library. We need to strip /FLAC dnl and /FLAC++ from the include paths to make the assert.h from the C diff --git a/audacity.changes b/audacity.changes index 4bd707a..bbfa812 100644 --- a/audacity.changes +++ b/audacity.changes @@ -4,8 +4,11 @@ Sat Mar 18 13:53:54 UTC 2017 - davejplater@gmail.com - Update to release 2.1.3 - Recreated audacity-no_buildstamp.patch with 2.1.3 release date and time. +- Added audacity-flacversion.patch to fix minimum version in m4 + macro. - Rebased audacity-fix-nonsense.patch -- Deleted audacity-ffmpeg.patch and audacity-gcc6.patch +- Deleted audacity-ffmpeg.patch, audacity-flac_assert.h.patch and + audacity-gcc6.patch - Upstream changes: * Interface: * Pinned option on waveform so waveform moves and diff --git a/audacity.spec b/audacity.spec index d035355..e324333 100644 --- a/audacity.spec +++ b/audacity.spec @@ -34,8 +34,8 @@ Source1: %{name}-license-nyquist Source2: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp. Patch0: %{name}-no_buildstamp.patch -# PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to fix build against libflac 1.3.0+. -Patch1: %{name}-flac_assert.h.patch +# PATCH-FIX-OPENSUSE audacity-flacversion.patch davejplater@gmail.com -- Patch to fix build against libflac 1.3.1+. +Patch1: %{name}-flacversion.patch # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason. Patch2: %{name}-fix-nonsense.patch BuildRequires: autoconf @@ -106,9 +106,9 @@ than the physical memory size of your computer. %prep %setup -q -n %{name}-Audacity-%{version} %patch0 -%patch1 -p1 +%patch1 -p0 %patch2 -p0 -#%%patch5 + cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/