packages: mpd/mpd.spec, mpd/mpd-ffmpeg_sigsegv.patch (NEW) - added -ffmpeg_...

[evil]

Author: evil                         Date: Fri Jul 15 09:55:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added -ffmpeg_sigsegv.patch fixing "mpd[11147]: segfault at...libavformat.so..." segfaults while scanning collection with telediscs

---- Files affected:
packages/mpd:
   mpd.spec (1.67 -> 1.68) , mpd-ffmpeg_sigsegv.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mpd/mpd.spec
diff -u packages/mpd/mpd.spec:1.67 packages/mpd/mpd.spec:1.68
--- packages/mpd/mpd.spec:1.67	Mon Jun 27 21:22:29 2011
+++ packages/mpd/mpd.spec	Fri Jul 15 11:55:29 2011
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
 Version:	0.16.3
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
@@ -20,6 +20,7 @@
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 URL:		http://www.musicpd.org/
+Patch0:		%{name}-ffmpeg_sigsegv.patch
 BuildRequires:	OpenAL-devel
 BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	audiofile-devel >= 0.1.7
@@ -118,6 +119,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # ac_cv_* hacks to avoid unwanted linking
@@ -243,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2011/07/15 09:55:29  evil
+- added -ffmpeg_sigsegv.patch fixing "mpd[11147]: segfault at...libavformat.so..." segfaults while scanning collection with telediscs
+
 Revision 1.67  2011/06/27 19:22:29  arekm
 - release 2
 

================================================================
Index: packages/mpd/mpd-ffmpeg_sigsegv.patch
diff -u /dev/null packages/mpd/mpd-ffmpeg_sigsegv.patch:1.1
--- /dev/null	Fri Jul 15 11:55:34 2011
+++ packages/mpd/mpd-ffmpeg_sigsegv.patch	Fri Jul 15 11:55:29 2011
@@ -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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpd/mpd.spec?r1=1.67&r2=1.68&f=u