diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 08:29:30 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 08:29:30 +0000 |
| commit | 94acb123c2ed7cf741af628481a9b548aa9af190 (patch) | |
| tree | 20f6a86e06e132b3762ef23a13aa5be3bcb086b4 /media-sound/qmmp | |
| parent | Fix compability with dev-libs/libcdio-paranoia. (diff) | |
| download | gentoo-2-94acb123c2ed7cf741af628481a9b548aa9af190.tar.gz gentoo-2-94acb123c2ed7cf741af628481a9b548aa9af190.tar.bz2 gentoo-2-94acb123c2ed7cf741af628481a9b548aa9af190.zip | |
Fix compability with libcdio-paranoia.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-sound/qmmp')
| -rw-r--r-- | media-sound/qmmp/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/qmmp/qmmp-0.6.6.ebuild | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog index 4b47cd59a0fd..0f32ad3a399d 100644 --- a/media-sound/qmmp/ChangeLog +++ b/media-sound/qmmp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/qmmp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.102 2013/01/14 21:39:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.103 2013/01/16 08:29:30 ssuominen Exp $ + + 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> qmmp-0.6.6.ebuild: + Fix compability with libcdio-paranoia. *qmmp-0.6.6 (14 Jan 2013) diff --git a/media-sound/qmmp/qmmp-0.6.6.ebuild b/media-sound/qmmp/qmmp-0.6.6.ebuild index 0fae6965ec15..b46dbc731269 100644 --- a/media-sound/qmmp/qmmp-0.6.6.ebuild +++ b/media-sound/qmmp/qmmp-0.6.6.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/qmmp/qmmp-0.6.6.ebuild,v 1.1 2013/01/14 21:39:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.6.ebuild,v 1.2 2013/01/16 08:29:30 ssuominen Exp $ EAPI="5" @@ -29,7 +29,7 @@ RDEPEND="x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) - cdda? ( dev-libs/libcdio ) + cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) @@ -63,6 +63,16 @@ DOCS="AUTHORS ChangeLog README" CMAKE_IN_SOURCE_BUILD="1" +src_prepare() { + if has_version dev-libs/libcdio-paranoia; then + sed -i \ + -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ + src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die + fi + + base_src_prepare +} + src_configure() { mycmakeargs=( $(cmake-utils_use_use alsa) |