[arch-commits] Commit in mpd/trunk (PKGBUILD ffmpeg.patch)

[Gaetan Bisson]

    Date: Tuesday, March 5, 2013 @ 12:02:41
  Author: bisson
Revision: 179308

fix FS#33909

Added:
  mpd/trunk/ffmpeg.patch
Modified:
  mpd/trunk/PKGBUILD

--------------+
 PKGBUILD     |    6 +++++-
 ffmpeg.patch |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-05 10:56:14 UTC (rev 179307)
+++ PKGBUILD	2013-03-05 11:02:41 UTC (rev 179308)
@@ -7,7 +7,7 @@
 
 pkgname=mpd
 pkgver=0.17.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
 license=('GPL')
@@ -16,9 +16,11 @@
          'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl')
 makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
+        'ffmpeg.patch'
         'tmpfiles.d'
         'rc.d') 
 sha1sums=('f684d73a7517371a4461afdb2439f9533b51a49d'
+          '8a06d04bfdf4e0dc43479907dc9b3bd7fba6dd10'
           'f4d5922abb69abb739542d8e93f4dfd748acdad7'
           '3470d489565f0ed479f1665dd2876f66acb5a585')
 
@@ -28,6 +30,8 @@
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	patch -p1 -i ../ffmpeg.patch
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \

Added: ffmpeg.patch
===================================================================
--- ffmpeg.patch	                        (rev 0)
+++ ffmpeg.patch	2013-03-05 11:02:41 UTC (rev 179308)
@@ -0,0 +1,15 @@
+diff -Naur old/src/decoder/ffmpeg_decoder_plugin.c new/src/decoder/ffmpeg_decoder_plugin.c
+--- old/src/decoder/ffmpeg_decoder_plugin.c	2013-01-07 11:39:40.000000000 +1100
++++ new/src/decoder/ffmpeg_decoder_plugin.c	2013-03-05 21:54:27.116585462 +1100
+@@ -395,6 +395,11 @@
+ #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;
+ 	}