Accepting request 288759 from home:enzokiel:branches:multimedia:apps

- Add patch audacity-ffmpeg.patch to build against current ffmpeg on PMBS.

OBS-URL: https://build.opensuse.org/request/show/288759
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=75

audacity-ffmpeg.patch

@@ -0,0 +1,29 @@
+--- src/FFmpeg.h.orig	2015-03-03 20:56:22.816742627 +0100
++++ src/FFmpeg.h	2015-03-03 20:56:22.851741975 +0100
+@@ -688,7 +688,7 @@
+    FFMPEG_FUNCTION_WITH_RETURN(
+       AVOutputFormat*,
+       av_oformat_next,
+-      (AVOutputFormat *f),
++      (const AVOutputFormat *f),
+       (f)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(
+@@ -755,7 +755,7 @@
+    FFMPEG_FUNCTION_WITH_RETURN(
+       int,
+       av_fifo_size,
+-      (AVFifoBuffer *f),
++      (const AVFifoBuffer *f),
+       (f)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(
+@@ -801,7 +801,7 @@
+    FFMPEG_FUNCTION_WITH_RETURN(
+       AVDictionaryEntry *,
+       av_dict_get,
+-      (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
++      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
+       (m, key, prev, flags)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(

audacity.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 03 20:13:49 UTC 2015 - joerg.lorenzen@ki.tng.de
+
+- Add patch audacity-ffmpeg.patch to build against current ffmpeg
+  on PMBS.
+
 -------------------------------------------------------------------
 Mon Oct 27 20:27:33 UTC 2014 - joerg.lorenzen@ki.tng.de
 

audacity.spec

@@ -71,11 +71,12 @@ 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:     libavformat55
+Recommends:     libavformat56
-Recommends:     libavcodec55
+Recommends:     libavcodec56
-Recommends:     libavutil52
+Recommends:     libavutil54
 
 %description
 Audacity is a program that manipulates digital audio wave forms. In
@@ -88,6 +89,9 @@ physical memory size of your computer.
 %setup -q -n audacity-src-%{version}
 %patch0
 %patch1
+%if %{with ffmpeg}
+%patch2
+%endif
 cp %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions
 rm -r lib-src/libvamp/