diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2010-09-17 09:35:56 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2010-09-17 09:35:56 +0000 |
| commit | ea6577a372790f23f57a7a4415544e305ef64499 (patch) | |
| tree | f4b0a701043892b06c24e7f6285f3712ce637fbe /media-video | |
| parent | stable x86, security bug 332361 (diff) | |
| download | historical-ea6577a372790f23f57a7a4415544e305ef64499.tar.gz historical-ea6577a372790f23f57a7a4415544e305ef64499.tar.bz2 historical-ea6577a372790f23f57a7a4415544e305ef64499.zip | |
stable x86, security bug 332361
Package-Manager: portage-2.1.8.3/cvs/Linux i686
RepoMan-Options: --force
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.6.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index e006231726f8..025786ecd49b 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.368 2010/09/15 23:14:05 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.369 2010/09/17 09:35:56 fauli Exp $ + + 17 Sep 2010; Christian Faulhammer <fauli@gentoo.org> ffmpeg-0.6.ebuild: + stable x86, security bug 332361 15 Sep 2010; Joseph Jezak <josejx@gentoo.org> ffmpeg-0.6.ebuild: Marked ~ppc/~ppc64 for bug #324941. diff --git a/media-video/ffmpeg/ffmpeg-0.6.ebuild b/media-video/ffmpeg/ffmpeg-0.6.ebuild index fd1a35e3337e..7cbe76fc8685 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.8 2010/09/15 23:14:05 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.ebuild,v 1.9 2010/09/17 09:35:56 fauli Exp $ EAPI=2 SCM="" @@ -25,9 +25,9 @@ FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-3" SLOT="0" if [[ ${PV} == *9999* ]]; then - KEYWORDS="alpha ~hppa ~ppc ~ppc64" + KEYWORDS="alpha ~hppa ~ppc ~ppc64 x86" else - KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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 |