diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-02-06 08:20:19 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-02-06 08:20:19 +0000 |
| commit | 0a23b9a4227c2473c68e686d200e03ab91f1f9b1 (patch) | |
| tree | a1ade0ed56f993598c32db7cc23757181107901a /media-video | |
| parent | Secondarily pull in media-libs/libpostproc if media-video/ffmpeg isn't used a... (diff) | |
| download | gentoo-2-0a23b9a4227c2473c68e686d200e03ab91f1f9b1.tar.gz gentoo-2-0a23b9a4227c2473c68e686d200e03ab91f1f9b1.tar.bz2 gentoo-2-0a23b9a4227c2473c68e686d200e03ab91f1f9b1.zip | |
Make sure to pull in media-video/ffmpeg from SLOT="0" instead of eg. SLOT="0.10"
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-20120707.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog index 4fc1f12ac3a8..21e6bb8f23c7 100644 --- a/media-video/cinelerra/ChangeLog +++ b/media-video/cinelerra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/cinelerra # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.66 2014/02/06 08:18:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.67 2014/02/06 08:20:19 ssuominen Exp $ + + 06 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> cinelerra-20120707.ebuild: + Make sure to pull in media-video/ffmpeg from SLOT="0" instead of eg. + SLOT="0.10" 06 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> cinelerra-20120707.ebuild: Secondarily pull in media-libs/libpostproc if media-video/ffmpeg isn't used as diff --git a/media-video/cinelerra/cinelerra-20120707.ebuild b/media-video/cinelerra/cinelerra-20120707.ebuild index 64defa3c4e9c..a6c24683519d 100644 --- a/media-video/cinelerra/cinelerra-20120707.ebuild +++ b/media-video/cinelerra/cinelerra-20120707.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/cinelerra/cinelerra-20120707.ebuild,v 1.8 2014/02/06 08:18:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20120707.ebuild,v 1.9 2014/02/06 08:20:19 ssuominen Exp $ EAPI=5 inherit autotools eutils multilib flag-o-matic @@ -37,7 +37,7 @@ RDEPEND="media-libs/a52dec:= x11-libs/libXvMC:= x11-libs/libXxf86vm:= virtual/ffmpeg - || ( media-video/ffmpeg media-libs/libpostproc ) + || ( media-video/ffmpeg:0 media-libs/libpostproc ) virtual/jpeg:0 alsa? ( media-libs/alsa-lib:= ) ieee1394? ( |