Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/distcc/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libtorrent/PKGBUILD
	community/picard/PKGBUILD
	community/rtorrent/PKGBUILD
	community/ushare/PKGBUILD
	extra/catdoc/PKGBUILD
	extra/curl/PKGBUILD
	extra/ethstatus/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/metacity/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/x2x/PKGBUILD
	kde-unstable/kdeaccessibility/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	testing/alex/PKGBUILD
	testing/ghc/PKGBUILD
	testing/haskell-cgi/PKGBUILD
	testing/haskell-deepseq/PKGBUILD
	testing/haskell-fgl/PKGBUILD
	testing/haskell-glut/PKGBUILD
	testing/haskell-haskell-src/PKGBUILD
	testing/haskell-html/PKGBUILD
	testing/haskell-http/PKGBUILD
	testing/haskell-hunit/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-opengl/PKGBUILD
	testing/haskell-parallel/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-platform/PKGBUILD
	testing/haskell-quickcheck/PKGBUILD
	testing/haskell-regex-base/PKGBUILD
	testing/haskell-regex-compat/PKGBUILD
	testing/haskell-regex-posix/PKGBUILD
	testing/haskell-stm/PKGBUILD
	testing/haskell-syb/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-xhtml/PKGBUILD
	testing/haskell-zlib/PKGBUILD
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/perlbin.sh
	testing/pidgin/PKGBUILD
	testing/spamassassin/PKGBUILD

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 5c40e219d..6bd462840 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' 'mips64el')
 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);