summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Morgan <jmorgan@gentoo.org>2015-05-29 07:37:45 +0000
committerJack Morgan <jmorgan@gentoo.org>2015-05-29 07:37:45 +0000
commita2b1cbf2f42953a21d77fb1d2159130978c46ff8 (patch)
tree9ed9c1e940d4399c4b06a55f7f9fd4893d92b2cd /media-video
parentVersion bump. Removed old (diff)
downloadgentoo-2-a2b1cbf2f42953a21d77fb1d2159130978c46ff8.tar.gz
gentoo-2-a2b1cbf2f42953a21d77fb1d2159130978c46ff8.tar.bz2
gentoo-2-a2b1cbf2f42953a21d77fb1d2159130978c46ff8.zip
sparc stable wrt bug #538798
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="sparc", signed Manifest commit with key )
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 9b6dec94c9c6..34342d93e1f9 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.858 2015/05/19 09:24:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.859 2015/05/29 07:37:45 jmorgan Exp $
+
+ 29 May 2015; Jack Morgan <jmorgan@gentoo.org> ffmpeg-2.2.14.ebuild:
+ sparc stable wrt bug #538798
19 May 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
bump x265 dep
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index 046ff8371cac..5229921cc491 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.6 2015/05/15 07:50:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.7 2015/05/29 07:37:45 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