diff options
| author |   Agostino Sarubbo <ago@gentoo.org> | 2014-08-25 11:02:41 +0000 |
|---|---|---|
| committer | Agostino Sarubbo <ago@gentoo.org> | 2014-08-25 11:02:41 +0000 |
| commit | 484645662fc2b12f2fe2013c284cfbed9f91d77d (patch) | |
| tree | 67f3fb8594db12063fe213e3eaba70c409f9a877 /media-video/ffmpeg | |
| parent | Stable for alpha, wrt bug #512012 (diff) | |
| download | gentoo-2-484645662fc2b12f2fe2013c284cfbed9f91d77d.tar.gz gentoo-2-484645662fc2b12f2fe2013c284cfbed9f91d77d.tar.bz2 gentoo-2-484645662fc2b12f2fe2013c284cfbed9f91d77d.zip | |
Stable for alpha, wrt bug #512012
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F)
Diffstat (limited to 'media-video/ffmpeg')
| -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 89b897ac1add..ee95c4470bc4 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.782 2014/08/23 15:33:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.783 2014/08/25 11:02:41 ago Exp $ + + 25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild: + Stable for alpha, wrt bug #512012 23 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild: Stable for ia64, wrt bug #512012 diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild index 251e471dead2..770378f74c8d 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.11 2014/08/23 15:33:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.12 2014/08/25 11:02:41 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 |