summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2008-04-07 22:14:42 +0000
committerBen de Groot <yngwin@gentoo.org>2008-04-07 22:14:42 +0000
commitd0b4f514c878cbe671d2764b8d5e09639f5a289c (patch)
tree46095d1b64844fe11804643bbd2e68b91982ebc1 /media-video/ffmpeg
parentmedia-video/cinelerra-cvs dependency x264 pkgmove (diff)
downloadgentoo-2-d0b4f514c878cbe671d2764b8d5e09639f5a289c.tar.gz
gentoo-2-d0b4f514c878cbe671d2764b8d5e09639f5a289c.tar.bz2
gentoo-2-d0b4f514c878cbe671d2764b8d5e09639f5a289c.zip
media-video/ffmpeg dependency x264 pkgmove
(Portage version: 2.1.5_rc2, RepoMan options: --force)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog8
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20080206.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild4
6 files changed, 19 insertions, 13 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 87373835042d..daa4eb7819b8 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.217 2008/03/27 09:05:18 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.218 2008/04/07 22:14:42 yngwin Exp $
+
+ 07 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+ ffmpeg-0.4.9_p20070616.ebuild, ffmpeg-0.4.9_p20070616-r1.ebuild,
+ ffmpeg-0.4.9_p20070616-r2.ebuild, ffmpeg-0.4.9_p20080206.ebuild,
+ ffmpeg-0.4.9_p20080326.ebuild:
+ Pkgmove x264-svn to x264
27 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org> Manifest:
manifest fixed; #bug 214967
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild
index c7923dc840f2..71714701baf0 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild,v 1.3 2007/10/31 11:54:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild,v 1.4 2008/04/07 22:14:42 yngwin Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -31,7 +31,7 @@ RDEPEND="imlib? ( media-libs/imlib2 )
zlib? ( sys-libs/zlib )
ieee1394? ( =media-libs/libdc1394-1*
sys-libs/libraw1394 )
- x264? ( >=media-libs/x264-svn-20061014 )
+ x264? ( media-libs/x264 )
X? ( x11-libs/libX11 x11-libs/libXext )
amr? ( media-libs/amrnb media-libs/amrwb )"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild
index 18e92361d066..61e6744fed71 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild,v 1.2 2007/10/31 11:54:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r2.ebuild,v 1.3 2008/04/07 22:14:42 yngwin Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -31,7 +31,7 @@ RDEPEND="imlib? ( media-libs/imlib2 )
zlib? ( sys-libs/zlib )
ieee1394? ( =media-libs/libdc1394-1*
sys-libs/libraw1394 )
- x264? ( >=media-libs/x264-svn-20061014 )
+ x264? ( media-libs/x264 )
X? ( x11-libs/libX11 x11-libs/libXext )
amr? ( media-libs/amrnb media-libs/amrwb )"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild
index e05b310aa8cc..770e273dd73e 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.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/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild,v 1.12 2008/01/13 08:40:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild,v 1.13 2008/04/07 22:14:42 yngwin Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -31,7 +31,7 @@ RDEPEND="imlib? ( media-libs/imlib2 )
zlib? ( sys-libs/zlib )
ieee1394? ( =media-libs/libdc1394-1*
sys-libs/libraw1394 )
- x264? ( >=media-libs/x264-svn-20061014 )
+ x264? ( media-libs/x264 )
X? ( x11-libs/libX11 x11-libs/libXext )
amr? ( media-libs/amrnb media-libs/amrwb )"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20080206.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20080206.ebuild
index 4a349d320c5d..cadfafadb16b 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20080206.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20080206.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/ffmpeg/ffmpeg-0.4.9_p20080206.ebuild,v 1.2 2008/02/28 18:49:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080206.ebuild,v 1.3 2008/04/07 22:14:42 yngwin Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -27,7 +27,7 @@ RDEPEND="imlib? ( media-libs/imlib2 )
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis )
theora? ( media-libs/libtheora )
- x264? ( >=media-libs/x264-svn-20061014 )
+ x264? ( media-libs/x264 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
aac? ( media-libs/faad2 )
a52? ( >=media-libs/a52dec-0.7.4-r4 )
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild
index a4e53c0c939f..4da5e7af78ce 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.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/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.1 2008/03/26 10:53:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.2 2008/04/07 22:14:42 yngwin Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -27,7 +27,7 @@ RDEPEND="imlib? ( media-libs/imlib2 )
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis )
theora? ( media-libs/libtheora )
- x264? ( >=media-libs/x264-svn-20061014 )
+ x264? ( media-libs/x264 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
aac? ( media-libs/faad2 )
a52? ( >=media-libs/a52dec-0.7.4-r4 )