diff options
| author |   Jack Morgan <jmorgan@gentoo.org> | 2015-05-30 00:03:19 +0000 |
|---|---|---|
| committer | Jack Morgan <jmorgan@gentoo.org> | 2015-05-30 00:03:19 +0000 |
| commit | c603762c627b8179b7580866862a3393eeb3ecf4 (patch) | |
| tree | be7b82de896ca1f5f2ae6e84bdbe0cb959e8b438 /media-video/ffmpeg | |
| parent | Cleanup old (diff) | |
| download | gentoo-2-c603762c627b8179b7580866862a3393eeb3ecf4.tar.gz gentoo-2-c603762c627b8179b7580866862a3393eeb3ecf4.tar.bz2 gentoo-2-c603762c627b8179b7580866862a3393eeb3ecf4.zip | |
ia64 stable wrt bug #538798
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="ia64", signed Manifest commit with key )
Diffstat (limited to 'media-video/ffmpeg')
| -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 5e07fe60d1c8..3d5ecb651c2c 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.861 2015/05/29 09:45:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.862 2015/05/30 00:03:19 jmorgan Exp $ + + 30 May 2015; Jack Morgan <jmorgan@gentoo.org> ffmpeg-2.2.14.ebuild: + ia64 stable wrt bug #538798 29 May 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.14.ebuild, ffmpeg-2.2.15.ebuild, ffmpeg-2.6.3.ebuild, ffmpeg-9999.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild index 1835df9e2ded..ef321b9b8176 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.8 2015/05/29 09:45:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.9 2015/05/30 00:03:19 jmorgan 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 |