summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'virtual/ffmpeg')
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/ffmpeg-0.6.90.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 1ef1b4179483..f55be10dd271 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.22 2012/01/31 00:19:36 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.23 2012/02/28 16:39:53 jer Exp $
+
+ 28 Feb 2012; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.6.90.ebuild:
+ Stable for HPPA (bug #405659).
31 Jan 2012; Jeff Horelick <jdhore@gentoo.org> ffmpeg-0.9.ebuild:
Keyword on ~x86 wrt bug 392269
diff --git a/virtual/ffmpeg/ffmpeg-0.6.90.ebuild b/virtual/ffmpeg/ffmpeg-0.6.90.ebuild
index 25231c84d400..c6bdfb3a3dcf 100644
--- a/virtual/ffmpeg/ffmpeg-0.6.90.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.6.90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.6.90.ebuild,v 1.9 2011/07/06 21:09:44 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.6.90.ebuild,v 1.10 2012/02/28 16:39:53 jer Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE="X +encode jpeg2k mp3 sdl theora threads vaapi vdpau x264"
RDEPEND="