diff options
| author |   Ian Whyman <thev00d00@gentoo.org> | 2013-08-12 07:51:08 +0000 |
|---|---|---|
| committer | Ian Whyman <thev00d00@gentoo.org> | 2013-08-12 07:51:08 +0000 |
| commit | cc5f8cf07852eb554005a9ff2660273bb1ccac3e (patch) | |
| tree | 6eaa4d71084635ef3ae673b3b50b018d2d9104fc /media-video | |
| parent | Add ~amd64-linux and ~x86-linux keywords (diff) | |
| download | gentoo-2-cc5f8cf07852eb554005a9ff2660273bb1ccac3e.tar.gz gentoo-2-cc5f8cf07852eb554005a9ff2660273bb1ccac3e.tar.bz2 gentoo-2-cc5f8cf07852eb554005a9ff2660273bb1ccac3e.zip | |
Fix broken ffmpeg deps, thanks to Damien Granger on #480682
(Portage version: 2.2.0_alpha195/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/handbrake/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-0.9.9.ebuild | 4 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog index f5f97795071d..1ea25239db1a 100644 --- a/media-video/handbrake/ChangeLog +++ b/media-video/handbrake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/handbrake # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.13 2013/08/11 23:06:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.14 2013/08/12 07:51:08 thev00d00 Exp $ + + 12 Aug 2013; Ian Whyman <thev00d00@gentoo.org> handbrake-0.9.9.ebuild, + handbrake-9999.ebuild: + Fix broken ffmpeg deps, thanks to Damien Granger on #480682 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> handbrake-0.9.9.ebuild, handbrake-9999.ebuild: diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild index 54a5ff21e3bf..8ababcb2c7db 100644 --- a/media-video/handbrake/handbrake-0.9.9.ebuild +++ b/media-video/handbrake/handbrake-0.9.9.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/handbrake/handbrake-0.9.9.ebuild,v 1.8 2013/08/11 23:06:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.9 2013/08/12 07:51:08 thev00d00 Exp $ EAPI="5" @@ -42,7 +42,7 @@ RDEPEND=" media-libs/libvorbis media-libs/x264:= media-sound/lame - ffmpeg? ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) + ffmpeg? ( || ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index 2a3d987b4527..1d20994c6667 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-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/handbrake/handbrake-9999.ebuild,v 1.10 2013/08/11 23:06:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.11 2013/08/12 07:51:08 thev00d00 Exp $ EAPI="5" @@ -50,7 +50,7 @@ RDEPEND=" media-libs/libvorbis media-libs/x264:= media-sound/lame - ffmpeg? ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) + ffmpeg? ( || ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 |