From 7268f483e74cadec6af347f995adfc6bf23e82dbd24ebc6bd1482bb83444b7ba Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 3 Jul 2015 16:25:15 +0000 Subject: [PATCH] Accepting request 304493 from home:XRevan86 - Use libsoxr for resampling instead of libsamplerate. OBS-URL: https://build.opensuse.org/request/show/304493 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=79 --- audacity.changes | 5 +++++ audacity.spec | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/audacity.changes b/audacity.changes index d1a600b..8e68cd9 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 29 07:27:39 UTC 2015 - sor.alexei@meowr.ru + +- Use libsoxr for resampling instead of libsamplerate. + ------------------------------------------------------------------- Mon Mar 30 23:21:32 UTC 2015 - sor.alexei@meowr.ru diff --git a/audacity.spec b/audacity.spec index bc763a3..eb69e71 100644 --- a/audacity.spec +++ b/audacity.spec @@ -53,7 +53,6 @@ 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) @@ -66,6 +65,11 @@ 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 %if %{with ffmpeg} @@ -114,8 +118,10 @@ autoconf %ifnarch %ix86 x86_64 --disable-sse \ %endif +%if 0%{?suse_version} <= 1320 --with-libsamplerate \ --without-libsoxr \ +%endif --docdir=%{_docdir}/%{name}/ make %{?_smp_mflags} @@ -130,8 +136,8 @@ rm -rf %{buildroot}%{_datadir}/pixmaps/ %find_lang %{name} %post -%icon_theme_cache_post %desktop_database_post +%icon_theme_cache_post %mime_database_post %postun