summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-06-29 14:57:14 +0000
committerChristoph Mende <angelos@gentoo.org>2011-06-29 14:57:14 +0000
commitb69a94592cae556c66fbbf27a021145b27448080 (patch)
treea1b9e23f11d18ebc199ac723d2fb35017b1cfec2 /media-video/ffmpeg
parentStable on amd64 wrt bug #365273 (diff)
downloadgentoo-2-b69a94592cae556c66fbbf27a021145b27448080.tar.gz
gentoo-2-b69a94592cae556c66fbbf27a021145b27448080.tar.bz2
gentoo-2-b69a94592cae556c66fbbf27a021145b27448080.zip
Stable on amd64 wrt bug #365273
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e8524cd99eaa..6b86d31ce26e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.425 2011/06/29 14:50:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.426 2011/06/29 14:57:14 angelos Exp $
+
+ 29 Jun 2011; Christoph Mende <angelos@gentoo.org> ffmpeg-0.7_rc1.ebuild:
+ Stable on amd64 wrt bug #365273
29 Jun 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
convert to eapi4, add eprefix stuff, make use of REQUIRED_USE
diff --git a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
index 63f6c8da02c1..5a574a9bced5 100644
--- a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7_rc1.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/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.8 2011/06/26 14:58:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.9 2011/06/29 14:57:14 angelos Exp $
EAPI="2"
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~sparc x86 ~x86-fbsd ppc"
+ KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
fi
IUSE="
+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection