summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/ChangeLog5
-rw-r--r--media-video/avidemux/avidemux-2.4.1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index a94c167df0df..e640184da425 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/avidemux
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.136 2008/10/16 21:41:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.137 2008/11/04 15:35:35 loki_val Exp $
+
+ 04 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> avidemux-2.4.1.ebuild:
+ Fix x264 dependencies in preparation for ffmpeg bump.
16 Oct 2008; Ben de Groot <yngwin@gentoo.org>
+files/avidemux-2.4.3-x264.patch, avidemux-2.4.3.ebuild:
diff --git a/media-video/avidemux/avidemux-2.4.1.ebuild b/media-video/avidemux/avidemux-2.4.1.ebuild
index 4a0c664d3a3a..d56c91370a2b 100644
--- a/media-video/avidemux/avidemux-2.4.1.ebuild
+++ b/media-video/avidemux/avidemux-2.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.12 2008/09/24 19:54:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.13 2008/11/04 15:35:35 loki_val Exp $
EAPI="1"
@@ -38,7 +38,7 @@ RDEPEND="dev-libs/libxml2
truetype? ( media-libs/freetype
media-libs/fontconfig )
vorbis? ( media-libs/libvorbis )
- x264? ( media-libs/x264 )
+ x264? ( <media-libs/x264-0.0.20081006 )
xv? ( x11-libs/libXv )
xvid? ( media-libs/xvid )
gtk? ( >=x11-libs/gtk+-2