diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-05-23 20:29:56 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-05-23 20:29:56 +0000 |
| commit | 72a599de3bbd421d4ed8c40a3c2439e9fe858952 (patch) | |
| tree | 698c2216f6d78007edd08616072122d1f95f9df0 /media-video | |
| parent | Fix build with jpeg-9, bug 533470 (diff) | |
| download | gentoo-2-72a599de3bbd421d4ed8c40a3c2439e9fe858952.tar.gz gentoo-2-72a599de3bbd421d4ed8c40a3c2439e9fe858952.tar.bz2 gentoo-2-72a599de3bbd421d4ed8c40a3c2439e9fe858952.zip | |
Drop unneeded sox dep (#547114 by SN (Enlik), use new libav/ffmpeg handling
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/openshot/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/openshot/openshot-1.4.3.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-video/openshot/ChangeLog b/media-video/openshot/ChangeLog index 9158279b2b1f..2ba5cbc984a5 100644 --- a/media-video/openshot/ChangeLog +++ b/media-video/openshot/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/openshot # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/openshot/ChangeLog,v 1.4 2015/04/08 18:16:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/openshot/ChangeLog,v 1.5 2015/05/23 20:29:56 pacho Exp $ + + 23 May 2015; Pacho Ramos <pacho@gentoo.org> openshot-1.4.3.ebuild: + Drop unneeded sox dep (#547114 by SN (Enlik), use new libav/ffmpeg handling 08 Apr 2015; Michał Górny <mgorny@gentoo.org> openshot-1.4.3.ebuild: Drop old Python implementations diff --git a/media-video/openshot/openshot-1.4.3.ebuild b/media-video/openshot/openshot-1.4.3.ebuild index e290be1b0bf4..b1f2c8755a89 100644 --- a/media-video/openshot/openshot-1.4.3.ebuild +++ b/media-video/openshot/openshot-1.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/openshot/openshot-1.4.3.ebuild,v 1.2 2015/04/08 18:16:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/openshot/openshot-1.4.3.ebuild,v 1.3 2015/05/23 20:29:56 pacho Exp $ EAPI="5" @@ -17,7 +17,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="+python +ffmpeg" +IUSE="+python +ffmpeg libav" REQUIRED_USE="|| ( python ffmpeg )" RDEPEND=" @@ -27,8 +27,8 @@ RDEPEND=" virtual/python-imaging[${PYTHON_USEDEP}] >=media-libs/mlt-0.8.2[ffmpeg,frei0r,gtk,melt,python,sdl,xml] ffmpeg? ( - >=virtual/ffmpeg-0.6[encode,sdl,x264,mp3,theora] - media-sound/sox[encode,ffmpeg] + libav? ( media-video/libav:=[encode,sdl,x264,mp3,theora] ) + !libav? ( media-video/ffmpeg:0=[encode,sdl,x264,mp3,theora] ) ) python? ( dev-python/httplib2[${PYTHON_USEDEP}] |