diff options
| author |   Markus Meier <maekke@gentoo.org> | 2010-10-11 22:13:00 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2010-10-11 22:13:00 +0000 |
| commit | 86f6e8d38ab66084e3abf8fdb393d9760eddc3cb (patch) | |
| tree | 3828809f45907883083be821ba5caacf8ef82159 /media-video | |
| parent | use.mask frei0r (diff) | |
| download | gentoo-2-86f6e8d38ab66084e3abf8fdb393d9760eddc3cb.tar.gz gentoo-2-86f6e8d38ab66084e3abf8fdb393d9760eddc3cb.tar.bz2 gentoo-2-86f6e8d38ab66084e3abf8fdb393d9760eddc3cb.zip | |
restore ~arm, bug #340269
(Portage version: 2.2_rc91/cvs/Linux i686)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index e379609f3e42..e69ccd7a6b23 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.378 2010/10/11 18:52:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.379 2010/10/11 22:13:00 maekke Exp $ + + 11 Oct 2010; Markus Meier <maekke@gentoo.org> ffmpeg-0.6_p25423.ebuild: + restore ~arm, bug #340269 11 Oct 2010; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.6.ebuild: Stable for HPPA (bug #332361). diff --git a/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild index b12bd1c20efc..827c51099724 100644 --- a/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.6_p25423.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_p25423.ebuild,v 1.2 2010/10/10 19:08:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.3 2010/10/11 22:13:00 maekke Exp $ EAPI="2" @@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-3" SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |