diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-2.2.2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 8d9b55c8e10b..389f186efb7b 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.734 2014/05/15 17:11:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.735 2014/05/19 20:23:51 jer Exp $ + + 19 May 2014; Jeroen Roovers <jer@gentoo.org> ffmpeg-2.2.2.ebuild: + Marked ~hppa (bug #510340). 15 May 2014; Ulrich Müller <ulm@gentoo.org> ffmpeg-0.10.12.ebuild, ffmpeg-1.0.8.ebuild, ffmpeg-1.0.9.ebuild, ffmpeg-1.2.6.ebuild, diff --git a/media-video/ffmpeg/ffmpeg-2.2.2.ebuild b/media-video/ffmpeg/ffmpeg-2.2.2.ebuild index de9fe22a88b5..d45a3df6e4fe 100644 --- a/media-video/ffmpeg/ffmpeg-2.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.2.2.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-2.2.2.ebuild,v 1.3 2014/05/15 17:11:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.2.ebuild,v 1.4 2014/05/19 20:23:51 jer 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="~amd64 ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~amd64 ~hppa ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt |