Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2020-06-29 21:16:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacity" Mon Jun 29 21:16:23 2020 rev:87 rq:817684 version:2.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2020-06-23 21:05:02.793929858 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new.3060/audacity.changes 2020-06-29 21:16:41.117472094 +0200 @@ -1,0 +2,16 @@ +Sun Jun 28 11:54:42 UTC 2020 - Dave Plater <[email protected]> + +- Update to 2.4.2, now uses cmake to build. +- Create lame.pc in spec file. +- Remove audacity-implicit-fortify-decl.patch and + audacity-flacversion.patch, fixed upstream +- Add two more false positives to + audacity-no_return_in_nonvoid.patch +- Upstream changes: + *Over 30 bugs fixed since 2.4.1 + *A new command has been added to the Tools menu: + Tools > Reset Configuration. + *Audacity now supports LAME's gapless playback info, allowing + MP3s to be exported and imported without additional padding. + +------------------------------------------------------------------- Old: ---- Audacity-2.4.1.tar.gz audacity-flacversion.patch audacity-implicit-fortify-decl.patch New: ---- Audacity-2.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.jxhs2G/_old 2020-06-29 21:16:43.241478666 +0200 +++ /var/tmp/diff_new_pack.jxhs2G/_new 2020-06-29 21:16:43.245478678 +0200 @@ -17,7 +17,7 @@ Name: audacity -Version: 2.4.1 +Version: 2.4.2 Release: 0 Summary: A Multi Track Digital Audio Editor License: GPL-2.0-or-later @@ -29,16 +29,10 @@ Source2: audacity-rpmlintrc # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch [email protected] -- Remove the buildstamp. Patch0: audacity-no_buildstamp.patch -# PATCH-FIX-OPENSUSE audacity-flacversion.patch [email protected] -- Patch to fix build against libflac 1.3.1+. -Patch1: audacity-flacversion.patch Patch2: audacity-misc-errors.patch -# PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.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 -# PATCH-FIX-OPENSUSE audacity-implicit-fortify-decl.patch [email protected] -- 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: cmake >= 3.15 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ #!BuildIgnore: gstreamer-0_10-plugins-base @@ -73,11 +67,11 @@ #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 +Requires: ffmpeg +Requires: libmp3lame0 +#Doesn't build for 32 bit anymore +ExcludeArch: i586 %description Audacity is a program that manipulates digital audio wave forms. @@ -104,58 +98,64 @@ cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/ +# Audacity's cmake can't find libmp3lame without a .pc file +# This is a temporary workaround. +if ! test -e %{_libdir}/pkgconfig/lame.pc +then +echo "creating lame.pc" +cat << EOF > lame.pc +prefix=%{_prefix} +libdir=%{_libdir} +includedir=%{_includedir}/lame + +Name: mp3lame +Description: encoder that converts audio to the MP3 file format. +Version: 3.100 +Libs: -L${libdir} -lmp3lame +Cflags: -I${includedir} +EOF +fi + +#Included in src/AboutDialog.cpp but not supplied +touch include/RevisionIdent.h %build +if ! test -e %{_libdir}/pkgconfig/lame.pc +then +export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig" +fi export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb" export CXXFLAGS="$CFLAGS -std=gnu++11" -%if 1 == 1 -aclocal -I m4 -autoconf -%configure \ -%ifnarch %ix86 x86_64 - --disable-sse \ -%endif -%if 0%{?suse_version} > 1501 - --disable-dynamic-loading \ - %endif - --with-ffmpeg=system \ - --with-libmad=system \ - --with-libtwolame=system \ - --with-lame=system \ - --docdir=%{_docdir}/%{name}/ -%else -%cmake -%endif +%cmake \ + -Duse_lame:STRING=system make %{?_smp_mflags} %install -%make_install +%cmake_install # E-mail wrote to [email protected]. mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project.xpm \ %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm rm -rf %{buildroot}%{_datadir}/pixmaps/ -rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt +rm -rf %{buildroot}%{_datadir}/doc cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt %find_lang %{name} %files plugins %license LICENSE.txt %dir %{_libdir}/%{name} -%{_libdir}/%{name}/libsuil*.so +%{_libdir}/%{name}/suil*.so %files %defattr(-,root,root) %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt portmixer.LICENSE.txt -%doc %{_docdir}/%{name}/ %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/icons/hicolor/*/mimetypes/*%{name}* +%{_datadir}/icons/hicolor/* %{_datadir}/mime/packages/%{name}.xml %{_mandir}/man?/%{name}.?%{?ext_man} %dir %{_datadir}/appdata/ ++++++ Audacity-2.4.1.tar.gz -> Audacity-2.4.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/audacity/Audacity-2.4.1.tar.gz /work/SRC/openSUSE:Factory/.audacity.new.3060/Audacity-2.4.2.tar.gz differ: char 12, line 1 ++++++ audacity-no_buildstamp.patch ++++++ --- /var/tmp/diff_new_pack.jxhs2G/_old 2020-06-29 21:16:43.305478864 +0200 +++ /var/tmp/diff_new_pack.jxhs2G/_new 2020-06-29 21:16:43.305478864 +0200 @@ -1,7 +1,7 @@ -Index: audacity-Audacity-2.4.0/lib-src/portaudio-v19/qa/loopback/src/paqa.c +Index: audacity-Audacity-2.4.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c =================================================================== ---- 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.4.0/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2020-05-18 12:55:07.291841573 +0200 +--- audacity-Audacity-2.4.2.orig/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2020-06-19 17:16:47.000000000 +0200 ++++ audacity-Audacity-2.4.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2020-06-28 09:53:36.618593507 +0200 @@ -1460,7 +1460,7 @@ int main( int argc, char **argv ) int justMath = 0; char *executableName = argv[0]; @@ -11,11 +11,11 @@ if( argc > 1 ){ printf("running with arguments:"); -Index: audacity-Audacity-2.4.0/src/AboutDialog.cpp +Index: audacity-Audacity-2.4.2/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 +--- audacity-Audacity-2.4.2.orig/src/AboutDialog.cpp 2020-06-19 17:16:47.000000000 +0200 ++++ audacity-Audacity-2.4.2/src/AboutDialog.cpp 2020-06-28 09:53:36.618593507 +0200 +@@ -70,7 +70,7 @@ hold information about one contributor t #endif #ifdef REV_LONG @@ -24,7 +24,7 @@ #else #define REV_IDENT (XO("No revision identifier was provided").Translation()) #endif -@@ -701,8 +701,8 @@ void AboutDialog::PopulateInformationPag +@@ -751,8 +751,8 @@ void AboutDialog::PopulateInformationPag << XO("Build Information") << wxT("</h3>\n<table>"); ++++++ audacity-no_return_in_nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.jxhs2G/_old 2020-06-29 21:16:43.321478913 +0200 +++ /var/tmp/diff_new_pack.jxhs2G/_new 2020-06-29 21:16:43.325478926 +0200 @@ -1,8 +1,8 @@ -Index: audacity-Audacity-2.3.3/src/widgets/NumericTextCtrl.cpp +Index: b/src/widgets/NumericTextCtrl.cpp =================================================================== ---- audacity-Audacity-2.3.3.orig/src/widgets/NumericTextCtrl.cpp 2019-11-15 13:14:55.000000000 +0200 -+++ audacity-Audacity-2.3.3/src/widgets/NumericTextCtrl.cpp 2020-02-02 15:41:21.663740215 +0200 -@@ -637,6 +637,7 @@ static const BuiltinFormatString Bandwid +--- a/src/widgets/NumericTextCtrl.cpp 2020-06-19 17:16:47.000000000 +0200 ++++ b/src/widgets/NumericTextCtrl.cpp 2020-06-28 11:27:53.709676198 +0200 +@@ -654,6 +654,7 @@ static const BuiltinFormatString Bandwid case NumericConverter::BANDWIDTH: return WXSIZEOF(BandwidthConverterFormats_); } @@ -10,10 +10,10 @@ } } -Index: audacity-Audacity-2.3.3/lib-src/libnyquist/nyquist/xlisp/xlbfun.c +Index: b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c =================================================================== ---- audacity-Audacity-2.3.3.orig/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2019-11-15 13:14:55.000000000 +0200 -+++ audacity-Audacity-2.3.3/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2020-02-02 15:41:21.663740215 +0200 +--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2020-06-19 17:16:47.000000000 +0200 ++++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2020-06-28 11:27:53.773678563 +0200 @@ -603,7 +603,10 @@ LVAL xcleanup(void) { xllastarg(); @@ -26,3 +26,29 @@ } /* 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 ++++ b/lib-src/portsmf/allegro.cpp 2020-06-28 12:38:54.119640838 +0200 +@@ -2885,6 +2885,9 @@ Alg_event_ptr &Alg_seq::operator[](int i + tr++; + } + assert(false); // out of bounds ++ Alg_event_ptr ab_track; ++ return ab_track; // Fix false positive error: control reaches end of non-void function [-Werror=return-type] ++ // Ignores the assert A gcc bug? + } + #pragma warning(default: 4715) + +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 ++++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c 2020-06-28 11:54:14.043499973 +0200 +@@ -596,6 +596,7 @@ double pv_get_effective_pos(Phase_vocode + return -(pv->ratio * pv->fftsize / 2.0); + } else { // I can't think of any other case. + assert(FALSE); ++ return -(pv->ratio * pv->fftsize / 2.0); //Another false positive ignoring assert as a return value + } + } +
