summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-07 13:48:46 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-07 13:48:46 +0000
commit7f732664815f49d70018a99d4699850d2ba830a4 (patch)
treeba512e23b7e30d31e790ab9686157345d7ef2982 /media-sound/mpd
parentStable for x86, wrt bug #477950 (diff)
downloadgentoo-2-7f732664815f49d70018a99d4699850d2ba830a4.tar.gz
gentoo-2-7f732664815f49d70018a99d4699850d2ba830a4.tar.bz2
gentoo-2-7f732664815f49d70018a99d4699850d2ba830a4.zip
Add a note about upstream status
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-sound/mpd')
-rw-r--r--media-sound/mpd/ChangeLog6
-rw-r--r--media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch2
2 files changed, 7 insertions, 1 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index d5f78ab6f333..bb81bbeccc7f 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/mpd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.318 2013/08/06 22:42:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.319 2013/08/07 13:48:46 aballier Exp $
+
+ 07 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+ files/mpd-0.17.4-ffmpeg2.patch:
+ Add a note about upstream status
06 Aug 2013; Alexis Ballier <aballier@gentoo.org> mpd-0.17.4-r2.ebuild,
+files/mpd-0.17.4-ffmpeg2.patch:
diff --git a/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch b/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
index b7964a7991a5..07c3e48eb1b8 100644
--- a/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
+++ b/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
@@ -1,5 +1,7 @@
Fix build with FFmpeg 2.0.
+Upstream status: Better patch sent and merged upstream.
+
Index: mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
===================================================================
--- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c