summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-04-02 16:24:04 +0000
committerJeroen Roovers <jer@gentoo.org>2015-04-02 16:24:04 +0000
commit763a999e05401b75ff45a0eb4018a3a4f8abb335 (patch)
treefb913640afe49e0b8be7537bb31a0709f20e93bc /media-video
parentStable for HPPA (bug #538798). (diff)
downloadgentoo-2-763a999e05401b75ff45a0eb4018a3a4f8abb335.tar.gz
gentoo-2-763a999e05401b75ff45a0eb4018a3a4f8abb335.tar.bz2
gentoo-2-763a999e05401b75ff45a0eb4018a3a4f8abb335.zip
Stable for HPPA (bug #538798).
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --ignore-arches, signed Manifest commit with key A792A613)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-2.2.14.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 825d9bab749f..5f45ed3eba49 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.849 2015/03/17 08:22:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.850 2015/04/02 16:24:04 jer Exp $
+
+ 02 Apr 2015; Jeroen Roovers <jer@gentoo.org> ffmpeg-2.2.14.ebuild:
+ Stable for HPPA (bug #538798).
17 Mar 2015; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.15.ebuild,
-ffmpeg-2.2.13.ebuild, -ffmpeg-2.5.4.ebuild, -ffmpeg-2.6.ebuild,
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index 977ddc3b8edb..f43a16e1b7b9 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.1 2015/03/16 14:12:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.2 2015/04/02 16:24:04 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="~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