diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-29 20:00:11 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-29 20:00:11 +0000 |
| commit | 7c5344e1385bf74b7b5272fb18701174dc6e2e5a (patch) | |
| tree | dea6095de6cc62abf3434cc97a0c974b83aa5c3b | |
| parent | Do not build the binaries for non native ABIs: They will be thrown away after. (diff) | |
| download | gentoo-2-7c5344e1385bf74b7b5272fb18701174dc6e2e5a.tar.gz gentoo-2-7c5344e1385bf74b7b5272fb18701174dc6e2e5a.tar.bz2 gentoo-2-7c5344e1385bf74b7b5272fb18701174dc6e2e5a.zip | |
EAPI5, add slot dep on ffmpeg, x264 and libav. Fix ffmpeg dep.
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 2eaf2fb57ba0..a68d359e901f 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.900 2013/07/28 21:13:48 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.901 2013/07/29 20:00:11 aballier Exp $ + + 29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: + EAPI5, add slot dep on ffmpeg, x264 and libav. Fix ffmpeg dep. 28 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1.1-r1.ebuild, mplayer-9999.ebuild: diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 10a2f8673b82..d15fed3e1a51 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.145 2013/07/28 21:13:48 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.146 2013/07/29 20:00:11 aballier Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" @@ -60,7 +60,7 @@ RDEPEND+=" sys-libs/ncurses app-arch/bzip2 sys-libs/zlib - || ( >=media-video/ffmpeg-1.1 >=media-video/libav-9 ) + || ( >=media-video/ffmpeg-2.0:= >=media-video/libav-9:= ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) @@ -81,7 +81,7 @@ RDEPEND+=" twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) - x264? ( >=media-libs/x264-0.0.20100423 ) + x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) |