diff options
| author |   Agostino Sarubbo <ago@gentoo.org> | 2014-09-15 08:23:19 +0000 |
|---|---|---|
| committer | Agostino Sarubbo <ago@gentoo.org> | 2014-09-15 08:23:19 +0000 |
| commit | fe71750437e1bd13b468960f252452e32d19c252 (patch) | |
| tree | 75dc71e278671ac2fe3caf69763834449def49f6 /media-video | |
| parent | Stable for sparc, wrt bug #512012 (diff) | |
| download | gentoo-2-fe71750437e1bd13b468960f252452e32d19c252.tar.gz gentoo-2-fe71750437e1bd13b468960f252452e32d19c252.tar.bz2 gentoo-2-fe71750437e1bd13b468960f252452e32d19c252.zip | |
Stable for sparc, 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')
| -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 1923520ab724..7623069b7093 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.790 2014/08/29 19:50:07 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.791 2014/09/15 08:23:19 ago Exp $ + + 15 Sep 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild: + Stable for sparc, wrt bug #512012 29 Aug 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.7.ebuild, ffmpeg-2.3.3.ebuild, ffmpeg-9999.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild index 770378f74c8d..724b1b2eb3d2 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.12 2014/08/25 11:02:41 ago Exp $ +# $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 $ 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 |