[arch-commits] Commit in mpd/trunk (3 files)

[Angel Velásquez]

    Date: Saturday, June 25, 2011 @ 05:54:26
  Author: angvp
Revision: 128638

upgpkg: mpd 0.16.3-2
Fixing FS#24839

Added:
  mpd/trunk/ChangeLog
  mpd/trunk/mpd-0.16.3_ffmpeg_sigsegv.patch
Modified:
  mpd/trunk/PKGBUILD

---------------------------------+
 ChangeLog                       |    5 +++++
 PKGBUILD                        |   10 +++++++---
 mpd-0.16.3_ffmpeg_sigsegv.patch |   21 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

Added: ChangeLog
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2011-06-25 09:54:26 UTC (rev 128638)
@@ -0,0 +1,5 @@
+2011-06-25 Angel Velasquez <angvp at archlinux.org>
+    * Added a patch for bug with ffmpeg FS#24839 
+
+
+# vim: set ft=changelog ts=4 sw=4 et:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-24 19:51:26 UTC (rev 128637)
+++ PKGBUILD	2011-06-25 09:54:26 UTC (rev 128638)
@@ -6,7 +6,7 @@
 
 pkgname=mpd
 pkgver=0.16.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,10 +16,13 @@
          'libpulse')
 makedepends=('pkgconfig' 'doxygen')
 install=${pkgname}.install
+changelog=ChangeLog
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'mpd')
+        'mpd' 
+        'mpd-0.16.3_ffmpeg_sigsegv.patch')
 md5sums=('6e708c02b0e8c288aec855eecf441a5a'
-         'e5669c2bff4031928531e52475addeb1')
+         'e5669c2bff4031928531e52475addeb1'
+         '9a730957e213c62339e9335971e4b85e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,6 +35,7 @@
     --disable-libwrap \
     --disable-cue \
     --disable-sidplay 
+  patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch
   make
 }
 

Added: mpd-0.16.3_ffmpeg_sigsegv.patch
===================================================================
--- mpd-0.16.3_ffmpeg_sigsegv.patch	                        (rev 0)
+++ mpd-0.16.3_ffmpeg_sigsegv.patch	2011-06-25 09:54:26 UTC (rev 128638)
@@ -0,0 +1,21 @@
+diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
+--- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c	2011-06-04 17:36:33.000000000 +0300
++++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c	2011-06-24 18:18:51.840218251 +0300
+@@ -321,7 +321,7 @@
+ 	}
+ 
+ 	//ffmpeg works with ours "fileops" helper
+-	AVFormatContext *format_context;
++	AVFormatContext *format_context = NULL;
+ 	if (av_open_input_stream(&format_context, stream->io, input->uri,
+ 				 input_format, NULL) != 0) {
+ 		g_warning("Open failed\n");
+@@ -470,7 +470,7 @@
+ 	if (stream == NULL)
+ 		return NULL;
+ 
+-	AVFormatContext *f;
++	AVFormatContext *f = NULL;
+ 	if (av_open_input_stream(&f, stream->io, is->uri,
+ 				 input_format, NULL) != 0) {
+ 		mpd_ffmpeg_stream_close(stream);