From 04535bb78eb89e846def58a9f039881f271d1d9c Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Tue, 22 Jul 2014 10:52:04 +0000 Subject: Stable for amd64, wrt bug #512912 (Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F) --- media-video/ffmpeg/ChangeLog | 5 ++++- media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'media-video/ffmpeg') diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 5cb313fa1785..a7d2feaa261f 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.758 2014/07/06 10:09:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.759 2014/07/22 10:52:04 ago Exp $ + + 22 Jul 2014; Agostino Sarubbo ffmpeg-1.2.6-r1.ebuild: + Stable for amd64, wrt bug #512912 06 Jul 2014; Michał Górny ffmpeg-1.2.6-r1.ebuild, ffmpeg-1.2.7.ebuild, ffmpeg-2.2.3-r1.ebuild, ffmpeg-2.2.4.ebuild, diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild index e16e2522521f..4d311b34190c 100644 --- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.4 2014/07/06 10:09:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.5 2014/07/22 10:52:04 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr bindist bluray +bzip2 cdio celt -- cgit v1.2.3-65-gdbad