summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-04-11 21:41:33 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-04-11 21:41:33 +0000
commit9eadfe2c0298967a8069ab06688b3f779b27bfe5 (patch)
tree1833578bb0d0e1fc617df0db5a06ed7516078c07 /media-video
parentStable for x86, wrt bug #455200 (diff)
downloadgentoo-2-9eadfe2c0298967a8069ab06688b3f779b27bfe5.tar.gz
gentoo-2-9eadfe2c0298967a8069ab06688b3f779b27bfe5.tar.bz2
gentoo-2-9eadfe2c0298967a8069ab06688b3f779b27bfe5.zip
Stable for x86, wrt bug #465496
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 7194459F)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.10.7.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3c5c0d8c4b01..1d8ff56490c3 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.639 2013/04/11 21:04:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.640 2013/04/11 21:41:33 ago Exp $
+
+ 11 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.7.ebuild:
+ Stable for x86, wrt bug #465496
11 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.7.ebuild:
Stable for alpha, wrt bug #465496
diff --git a/media-video/ffmpeg/ffmpeg-0.10.7.ebuild b/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
index f44c530e2d93..5bde41c7f08f 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.7.ebuild,v 1.5 2013/04/11 21:04:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.7.ebuild,v 1.6 2013/04/11 21:41:33 ago Exp $
EAPI="4"
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
IUSE="
aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug