summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2013-01-16 12:35:31 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2013-01-16 12:35:31 +0000
commit53e01d0c2d8000790e55ea69ebeaad130ff0c92e (patch)
tree46f9a8612169077d44c742456359ae4e8b7158d2 /media-sound/xmms2
parentdev-util/nvidia-cuda-toolkit: Drop old version of gcc which do not provide GL... (diff)
downloadgentoo-2-53e01d0c2d8000790e55ea69ebeaad130ff0c92e.tar.gz
gentoo-2-53e01d0c2d8000790e55ea69ebeaad130ff0c92e.tar.bz2
gentoo-2-53e01d0c2d8000790e55ea69ebeaad130ff0c92e.zip
Picked upstream fix for libav-9 (bug #443256 by Diego Elio Pettenò and others).
(Portage version: 2.2.0_alpha142_p5/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'media-sound/xmms2')
-rw-r--r--media-sound/xmms2/ChangeLog7
-rw-r--r--media-sound/xmms2/files/xmms2-0.8-libav-9.patch21
-rw-r--r--media-sound/xmms2/xmms2-0.8-r1.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 58d37fb94c0e..a514493f0abd 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/xmms2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.31 2013/01/16 08:15:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.32 2013/01/16 12:35:31 slyfox Exp $
+
+ 16 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/xmms2-0.8-libav-9.patch, xmms2-0.8-r1.ebuild:
+ Picked upstream fix for libav-9 (bug #443256 by Diego Elio Pettenò and
+ others).
16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> xmms2-0.8-r1.ebuild:
Fix compability with dev-libs/libcdio-paranoia.
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
new file mode 100644
index 000000000000..608fc66cf96a
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
@@ -0,0 +1,21 @@
+commit a1fe1f45c19c67ed80c05d8276b88d1296f984d2
+Author: Raphaël Bois <virtualdust@gmail.com>
+Date: Sun Nov 25 17:55:12 2012 +0100
+
+ OTHER: Add Diego Biurrun in AUTHORS file
+
+diff --git a/AUTHORS b/AUTHORS
+index 9d05e1a..3b84fce 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -37,6 +37,10 @@ E: xkr47@outerspace.dyndns.org
+ W: http://xkr47.outerspace.dyndns.org/
+ D: curl_http updated to xforms, icymetaint plugin (extracted from curl)
+
++N: Diego Biurrun
++E: diego@biurrun.de
++D: Support for libav 9 in avcodec plugin
++
+ N: Magnus Bjernstad
+ E: bjernstad@gmail.com
+ D: PythonAPI fixes.
diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild
index 4de33daeac89..1232635df6dd 100644
--- a/media-sound/xmms2/xmms2-0.8-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.11 2013/01/16 08:15:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.12 2013/01/16 12:35:31 slyfox Exp $
EAPI=3
@@ -107,6 +107,7 @@ src_prepare() {
cd .waf* || die
epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch
cd "${S}"
+ epatch "${FILESDIR}/${P}"-libav-9.patch #443256
if has_version dev-libs/libcdio-paranoia; then
sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die