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

Accepting request 293754 from home:XRevan86

Browse Source 
- Update to 2.1.0.
- Add audacity-lang package.
- Extend audacity-flac_assert.h.patch to versions until 1.4.0.
- Do not remove appdata.
- Spec cleanup.

OBS-URL: https://build.opensuse.org/request/show/293754
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=77
This commit is contained in:
Takashi Iwai 2015-04-07 12:37:08 +00:00 committed by Git OBS Bridge
parent 0197025f84
commit 68e141e720
6 changed files with 129 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audacity-flac_assert.h.patch
View File

@ -1,22 +1,23 @@
--- 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
diff -aur a/m4/audacity_checklib_libflac.m4 b/m4/audacity_checklib_libflac.m4
--- a/m4/audacity_checklib_libflac.m4
+++ b/m4/audacity_checklib_libflac.m4
@@ -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],
+ PKG_CHECK_MODULES([FLAC], [flac >= 1.4.0 flac++ >= 1.4.0],
[LIBFLAC_SYSTEM_AVAILABLE="yes"],
[LIBFLAC_SYSTEM_AVAILABLE="no"])
- dnl Check for flac < 1.3.0
+ dnl Check for flac <= 1.3.0
+ dnl Check for flac < 1.4.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 flac < 1.4.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

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

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

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

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

2
audacity-rpmlintrc Normal file
View File

@ -0,0 +1,2 @@
addFilter("audacity.* desktopfile-without-binary")
addFilter("audacity.* devel-file-in-non-devel-package")

59
audacity.changes
View File

@ -1,3 +1,62 @@
-------------------------------------------------------------------
Mon Mar 30 23:21:32 UTC 2015 - sor.alexei@meowr.ru
- Update to 2.1.0:
+ Changes and Improvements:
* LADSPA and VST effects now support real-time preview,
save/load of user presets and saving effect settings across
sessions. Note: Real-time preview does not yet support
latency compensation.
* VST effects now support import/export of FXB preset banks.
* Shell VST effects that host multiple plugins are now supported.
* All Effect Menu items (built-in or plugin) can now be used in
a Chain.
* Items in the Effect, Generate or Analyze Menus can be sorted
or grouped by name, publisher or class of effect.
* Noise Removal is improved and renamed to "Noise Reduction".
* Change Speed has new time controls for current and new length.
You can now enter the speed change as a multiplier e.g. "2" is
twice as fast.
* New "Crossfade Tracks" effect can be used for crossfading two
tracks. This replaces Cross Fade In and Cross Fade Out.
* Nyquist Prompt and most shipped Nyquist effects now have
Preview button.
* Redesigned Meter Toolbars: The default shows separate Record
and Playback Meters, half-height so they can be wider while
docked, in gradient style.
* A frequency selection can now be made (and spectral edit
effects applied to those frequencies) when in a spectrogram
view. You can also create or adjust frequency selections in a
new "Spectral Selection Toolbar" (available at View > Toolbars).
* Transcription Toolbar (Play-at-speed) can now loop play and
cut-preview.
* Timer Record now saves recordings automatically into an
existing project.
* New Armenian translation.
+ Bug fixes:
* Typing "j" or "k" in a label track activated the
"move cursor" shortcut.
* Spectrogram log (f) view displayed incorrectly until
vertically zoomed.
* Fixed crash after zooming out on vertical scale beyond +/-1.0.
* Selections made with Selection Toolbar were not restored after
Undo.
* Undo could fail silently if a selection included/touched a
clip boundary.
* If there were invalid FFmpeg libs in system PATH this
prevented Audacity recognising the installed FFmpeg or the
FFmpeg specified in audacity.cfg.
* Fix "Audacity already running" error when using the
command-line or context menu to open multiple or further files.
* Fix segfault exporting an FFmpeg format to an unwritable folder.
* Fix silent failure exporting FFmpeg, MP2 or OGG to an
unwritable directory.
* Fix ENTER activated an effect when OK button was greyed out.
- Add audacity-lang package.
- Extend audacity-flac_assert.h.patch to versions until 1.4.0.
- Do not remove appdata.
- Spec cleanup.
-------------------------------------------------------------------
Tue Mar 03 20:13:49 UTC 2015 - joerg.lorenzen@ki.tng.de

105
audacity.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package audacity
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@ -16,18 +16,34 @@
#
%define _use_internal_dependency_generator 0
%define __find_requires %{wx_requires}
%bcond_with ffmpeg
%bcond_with mad
%bcond_with lame
%bcond_with twolame
Name: audacity
Version: 2.1.0
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
# 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
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
%define _use_internal_dependency_generator 0
%define __find_requires %wx_requires
BuildRequires: wxWidgets-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(expat)
@ -37,6 +53,7 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0
BuildRequires: pkgconfig(id3tag)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(samplerate)
BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(soundtouch)
@ -44,8 +61,11 @@ BuildRequires: pkgconfig(vamp-hostsdk)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisenc)
BuildRequires: pkgconfig(vorbisfile)
BuildRequires: autoconf
BuildRequires: automake
Recommends: %{name}-lang = %{version}
Recommends: libavcodec56
Recommends: libavformat56
Recommends: libavutil54
Recommends: libmp3lame0
# 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}
@ -60,23 +80,6 @@ BuildRequires: libmp3lame-devel
%if %{with twolame}
BuildRequires: pkgconfig(twolame)
%endif
Version: 2.0.6
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/
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
Patch1: audacity-flac_assert.h.patch
Patch2: audacity-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: libmp3lame0
Recommends: libavformat56
Recommends: libavcodec56
Recommends: libavutil54
%description
Audacity is a program that manipulates digital audio wave forms. In
@ -85,30 +88,35 @@ 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 audacity-src-%{version}
%setup -q -n %{name}-minsrc-%{version}
%patch0
%patch1
%patch1 -p1
%if %{with ffmpeg}
%patch2
%endif
cp %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions
rm -r lib-src/libvamp/
cp -f %{SOURCE2} LICENSE_NYQUIST.txt
# Make sure we use the system versions.
rm -rf lib-src/libvamp/
%if %{with lame}
rm -r lib-src/lame/
rm -rf lib-src/lame/
%endif
%if %{with ffmpeg}
rm -r lib-src/ffmpeg/
rm -rf lib-src/ffmpeg/
%endif
%build
aclocal -I m4
autoconf
%configure --docdir=%{_defaultdocdir}/audacity/ \
%configure \
%ifnarch %ix86 x86_64
--disable-sse
--disable-sse \
%endif
--with-libsamplerate \
--without-libsoxr \
--docdir=%{_docdir}/%{name}/
make %{?_smp_mflags}
@ -116,31 +124,36 @@ make %{?_smp_mflags}
%make_install
# email wrote to feedback@audacityteam.org
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
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/
%find_lang %{name}
%post
%icon_theme_cache_post
%mime_database_post
%desktop_database_post
%mime_database_post
%postun
%desktop_database_postun
%mime_database_postun
%icon_theme_cache_postun
%mime_database_postun
%files -f %{name}.lang
%files
%defattr(-,root,root)
%doc LICENSE_NYQUIST.txt
%{_docdir}/audacity/
%{_mandir}/man1/audacity.1*
%{_bindir}/audacity
%{_datadir}/audacity/
%{_datadir}/applications/audacity.desktop
%{_datadir}/mime/packages/audacity.xml
%{_datadir}/icons/hicolor/*/apps/audacity.*
%doc LICENSE.txt LICENSE_NYQUIST.txt README.txt
%doc %{_docdir}/%{name}/
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-audacity-project.*
%{_datadir}/mime/packages/%{name}.xml
%{_mandir}/man?/%{name}.?%{?ext_man}
%dir %{_datadir}/appdata/
%{_datadir}/appdata/%{name}.appdata.xml
%files lang -f %{name}.lang
%defattr(-,root,root)
%changelog