[packages/mpd] Up to 0.17.3, added ffmpeg-float.patch (fix for ffmpeg 1.1)

wiget wiget at pld-linux.org
Wed Feb 13 21:46:27 CET 2013


commit 8b5f865f887eacef718397efa2054705b27df05f
Author: Artur Frysiak <artur at frysiak.net>
Date:   Wed Feb 13 21:45:30 2013 +0100

    Up to 0.17.3, added ffmpeg-float.patch (fix for ffmpeg 1.1)

 ffmpeg-float.patch | 24 ++++++++++++++++++++++++
 mpd.spec           |  8 +++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/mpd.spec b/mpd.spec
index 270b044..ab0e240 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -10,17 +10,18 @@ Summary:	Music Player Daemon
 Summary(hu.UTF-8):	Music Player Daemon
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
-Version:	0.17.2
-Release:	4
+Version:	0.17.3
+Release:	1
 License:	GPL v2+
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-# Source0-md5:	52a5e9ccd37dc94231e80083dcb82d91
+# Source0-md5:	cfc9dbf54f52569b998677fe1fa79c11
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-cdio.patch
+Patch1:		ffmpeg-float.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/ffmpeg-float.patch b/ffmpeg-float.patch
new file mode 100644
index 0000000..8ec0b9c
--- /dev/null
+++ b/ffmpeg-float.patch
@@ -0,0 +1,24 @@
+From 1105e61f292fd61a6316a4b83439dbaa29c102fd Mon Sep 17 00:00:00 2001
+From: Brice Jaglin <bjaglin at free.fr>
+Date: Wed, 16 Jan 2013 17:02:58 +0000
+Subject: decoder/ffmpeg: support float planar audio
+
+---
+diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
+index 72a5ff3..4c4cb2b 100644
+--- a/src/decoder/ffmpeg_decoder_plugin.c
++++ b/src/decoder/ffmpeg_decoder_plugin.c
+@@ -395,6 +395,11 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt)
+ #endif
+ 		return SAMPLE_FORMAT_S32;
+ 
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
++	case AV_SAMPLE_FMT_FLTP:
++		return SAMPLE_FORMAT_FLOAT;
++#endif
++
+ 	default:
+ 		break;
+ 	}
+--
+cgit v0.9.0.3-66-g3205
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpd.git/commitdiff/8b5f865f887eacef718397efa2054705b27df05f



More information about the pld-cvs-commit mailing list