diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-26 23:06:14 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-26 23:06:14 +0000 |
| commit | 715631caf52784c47c8ed3aeb6cbdba2715a08db (patch) | |
| tree | d1923d66cba8dcf90112f81ca31009202cff25a3 /extra/mpd | |
| parent | 8999fa1750304fb2367fb7743e49e013405e88be (diff) | |
Sun Jun 26 23:06:14 UTC 2011
Diffstat (limited to 'extra/mpd')
| -rw-r--r-- | extra/mpd/ChangeLog | 5 | ||||
| -rw-r--r-- | extra/mpd/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch | 21 |
3 files changed, 34 insertions, 4 deletions
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog new file mode 100644 index 000000000..56ccb2263 --- /dev/null +++ b/extra/mpd/ChangeLog @@ -0,0 +1,5 @@ +2011-06-25 Angel Velasquez <angvp@archlinux.org> + * Added a patch for bug with ffmpeg FS#24839 + + +# vim: set ft=changelog ts=4 sw=4 et: diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index acdf209ef..046904a22 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127604 2011-06-16 17:50:00Z angvp $ +# $Id: PKGBUILD 128638 2011-06-25 09:54:26Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> @@ -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 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f '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 @@ build() { --disable-libwrap \ --disable-cue \ --disable-sidplay + patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch make } diff --git a/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch b/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch new file mode 100644 index 000000000..a945a0a6a --- /dev/null +++ b/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch @@ -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); |