summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-12-17 14:32:55 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-12-17 14:32:55 +0000
commitb34449a5de6fb2c09858964dca457998a038dc85 (patch)
treeb08b2202c3e8c3c4c577234706ea50083bcc957c /media-libs
parentfix build with latest ffmpeg (diff)
downloadgentoo-2-b34449a5de6fb2c09858964dca457998a038dc85.tar.gz
gentoo-2-b34449a5de6fb2c09858964dca457998a038dc85.tar.bz2
gentoo-2-b34449a5de6fb2c09858964dca457998a038dc85.zip
works fine with ffmpeg 0.9, updating dep
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/ffmpegsource/ChangeLog6
-rw-r--r--media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-libs/ffmpegsource/ChangeLog b/media-libs/ffmpegsource/ChangeLog
index 0063a77d4383..369e79d9aded 100644
--- a/media-libs/ffmpegsource/ChangeLog
+++ b/media-libs/ffmpegsource/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/ffmpegsource
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.4 2011/12/10 15:17:59 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.5 2011/12/17 14:32:55 aballier Exp $
+
+ 17 Dec 2011; Alexis Ballier <aballier@gentoo.org>
+ ffmpegsource-2.16.2.1_pre587.ebuild:
+ works fine with ffmpeg 0.9, updating dep
10 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org>
ffmpegsource-2.16.2.1_pre587.ebuild:
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild
index a087fbd90bf0..1745fe977266 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild,v 1.2 2011/12/10 15:17:59 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild,v 1.3 2011/12/17 14:32:55 aballier Exp $
EAPI=4
@@ -17,7 +17,7 @@ IUSE="postproc static-libs"
RDEPEND="
sys-libs/zlib
- >=media-video/libav-0.8_pre20111116
+ || ( >=media-video/ffmpeg-0.9 >=media-video/libav-0.8_pre20111116 )
"
DEPEND="${RDEPEND}
dev-util/pkgconfig