summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2012-04-10 08:14:00 +0000
committerAgostino Sarubbo <ago@gentoo.org>2012-04-10 08:14:00 +0000
commit13947543a784991f6b61e38ec58a94319738f72b (patch)
tree9a407151626c50caa08231f1c16f0dda0e98b6f4 /media-video/ffmpeg
parentVersion bump (diff)
downloadgentoo-2-13947543a784991f6b61e38ec58a94319738f72b.tar.gz
gentoo-2-13947543a784991f6b61e38ec58a94319738f72b.tar.bz2
gentoo-2-13947543a784991f6b61e38ec58a94319738f72b.zip
Stable for amd64, wrt bug #411369
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.10.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 5698a1a3a1a3..09021bd08469 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.539 2012/04/09 15:57:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.540 2012/04/10 08:14:00 ago Exp $
+
+ 10 Apr 2012; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.2.ebuild:
+ Stable for amd64, wrt bug #411369
09 Apr 2012; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.ebuild:
Stable for amd64, wrt bug #401069
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
index 7c2fba160dc2..d1784d017f9b 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.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/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.5 2012/04/08 15:34:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.6 2012/04/10 08:14:00 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 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="
aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug