diff options
author | Agostino Sarubbo <ago@gentoo.org> | 2014-08-21 10:45:06 +0000 |
---|---|---|
committer | Agostino Sarubbo <ago@gentoo.org> | 2014-08-21 10:45:06 +0000 |
commit | 34bd46967f5cee814d4dc04b062cbe18babf8b5e (patch) | |
tree | 29b587b2e25f0d9ca0bd2db2713c07680cba6f72 /media-video | |
parent | Stable for ppc64, wrt bug #512012 (diff) | |
download | gentoo-2-34bd46967f5cee814d4dc04b062cbe18babf8b5e.tar.gz gentoo-2-34bd46967f5cee814d4dc04b062cbe18babf8b5e.tar.bz2 gentoo-2-34bd46967f5cee814d4dc04b062cbe18babf8b5e.zip |
Stable for ppc64, 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 fcf08d4b0689..4827cf476ba5 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.780 2014/08/13 18:37:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.781 2014/08/21 10:45:06 ago Exp $ + + 21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild: + Stable for ppc64, wrt bug #512012 *ffmpeg-0.10.15 (13 Aug 2014) diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild index 1e84110c108e..30dcbb1605a7 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.9 2014/08/10 20:58:53 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.10 2014/08/21 10:45:06 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 |