diff options
| author |   Markus Meier <maekke@gentoo.org> | 2014-05-07 17:59:59 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2014-05-07 17:59:59 +0000 |
| commit | 5fcb980bdb0c63f26a495580470427fe5da70b3e (patch) | |
| tree | ebd08037aaab10dd6fb5f1a99976c546c80333d3 /media-video | |
| parent | Remove KDE SC 4.12.3 (diff) | |
| download | gentoo-2-5fcb980bdb0c63f26a495580470427fe5da70b3e.tar.gz gentoo-2-5fcb980bdb0c63f26a495580470427fe5da70b3e.tar.bz2 gentoo-2-5fcb980bdb0c63f26a495580470427fe5da70b3e.zip | |
arm stable, bug #508372
(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --include-arches="arm", signed Manifest commit with key 072AD062)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-1.2.6.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index e6e8e3c6977c..2d48dad82a78 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.730 2014/05/05 06:12:31 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.731 2014/05/07 17:59:59 maekke Exp $ + + 07 May 2014; Markus Meier <maekke@gentoo.org> ffmpeg-1.2.6.ebuild: + arm stable, bug #508372 *ffmpeg-2.2.2 (05 May 2014) diff --git a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6.ebuild index fa44d81e8444..e6d02ff014f9 100644 --- a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.2.6.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.ebuild,v 1.3 2014/04/26 17:26:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.4 2014/05/07 17:59:59 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="~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~amd64 arm hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr bindist bluray +bzip2 cdio celt |