summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2012-04-19 11:52:04 +0000
committerAgostino Sarubbo <ago@gentoo.org>2012-04-19 11:52:04 +0000
commit296e94cbd3ce63c11500326223f7985bfe88b5ac (patch)
tree6aab37f9d79cd482939f39fc2b19d116d3167fec /virtual
parentreverted to ~amd64 (diff)
downloadgentoo-2-296e94cbd3ce63c11500326223f7985bfe88b5ac.tar.gz
gentoo-2-296e94cbd3ce63c11500326223f7985bfe88b5ac.tar.bz2
gentoo-2-296e94cbd3ce63c11500326223f7985bfe88b5ac.zip
Stable for amd64, wrt bug #412123
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'virtual')
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index c471a7652bf4..1687c94885fa 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.27 2012/04/19 02:09:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.28 2012/04/19 11:52:04 ago Exp $
+
+ 19 Apr 2012; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
+ Stable for amd64, wrt bug #412123
19 Apr 2012; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
Stable for HPPA (bug #412123).
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
index 64291859b5da..d351a4246d59 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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.10.2-r1.ebuild,v 1.2 2012/04/19 02:09:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.3 2012/04/19 11:52:04 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
RDEPEND="