summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-06-22 08:57:42 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-06-22 08:57:42 +0000
commit12f50e7f60add8ace6241a074d4be93d408b5f8d (patch)
treecf38dd6393b3f08cc2a4ccf4a84fbc536435136b /media-video/ffmpeg
parentadd ~x86 for bug 325007 (diff)
downloadgentoo-2-12f50e7f60add8ace6241a074d4be93d408b5f8d.tar.gz
gentoo-2-12f50e7f60add8ace6241a074d4be93d408b5f8d.tar.bz2
gentoo-2-12f50e7f60add8ace6241a074d4be93d408b5f8d.zip
add ~x86, bug 324941
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.6.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3465c4cd08a3..6c72f6b5262e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.358 2010/06/22 07:28:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.359 2010/06/22 08:57:42 fauli Exp $
+
+ 22 Jun 2010; Christian Faulhammer <fauli@gentoo.org> ffmpeg-0.6.ebuild:
+ add ~x86, bug 324941
22 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
faad support has been removed
diff --git a/media-video/ffmpeg/ffmpeg-0.6.ebuild b/media-video/ffmpeg/ffmpeg-0.6.ebuild
index 2addbd801b6e..d6ae190c80d3 100644
--- a/media-video/ffmpeg/ffmpeg-0.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.ebuild,v 1.3 2010/06/21 14:00:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.ebuild,v 1.4 2010/06/22 08:57:42 fauli Exp $
EAPI=2
SCM=""
@@ -25,9 +25,9 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-3"
SLOT="0"
if [[ ${PV} == *9999* ]]; then
- KEYWORDS=""
+ KEYWORDS="~x86"
else
- KEYWORDS="~amd64 ~x86-fbsd"
+ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test