diff options
| author |   Tobias Klausmann <klausman@gentoo.org> | 2015-07-04 13:52:24 +0000 |
|---|---|---|
| committer | Tobias Klausmann <klausman@gentoo.org> | 2015-07-04 13:52:24 +0000 |
| commit | 7ce5807a430ec8317254e452c40f357c9d4ac3e4 (patch) | |
| tree | 74ecc303d5d28b3434072ba8853747724e309568 /media-video | |
| parent | Unmask virtual/perl-Unicode-Collate since we now have a corresponding perl-co... (diff) | |
| download | gentoo-2-7ce5807a430ec8317254e452c40f357c9d4ac3e4.tar.gz gentoo-2-7ce5807a430ec8317254e452c40f357c9d4ac3e4.tar.bz2 gentoo-2-7ce5807a430ec8317254e452c40f357c9d4ac3e4.zip | |
Stable on alpha, bug 538798
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key CE5D54E8)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-2.2.14.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 3f438b3e316b..b294169e79db 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.870 2015/06/28 10:20:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.871 2015/07/04 13:52:24 klausman Exp $ + + 04 Jul 2015; Tobias Klausmann <klausman@gentoo.org> ffmpeg-2.2.14.ebuild: + Stable on alpha, bug 538798 28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> ffmpeg-2.6.3.ebuild: x86 stable wrt bug #547462 diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild index 61baa290f677..f582ad04b9bf 100644 --- a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.10 2015/05/30 10:55:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.11 2015/07/04 13:52:24 klausman Exp $ EAPI="5" @@ -37,7 +37,7 @@ FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" SLOT="0/${FFMPEG_SUBSLOT}" 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 amrenc bluray +bzip2 cdio celt |