summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2013-12-06 17:09:05 +0000
committerMarkus Meier <maekke@gentoo.org>2013-12-06 17:09:05 +0000
commitedbcb178cda86911b8c81bf9d324b91efc5ab5bc (patch)
tree7d60f4ed53f02f506f4f374fa23e8bfdf013afdd /media-video
parentpackage.use.mask media-video/vlc[chromaprint,opencv], bug #489436 (diff)
downloadgentoo-2-edbcb178cda86911b8c81bf9d324b91efc5ab5bc.tar.gz
gentoo-2-edbcb178cda86911b8c81bf9d324b91efc5ab5bc.tar.bz2
gentoo-2-edbcb178cda86911b8c81bf9d324b91efc5ab5bc.zip
arm stable, bug #492252
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --include-arches="arm", signed Manifest commit with key 072AD062)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-1.0.8.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index caa8be7d6153..8a3b7748b7b5 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.693 2013/11/26 20:16:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.694 2013/12/06 17:09:05 maekke Exp $
+
+ 06 Dec 2013; Markus Meier <maekke@gentoo.org> ffmpeg-1.0.8.ebuild:
+ arm stable, bug #492252
26 Nov 2013; Jeroen Roovers <jer@gentoo.org> ffmpeg-1.0.8.ebuild:
Stable for HPPA (bug #492252).
diff --git a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
index 8ca24d0c16e8..58597a5e4251 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.3 2013/11/26 20:16:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.4 2013/12/06 17:09:05 maekke 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