[packages/mpd] - fix build with ffmpeg2

[baggins]

commit 9504608e3176acec5567529c95be23087d951407
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 29 09:47:18 2013 +0200

    - fix build with ffmpeg2

 mpd-ffmpeg2.patch | 19 +++++++++++++++++++
 mpd.spec          |  2 ++
 2 files changed, 21 insertions(+)
---
diff --git a/mpd.spec b/mpd.spec
index 6c04fc8..e660f70 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -21,6 +21,7 @@ Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-cdio.patch
+Patch1:		%{name}-ffmpeg2.patch
 URL:		http://www.musicpd.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	alsa-lib-devel >= 0.9.0
@@ -125,6 +126,7 @@ Dokumentacja do Music Player Daemon (MPD).
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # ac_cv_* hacks to avoid unwanted linking
diff --git a/mpd-ffmpeg2.patch b/mpd-ffmpeg2.patch
new file mode 100644
index 0000000..07c3e48
--- /dev/null
+++ b/mpd-ffmpeg2.patch
@@ -0,0 +1,19 @@
+Fix build with FFmpeg 2.0.
+
+Upstream status: Better patch sent and merged upstream.
+
+Index: mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
+===================================================================
+--- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c
++++ mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
+@@ -47,6 +47,10 @@
+ #undef G_LOG_DOMAIN
+ #define G_LOG_DOMAIN "ffmpeg"
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ static GLogLevelFlags
+ level_ffmpeg_to_glib(int level)
+ {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpd.git/commitdiff/9504608e3176acec5567529c95be23087d951407