summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-03 18:18:48 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-03 18:18:48 +0000
commitd2df9f4a9b6a018d6e82e9ea03a74543594822fa (patch)
tree13c9cd5155a37f2a19b77d9bb7778c5ac1e75e3c /media-video
parentAdd support for USE="device-mapper sdl", drop dead configure options, and onl... (diff)
downloadgentoo-2-d2df9f4a9b6a018d6e82e9ea03a74543594822fa.tar.gz
gentoo-2-d2df9f4a9b6a018d6e82e9ea03a74543594822fa.tar.bz2
gentoo-2-d2df9f4a9b6a018d6e82e9ea03a74543594822fa.zip
Migrate from media-video/ffmpeg to virtual/ffmpeg
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/x264-encoder/ChangeLog7
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild6
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild6
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20110223.ebuild4
4 files changed, 14 insertions, 9 deletions
diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index ad2e2b419a2f..3006b99cd35a 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/x264-encoder
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.47 2011/02/24 13:26:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.48 2011/04/03 18:18:48 scarabeus Exp $
+
+ 03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ x264-encoder-0.0.20100605.ebuild, x264-encoder-0.0.20101029.ebuild,
+ x264-encoder-0.0.20110223.ebuild:
+ Migrate from media-video/ffmpeg to virtual/ffmpeg
*x264-encoder-0.0.20110223 (24 Feb 2011)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild
index cb3ccfb26434..37b6d3b284cd 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild,v 1.7 2010/11/14 19:08:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20100605.ebuild,v 1.8 2011/04/03 18:18:48 scarabeus Exp $
EAPI=2
inherit eutils multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="debug ffmpeg +mp4 +threads"
RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
~media-libs/x264-${PV}
- ffmpeg? ( media-video/ffmpeg )"
+ ffmpeg? ( virtual/ffmpeg )"
DEPEND="${RDEPEND}
amd64? ( >=dev-lang/yasm-0.6.2 )
x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild
index 8b5d742e3e51..dc70b5855956 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild,v 1.3 2010/12/09 16:05:09 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20101029.ebuild,v 1.4 2011/04/03 18:18:48 scarabeus Exp $
EAPI=2
inherit eutils multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="debug ffmpeg +mp4 +threads"
RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
~media-libs/x264-${PV}
- ffmpeg? ( media-video/ffmpeg )"
+ ffmpeg? ( virtual/ffmpeg )"
DEPEND="${RDEPEND}
amd64? ( >=dev-lang/yasm-0.6.2 )
x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110223.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110223.ebuild
index 17d27c0ff07f..08e948bc1a82 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20110223.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20110223.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-video/x264-encoder/x264-encoder-0.0.20110223.ebuild,v 1.1 2011/02/24 13:26:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110223.ebuild,v 1.2 2011/04/03 18:18:48 scarabeus Exp $
EAPI=2
inherit eutils multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="debug ffmpeg +mp4 +threads"
RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
~media-libs/x264-${PV}
- ffmpeg? ( media-video/ffmpeg )"
+ ffmpeg? ( virtual/ffmpeg )"
DEPEND="${RDEPEND}
amd64? ( >=dev-lang/yasm-0.6.2 )
x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )