summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-11 22:55:03 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-11 22:55:03 +0000
commit12c3f6c1a6df7f7f9d22aea8a997b9c780dd216c (patch)
tree5e09dcd8f28e131845b43a7ba4eb528b1b2e351e /media-video
parentdepend on ffmpeg:0 (diff)
downloadgentoo-2-12c3f6c1a6df7f7f9d22aea8a997b9c780dd216c.tar.gz
gentoo-2-12c3f6c1a6df7f7f9d22aea8a997b9c780dd216c.tar.bz2
gentoo-2-12c3f6c1a6df7f7f9d22aea8a997b9c780dd216c.zip
depend on ffmpeg:0=
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mpv/ChangeLog6
-rw-r--r--media-video/mpv/mpv-0_p20130715.ebuild6
-rw-r--r--media-video/mpv/mpv-9999.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 31abe06fb1cd..f46333a03f69 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mpv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.17 2013/07/19 08:47:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.18 2013/08/11 22:55:03 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> mpv-0_p20130715.ebuild,
+ mpv-9999.ebuild:
+ depend on ffmpeg:0=
19 Jul 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
Clean up of metadata.xml. Do not express assignment in description for normal
diff --git a/media-video/mpv/mpv-0_p20130715.ebuild b/media-video/mpv/mpv-0_p20130715.ebuild
index 4c5fd8f3367b..5f60135f741a 100644
--- a/media-video/mpv/mpv-0_p20130715.ebuild
+++ b/media-video/mpv/mpv-0_p20130715.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-video/mpv/mpv-0_p20130715.ebuild,v 1.2 2013/07/17 18:16:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0_p20130715.ebuild,v 1.3 2013/08/11 22:55:03 aballier Exp $
EAPI=5
@@ -42,7 +42,7 @@ REQUIRED_USE="
RDEPEND+="
|| (
>=media-video/libav-9:=[encode?,threads?,vdpau?]
- >=media-video/ffmpeg-1.2[encode?,threads?,vdpau?]
+ >=media-video/ffmpeg-1.2:0=[encode?,threads?,vdpau?]
)
sys-libs/ncurses
sys-libs/zlib
@@ -86,7 +86,7 @@ RDEPEND+="
postproc? (
|| (
media-libs/libpostproc
- >=media-video/ffmpeg-1.2[encode?,threads?,vdpau?]
+ >=media-video/ffmpeg-1.2:0[encode?,threads?,vdpau?]
)
)
pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 11499e21605a..88a18941fe5a 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.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-video/mpv/mpv-9999.ebuild,v 1.14 2013/07/17 18:16:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.15 2013/08/11 22:55:03 aballier Exp $
EAPI=5
@@ -42,7 +42,7 @@ REQUIRED_USE="
RDEPEND+="
|| (
>=media-video/libav-9:=[encode?,threads?,vdpau?]
- >=media-video/ffmpeg-1.2[encode?,threads?,vdpau?]
+ >=media-video/ffmpeg-1.2:0=[encode?,threads?,vdpau?]
)
sys-libs/ncurses
sys-libs/zlib
@@ -86,7 +86,7 @@ RDEPEND+="
postproc? (
|| (
media-libs/libpostproc
- >=media-video/ffmpeg-1.2[encode?,threads?,vdpau?]
+ >=media-video/ffmpeg-1.2:0[encode?,threads?,vdpau?]
)
)
pulseaudio? ( media-sound/pulseaudio )