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

[Angel Velásquez]

    Date: Sunday, September 4, 2011 @ 13:02:27
  Author: angvp
Revision: 136985

upgpkg: mpd 0.16.4-1

Version bump to 0.16.4

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

---------------------------------+
 ChangeLog                       |    4 ++++
 PKGBUILD                        |   13 +++++--------
 mpd-0.16.3_ffmpeg_sigsegv.patch |   21 ---------------------
 3 files changed, 9 insertions(+), 29 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2011-09-04 13:38:27 UTC (rev 136984)
+++ ChangeLog	2011-09-04 17:02:27 UTC (rev 136985)
@@ -1,3 +1,7 @@
+2011-09-03 Angel Velasquez <angvp at archlinux.org>
+    * Version bump to 0.16.4
+    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
+
 2011-06-25 Angel Velasquez <angvp at archlinux.org>
     * Added a patch for bug with ffmpeg FS#24839 
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-04 13:38:27 UTC (rev 136984)
+++ PKGBUILD	2011-09-04 17:02:27 UTC (rev 136985)
@@ -5,8 +5,8 @@
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=mpd
-pkgver=0.16.3
-pkgrel=2
+pkgver=0.16.4
+pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,11 +18,9 @@
 install=${pkgname}.install
 changelog=ChangeLog
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'mpd' 
-        'mpd-0.16.3_ffmpeg_sigsegv.patch')
-md5sums=('6e708c02b0e8c288aec855eecf441a5a'
-         'e5669c2bff4031928531e52475addeb1'
-         '9a730957e213c62339e9335971e4b85e')
+'mpd') 
+md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1'
+         'e5669c2bff4031928531e52475addeb1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,7 +33,6 @@
     --disable-libwrap \
     --disable-cue \
     --disable-sidplay 
-  patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch
   make
 }
 

Deleted: mpd-0.16.3_ffmpeg_sigsegv.patch
===================================================================
--- mpd-0.16.3_ffmpeg_sigsegv.patch	2011-09-04 13:38:27 UTC (rev 136984)
+++ mpd-0.16.3_ffmpeg_sigsegv.patch	2011-09-04 17:02:27 UTC (rev 136985)
@@ -1,21 +0,0 @@
-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);