summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klausmann <klausman@gentoo.org>2010-09-13 15:49:02 +0000
committerTobias Klausmann <klausman@gentoo.org>2010-09-13 15:49:02 +0000
commit5dd1fae83df734b94c7bc575b97e305a00758ede (patch)
tree1476690ff8191c42b7541a08249738016a110026 /media-video/ffmpeg
parentMake compilation on Darwin working again (flag-o-matic inherit was dropped), ... (diff)
downloadgentoo-2-5dd1fae83df734b94c7bc575b97e305a00758ede.tar.gz
gentoo-2-5dd1fae83df734b94c7bc575b97e305a00758ede.tar.bz2
gentoo-2-5dd1fae83df734b94c7bc575b97e305a00758ede.zip
Stable on alpha, bug #332361
(Portage version: 2.1.9.5/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.6.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index ec4bfeae423e..c862ad585311 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.366 2010/08/10 09:57:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.367 2010/09/13 15:49:02 klausman Exp $
+
+ 13 Sep 2010; Tobias Klausmann <klausman@gentoo.org> ffmpeg-0.6.ebuild:
+ Stable on alpha, bug #332361
10 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-9999.ebuild:
USE="qt-faststart" to replace separate media-video/qt-faststart package.
diff --git a/media-video/ffmpeg/ffmpeg-0.6.ebuild b/media-video/ffmpeg/ffmpeg-0.6.ebuild
index 217ae22acfb1..c01e78766089 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.6 2010/07/11 15:15:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.ebuild,v 1.7 2010/09/13 15:49:02 klausman Exp $
EAPI=2
SCM=""
@@ -25,9 +25,9 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-3"
SLOT="0"
if [[ ${PV} == *9999* ]]; then
- KEYWORDS="~hppa"
+ KEYWORDS="alpha ~hppa"
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~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