From 9bee1365062cb915d553974a945811ac48c2fb62c8cb1abf00c5288195d56647 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Oct 2014 16:01:44 +0000 Subject: [PATCH 1/2] Accepting request 258337 from home:enzokiel:branches:multimedia:apps - Update to 2.0.6 OBS-URL: https://build.opensuse.org/request/show/258337 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=72 --- audacity-flac_assert.h.patch | 22 +++++++++++++++ audacity-minsrc-2.0.5.tar.xz | 3 -- audacity-minsrc-2.0.6.tar.xz | 3 ++ audacity.changes | 54 ++++++++++++++++++++++++++++++++++++ audacity.spec | 28 ++++++++++++++----- 5 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 audacity-flac_assert.h.patch delete mode 100644 audacity-minsrc-2.0.5.tar.xz create mode 100644 audacity-minsrc-2.0.6.tar.xz diff --git a/audacity-flac_assert.h.patch b/audacity-flac_assert.h.patch new file mode 100644 index 0000000..e2562e3 --- /dev/null +++ b/audacity-flac_assert.h.patch @@ -0,0 +1,22 @@ +--- m4/audacity_checklib_libflac.m4.orig 2014-10-24 22:12:53.870155212 +0200 ++++ m4/audacity_checklib_libflac.m4 2014-10-24 22:12:53.903154841 +0200 +@@ -13,16 +13,16 @@ + + 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.0 flac++ > 1.3.0], + [LIBFLAC_SYSTEM_AVAILABLE="yes"], + [LIBFLAC_SYSTEM_AVAILABLE="no"]) + +- dnl Check for flac < 1.3.0 ++ dnl Check for flac <= 1.3.0 + 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.0 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-minsrc-2.0.5.tar.xz b/audacity-minsrc-2.0.5.tar.xz deleted file mode 100644 index be60e58..0000000 --- a/audacity-minsrc-2.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 -size 5314060 diff --git a/audacity-minsrc-2.0.6.tar.xz b/audacity-minsrc-2.0.6.tar.xz new file mode 100644 index 0000000..e0161bf --- /dev/null +++ b/audacity-minsrc-2.0.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3080c190e678e0d682961a36c6e990c572dacd6b5ce499e5cec7362e9fa37d7b +size 7380460 diff --git a/audacity.changes b/audacity.changes index 3db728e..4511bec 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Fri Oct 24 22:38:46 UTC 2014 - joerg.lorenzen@ki.tng.de + +- Update to 2.0.6: + Bug fixes for: + * Interface: + * Region Restore did not restore the region after using Preferences. + * Dragging selections with the keyboard or Selection Toolbar digits + was very slow. + * (Windows) Help > About Audacity crashed when run in Magyar language. + * (OS X) Some full and reduced Menu Bar items were not translated. + * (OS X and Linux) Fixed various interface crashes. + * Effects: + * Reverb and Paulstretch were missing from Chains. + * Analyze > Contrast could report very inaccurate rms levels. + * Noise Removal: Attack and decay times were half as long as set. + * (OS X and Linux) Nyquist effects ran much more slowly than on Windows. + * Click or drag on the Timeline after Loop Play continued to loop. + * Transcription Toolbar did not play slower than 0.1x speed. + * (Linux) Audacity did not build if python 2 was not available. + Changes and Improvements: + * Interface: + * Redesigned, searchable Keyboard Preferences with Tree, Name and Key views. + * Edit Menu: "Cut" and "Delete" are now in the top level of the menu. + * Transport Menu now includes "Play/Stop" and "Play/Stop and Set Cursor" + (use Keyboard Preferences to create shortcuts for "Play" and "Stop"). + * Tracks Menu now includes "Mix and Render to New Track". + * Track Drop-Down Menu now has Move Track To Top and Move Track To Bottom. + * New right-click menu choice "Delete Label" to remove single labels. + * "Snap To" now offers choice of snap to the "closest" or "prior" position. + Note: the previous "Snap To On" keyboard shortcut will no longer work. + * "Snap To" settings are now independent for each project. + * Effects: + * Truncate Silence: redesigned with simpler option "Truncate Detected + Silence" to shorten to the specified length without compressing silence. + * VST effects: New "Settings" dialog lets you specify buffer size (for + faster processing) and enable buffer delay compensation (to prevent + inserted silence). Compensation may cause a crash in a few plug-ins. + * VST effects now support standard FXP presets. + * LV2 effects are now supported on all platforms (textual interface only). + + * Import or export using FFmpeg now requires FFmpeg 1.2 or later (or libav + 0.8 or later). For recommended downloads of recent FFmpeg please visit: + http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#ffdown . + * New Tamil translation (largely complete). + * (Windows) FLAC exports can now exceed 2 GB in size. + * (OS X) Easier Audacity installation using the DMG: drag the Audacity folder + to the /Applications shortcut, + * (OS X) Audacity 2.0.6 will not officially support OS X 10.10 Yosemite when + released (in particular, Apple Audio Units may not open in Audacity). + * (Linux) Self-compiled builds of Audacity now search for system LADSPA + effects in /usr/lib/ladspa. + - Added patch audacity-flac_assert.h.patch to build against flac 1.3.0. + ------------------------------------------------------------------- Sat Feb 22 10:58:59 UTC 2014 - dap.darkness@gmail.com diff --git a/audacity.spec b/audacity.spec index 651e167..143f671 100644 --- a/audacity.spec +++ b/audacity.spec @@ -18,6 +18,7 @@ %bcond_with ffmpeg %bcond_with mad +%bcond_with lame %bcond_with twolame Name: audacity @@ -43,18 +44,23 @@ BuildRequires: pkgconfig(vamp-hostsdk) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) +BuildRequires: autoconf +BuildRequires: automake # This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. #BuildRequires: portaudio-devel %if %{with ffmpeg} -BuildRequires: libffmpeg_oldabi-devel +BuildRequires: libffmpeg-devel %endif %if %{with mad} BuildRequires: pkgconfig(mad) %endif +%if %{with lame} +BuildRequires: libmp3lame-devel +%endif %if %{with twolame} BuildRequires: pkgconfig(twolame) %endif -Version: 2.0.5 +Version: 2.0.6 Release: 0 Summary: A Free, Cross-Platform Digital Audio Editor License: GPL-2.0+ @@ -64,11 +70,12 @@ Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}. Source1: audacity-license-nyquist # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp Patch0: audacity-no_buildstamp.patch +Patch1: audacity-flac_assert.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: libmp3lame0 -Recommends: libavformat52 -Recommends: libavcodec52 -Recommends: libavutil50 +Recommends: libavformat55 +Recommends: libavcodec55 +Recommends: libavutil52 %description Audacity is a program that manipulates digital audio wave forms. In @@ -80,14 +87,20 @@ physical memory size of your computer. %prep %setup -q -n audacity-src-%{version} %patch0 +%patch1 cp %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions rm -r lib-src/libvamp/ +%if %{with lame} +rm -r lib-src/lame/ +%endif %if %{with ffmpeg} rm -r lib-src/ffmpeg/ %endif %build +aclocal -I m4 +autoconf %configure --docdir=%{_defaultdocdir}/audacity/ \ %ifnarch %ix86 x86_64 --disable-sse @@ -101,6 +114,7 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/ mv %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project.xpm %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm rm -r %{buildroot}%{_datadir}/pixmaps +rm -r %{buildroot}%{_datadir}/appdata %find_lang %{name} %post @@ -115,8 +129,8 @@ rm -r %{buildroot}%{_datadir}/pixmaps %files -f %{name}.lang %defattr(-,root,root) -%doc LICENSE.txt README.txt LICENSE_NYQUIST.txt -%{_defaultdocdir}/audacity/ +%doc LICENSE_NYQUIST.txt +%{_docdir}/audacity/ %{_mandir}/man1/audacity.1* %{_bindir}/audacity %{_datadir}/audacity/ From 86cda38525bc6b9cefd3088a3111ed633ed4493d828d8becc42c4a94644f0a2b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 30 Oct 2014 10:31:53 +0000 Subject: [PATCH 2/2] Accepting request 258575 from home:enzokiel:branches:multimedia:apps - Fix download url for source package OBS-URL: https://build.opensuse.org/request/show/258575 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=73 --- audacity.changes | 5 +++++ audacity.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/audacity.changes b/audacity.changes index 4511bec..2283ead 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 27 20:27:33 UTC 2014 - joerg.lorenzen@ki.tng.de + +- Fix download url for source package + ------------------------------------------------------------------- Fri Oct 24 22:38:46 UTC 2014 - joerg.lorenzen@ki.tng.de diff --git a/audacity.spec b/audacity.spec index 143f671..67d5d32 100644 --- a/audacity.spec +++ b/audacity.spec @@ -66,7 +66,7 @@ Summary: A Free, Cross-Platform Digital Audio Editor License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://audacity.sourceforge.net/ -Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz +Source0: http://sourceforge.net/projects/audacity/files/audacity/%{version}/audacity-minsrc-%{version}.tar.xz Source1: audacity-license-nyquist # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp Patch0: audacity-no_buildstamp.patch