diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 08:15:40 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 08:15:40 +0000 |
| commit | cef02c5c3c310a08916900e8033b501d1c367f1e (patch) | |
| tree | 439cbe0bffc3421a2c8a50970a0e3e22d67bf12c /media-sound/xmms2 | |
| parent | Bump (diff) | |
| download | gentoo-2-cef02c5c3c310a08916900e8033b501d1c367f1e.tar.gz gentoo-2-cef02c5c3c310a08916900e8033b501d1c367f1e.tar.bz2 gentoo-2-cef02c5c3c310a08916900e8033b501d1c367f1e.zip | |
Fix compability with dev-libs/libcdio-paranoia.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-sound/xmms2')
| -rw-r--r-- | media-sound/xmms2/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/xmms2/xmms2-0.8-r1.ebuild | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog index de828b49e587..58d37fb94c0e 100644 --- a/media-sound/xmms2/ChangeLog +++ b/media-sound/xmms2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/xmms2 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.30 2012/11/16 09:30:51 slyfox Exp $ +# 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 $ + + 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> xmms2-0.8-r1.ebuild: + Fix compability with dev-libs/libcdio-paranoia. 16 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.7-r2.ebuild, xmms2-0.7-r3.ebuild, xmms2-0.8-r1.ebuild: diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild index 397eb0006d98..4de33daeac89 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-2012 Gentoo Foundation +# 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.10 2012/11/16 09:30:51 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.11 2013/01/16 08:15:40 ssuominen Exp $ EAPI=3 @@ -29,7 +29,7 @@ RDEPEND="server? ( alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) - cdda? ( dev-libs/libcdio + cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) @@ -107,6 +107,10 @@ src_prepare() { cd .waf* || die epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch cd "${S}" + + 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 + fi } src_configure() { |