diff options
| author |   Markus Meier <maekke@gentoo.org> | 2014-10-11 13:09:41 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2014-10-11 13:09:41 +0000 |
| commit | 852c294888e0407ed3742832cbec9c4dd2785b4d (patch) | |
| tree | 949e9a46d43edeb4d1381bdd7a6a5e1cdb4d2508 | |
| parent | arm stable, bug #512012 (diff) | |
| download | gentoo-2-852c294888e0407ed3742832cbec9c4dd2785b4d.tar.gz gentoo-2-852c294888e0407ed3742832cbec9c4dd2785b4d.tar.bz2 gentoo-2-852c294888e0407ed3742832cbec9c4dd2785b4d.zip | |
arm stable, bug #512012
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, RepoMan options: --include-arches="arm", signed Manifest commit with key 072AD062)
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 82f556133993..1c40edeb60e9 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.797 2014/10/08 08:04:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.798 2014/10/11 13:09:41 maekke Exp $ + + 11 Oct 2014; Markus Meier <maekke@gentoo.org> ffmpeg-1.2.6-r1.ebuild: + arm stable, bug #512012 *ffmpeg-1.2.9 (08 Oct 2014) diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild index 724b1b2eb3d2..0094b7004aca 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.13 2014/09/15 08:23:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.14 2014/10/11 13:09:41 maekke 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 |