diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-04-07 18:12:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-04-07 18:12:28 +0000 |
| commit | 14edd91c57a123ee08d72c98b2eb6f5f41b1ad2c (patch) | |
| tree | 2846a81fff1c35246c8f8209e7b64836fa89b0dd /media-video | |
| parent | Version bump. (diff) | |
| download | gentoo-2-14edd91c57a123ee08d72c98b2eb6f5f41b1ad2c.tar.gz gentoo-2-14edd91c57a123ee08d72c98b2eb6f5f41b1ad2c.tar.bz2 gentoo-2-14edd91c57a123ee08d72c98b2eb6f5f41b1ad2c.zip | |
Depend on both, libcdio and libcdio-paranoia wrt #506942 by Julian Ospald. Force SLOT="0" of virtual/jpeg for headers.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mpv/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mpv/mpv-0.3.7.ebuild | 10 | ||||
| -rw-r--r-- | media-video/mpv/mpv-9999.ebuild | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog index 1a1612270b27..88a2d08779dc 100644 --- a/media-video/mpv/ChangeLog +++ b/media-video/mpv/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mpv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.65 2014/04/07 07:03:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.66 2014/04/07 18:12:28 ssuominen Exp $ + + 07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> mpv-0.3.7.ebuild, + mpv-9999.ebuild: + Depend on both, libcdio and libcdio-paranoia wrt #506942 by Julian Ospald. + Force SLOT="0" of virtual/jpeg for headers. 06 Apr 2014; Tom Wijsman <TomWij@gentoo.org> mpv-0.3.7.ebuild, mpv-9999.ebuild: diff --git a/media-video/mpv/mpv-0.3.7.ebuild b/media-video/mpv/mpv-0.3.7.ebuild index 64c05b8d9077..7ae16f68c6f6 100644 --- a/media-video/mpv/mpv-0.3.7.ebuild +++ b/media-video/mpv/mpv-0.3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.7.ebuild,v 1.3 2014/04/06 18:39:18 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.7.ebuild,v 1.4 2014/04/07 18:12:28 ssuominen Exp $ EAPI=5 @@ -66,10 +66,8 @@ RDEPEND+=" bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( - || ( - dev-libs/libcdio-paranoia - <dev-libs/libcdio-0.90[-minimal] - ) + dev-libs/libcdio + dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( @@ -79,7 +77,7 @@ RDEPEND+=" enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index d994c741427d..007f07cf857b 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.42 2014/04/06 18:39:18 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.43 2014/04/07 18:12:28 ssuominen Exp $ EAPI=5 @@ -66,10 +66,8 @@ RDEPEND+=" bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( - || ( - dev-libs/libcdio-paranoia - <dev-libs/libcdio-0.90[-minimal] - ) + dev-libs/libcdio + dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( @@ -79,7 +77,7 @@ RDEPEND+=" enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] |