rpm/audacity
SHA256
1
0
Fork 0
forked from pool/audacity
Code Pull Requests Activity

Accepting request 317634 from multimedia:apps

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/317634
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=65
This commit is contained in:
Stephan Kulow 2015-07-21 11:27:40 +00:00 committed by Git OBS Bridge
commit ada825807a
6 changed files with 125 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
audacity-fix-nonsense.patch Normal file
View File

@ -0,0 +1,24 @@
--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
+++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
@@ -603,7 +603,10 @@
{
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
+ 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 @@
typedef wxArrayString PluginIDList;
-class ProviderMap;
class PluginRegistrationDialog;
class PluginManager : public PluginManagerInterface

3
audacity-minsrc-2.1.0.tar.xz
View File

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

3
audacity-minsrc-2.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872
size 7154008

23
audacity-no_buildstamp.patch
View File

@ -1,8 +1,8 @@
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
@@ -90,7 +90,7 @@
--- a/lib-src/portaudio-v19/src/common/pa_front.c
+++ b/lib-src/portaudio-v19/src/common/pa_front.c
@@ -78,7 +78,7 @@
#define PA_VERSION_ 1899
@ -13,14 +13,15 @@ Index: lib-src/portaudio-v19/src/common/pa_front.c
Index: src/AboutDialog.cpp
===================================================================
--- src/AboutDialog.cpp.orig
+++ src/AboutDialog.cpp
@@ -489,7 +489,7 @@ void AboutDialog::PopulateInformationPag
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -523,9 +523,6 @@
informationStr += _("Build Information");
informationStr += wxT("</h3>\n<table>");
// Current date
- // Current date
- AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
+ //AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
#ifdef __WXDEBUG__
AddBuildinfoRow(&informationStr, _("Build type:"), _("Debug build"));
-
// 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>") );

61
audacity.changes
View File

@ -1,3 +1,63 @@
-------------------------------------------------------------------
Mon Jul 20 14:06:38 CEST 2015 - tiwai@suse.de
- Drop sf.net download URL as the download host was changed
-------------------------------------------------------------------
Sat Jul 18 23:43:10 UTC 2015 - sor.alexei@meowr.ru
- Update to 2.1.1:
+ Changes and Improvements:
* Built-in effects now support presets.
* New Limiter effect replaces Hard Limiter effect.
* New Crossfade Clips effect to apply a simple crossfade to a
selected pair of clips in a single audio track.
* Can now add/remove effects from Generate and Effects menus.
* New version of Vocal Removal Effect.
* Classic Filters now included as an opt-in effect.
* Much faster editing with larger projects, thanks to a faster
method for storing the autosave recovery file.
* Performance improvements for Draw Tool and zooming of
Spectrogram views.
* Zero-padding Spectrograms Preference smooths the image for
short window sizes.
* Scrubbing and Seeking, including backwards play.
* Quick-Play from Timeline enhancements, particularly for
looping.
* More VI usability enhancements for track focus & navigation.
* Upgraded to Nyquist 3.0.9 and libflac 1.3.1.
* Upgraded LV2 libs, LV2 GUIs on Linux, LV2 factory Presets.
* Crash report integration.
* Modules can be enabled in Preferences. Mod-nyq-bench
available as an experimental module (but not in the default
download).
+ Bug fixes:
* Crash using Undo while dragging sample points
* Crash using File > Close on project window when
Screenshot Tools was open.
* FFmpeg Custom Export: Crashes importing presets.
* TAL VST (but not other VST's) crashed if previewing built-in
effect.
* SPACE could not be used/could crash in context menus that
have a checkbox.
* LV2 effects did not use parameters when using Chains.
* Built-in Generators were not usable in Chains.
* Plot Spectrum could not change values without losing focus.
* Track dropdown menu settings could affect other tracks.
* Slight mismatch of vertical scale with linear spectrogram
view.
* RTP effect Play/Stop button remained deactivated after
built-in preview ended.
* Contrast: "Move forward or backward through active windows"
did not refocus Contrast.
* LADSPA and LV2 generate plug-ins failed when white space
selected.
- Rebase audacity-no_buildstamp.patch.
- Add audacity-fix-nonsense.patch to fix build regressions
introduced in Audacity 2.1.1.
- Audacity now requires libsoxr without an option.
- Specify a version of wxWidgets Audacity requires.
-------------------------------------------------------------------
Wed Apr 29 07:27:39 UTC 2015 - sor.alexei@meowr.ru
@ -1087,4 +1147,3 @@ Thu Jan 24 12:11:15 CET 2002 - tiwai@suse.de
- initial package version: 0.98.
- built with the shared id3lib.

54
audacity.spec
View File

@ -23,28 +23,30 @@
%bcond_with lame
%bcond_with twolame
Name: audacity
Version: 2.1.0
Version: 2.1.1
Release: 0
Summary: A Free, Cross-Platform Digital Audio Editor
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Editors and Convertors
Url: http://audacity.sourceforge.net/
Source: http://downloads.sf.net/%{name}/%{name}-minsrc-%{version}.tar.xz
Source1: %{name}-rpmlintrc
Source2: %{name}-license-nyquist
Url: http://audacityteam.org/
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.
Patch0: %{name}-no_buildstamp.patch
# PATCH-FIX-UPSTREAM audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to build against libflac 1.3.0+.
Patch1: %{name}-flac_assert.h.patch
# PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf@opensuse.org -- Patch to compile with latest ffmpeg.
Patch2: %{name}-ffmpeg.patch
# PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason.
Patch3: %{name}-fix-nonsense.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: wxWidgets-devel
BuildRequires: wxWidgets-devel = 2.8.12
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(flac)
@ -56,22 +58,18 @@ BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(soundtouch)
BuildRequires: pkgconfig(soxr)
BuildRequires: pkgconfig(vamp-hostsdk)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisenc)
BuildRequires: pkgconfig(vorbisfile)
Recommends: %{name}-lang = %{version}
Recommends: libavcodec56
Recommends: libavformat56
Recommends: libavutil54
Recommends: libmp3lame0
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(soxr)
%else
BuildRequires: pkgconfig(samplerate)
%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
Recommends: libavcodec
Recommends: libavformat
Recommends: libavutil
Recommends: libmp3lame0
%if %{with ffmpeg}
BuildRequires: libffmpeg-devel
%endif
@ -88,22 +86,23 @@ BuildRequires: pkgconfig(twolame)
%description
Audacity is a program that manipulates digital audio wave forms. In
addition to recording sounds directly from within the program, it
imports many sound file formats, including WAV, AIFF, AU, IRCAM, MP,
and Ogg Vorbis. With Audacity, you can edit wave data larger than the
physical memory size of your computer.
imports many sound file formats, including WAV, AIFF, AU, IRCAM,
MP, and Ogg Vorbis. With Audacity, you can edit wave data larger
than the physical memory size of your computer.
%lang_package
%prep
%setup -q -n %{name}-minsrc-%{version}
%patch0
%patch0 -p1
%patch1 -p1
%if %{with ffmpeg}
%patch2
%endif
cp -f %{SOURCE2} LICENSE_NYQUIST.txt
%patch3 -p1
cp -f %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions.
rm -rf lib-src/libvamp/
rm -rf lib-src/{expat,libvamp,libsoxr}/
%if %{with lame}
rm -rf lib-src/lame/
%endif
@ -112,15 +111,13 @@ rm -rf lib-src/ffmpeg/
%endif
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
aclocal -I m4
autoconf
%configure \
%ifnarch %ix86 x86_64
--disable-sse \
%endif
%if 0%{?suse_version} <= 1320
--with-libsamplerate \
--without-libsoxr \
%endif
--docdir=%{_docdir}/%{name}/
@ -128,7 +125,8 @@ make %{?_smp_mflags}
%install
%make_install
# email wrote to feedback@audacityteam.org
# E-mail written to feedback@audacityteam.org.
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
@ -153,7 +151,7 @@ rm -rf %{buildroot}%{_datadir}/pixmaps/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-audacity-project.*
%{_datadir}/icons/hicolor/*/mimetypes/*%{name}*
%{_datadir}/mime/packages/%{name}.xml
%{_mandir}/man?/%{name}.?%{?ext_man}
%dir %{_datadir}/appdata/