Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2017-03-20 17:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacity" Mon Mar 20 17:10:25 2017 rev:71 rq:481032 version:2.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2016-07-05 09:53:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2017-03-20 17:10:27.158331486 +0100 @@ -1,0 +2,32 @@ +Sat Mar 18 13:53:54 UTC 2017 - [email protected] + +- 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, audacity-flac_assert.h.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. + +------------------------------------------------------------------- Old: ---- audacity-ffmpeg.patch audacity-flac_assert.h.patch audacity-gcc6.patch audacity-minsrc-2.1.2.tar.xz New: ---- Audacity-2.1.3.tar.gz audacity-flacversion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.cwRvK0/_old 2017-03-20 17:10:28.322167153 +0100 +++ /var/tmp/diff_new_pack.cwRvK0/_new 2017-03-20 17:10:28.326166589 +0100 @@ -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 [email protected] -- Remove the buildstamp. +# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch [email protected] -- Remove the buildstamp. Patch0: %{name}-no_buildstamp.patch -# PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch [email protected] -- Patch to fix build against libflac 1.3.0+. -Patch1: %{name}-flac_assert.h.patch +# PATCH-FIX-OPENSUSE audacity-flacversion.patch [email protected] -- Patch to fix build against libflac 1.3.1+. +Patch1: %{name}-flacversion.patch # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch [email protected] -- Remove things that break build for no reason. Patch2: %{name}-fix-nonsense.patch -# PATCH-FIX-UPSTREAM audacity-ffmpeg.patch [email protected] -- Patch to compile with latest ffmpeg. -Patch3: %{name}-ffmpeg.patch -# PATCH-FIX-UPSTREAM audacity-gcc6.patch [email protected] -- 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 @@ %lang_package %prep -%setup -q -n %{name}-minsrc-%{version} +%setup -q -n %{name}-Audacity-%{version} %patch0 -%patch1 -p1 -%patch2 -p1 -%patch3 -%patch5 +%patch1 -p0 +%patch2 -p0 + cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ @@ -106,14 +117,22 @@ %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} ++++++ audacity-fix-nonsense.patch ++++++ --- /var/tmp/diff_new_pack.cwRvK0/_old 2017-03-20 17:10:28.350163200 +0100 +++ /var/tmp/diff_new_pack.cwRvK0/_new 2017-03-20 17:10:28.354162636 +0100 @@ -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::map<PluginID, PluginDescrip typedef wxArrayString PluginIDList; -class ProviderMap; class PluginRegistrationDialog; - class PluginManager : public PluginManagerInterface + class PluginManager final : public PluginManagerInterface ++++++ audacity-flacversion.patch ++++++ 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.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.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.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 dnl standard library available again. - [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's@-I\([^ ]*\)/FLAC\(++\)\? @-I\1 @g')] + [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's|-I\([^ ]*\)/FLAC\(++\)\?[ ]*|-I\1 |g')] fi if test "$LIBFLAC_SYSTEM_AVAILABLE" = "yes"; then ++++++ audacity-no_buildstamp.patch ++++++ --- /var/tmp/diff_new_pack.cwRvK0/_old 2017-03-20 17:10:28.394156988 +0100 +++ /var/tmp/diff_new_pack.cwRvK0/_new 2017-03-20 17:10:28.394156988 +0100 @@ -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("</h3>\n<table>"); +--- 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 + + 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"); -- // 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("<a href=\"https:web.audacityteam.org\">Click bait</a>") ); + if( argc > 1 ){ + printf("running with arguments:");
