summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/ffmpeg/ChangeLog6
-rw-r--r--virtual/ffmpeg/ffmpeg-0.10.3.ebuild8
2 files changed, 8 insertions, 6 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index f7679d880133..9c2d36bf0d90 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.42 2012/06/11 11:26:00 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.43 2012/07/02 17:05:25 zerochaos Exp $
+
+ 02 Jul 2012; Rick Farina <zerochaos@gentoo.org> ffmpeg-0.10.3.ebuild:
+ added speex and gsm use flags per bug #424327
11 Jun 2012; Benda Xu <heroxbd@gentoo.org> ffmpeg-0.10.3.ebuild:
keyword ~x86-linux
@@ -164,4 +167,3 @@
all useflags that are in use over main tree now. Also they are separated by
version so each package can depend on =virtual-version if there is some api
incompatibility.
-
diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
index a003719c140f..a07e67c7b957 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.6 2012/06/11 11:26:00 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.7 2012/07/02 17:05:25 zerochaos Exp $
EAPI=4
@@ -11,12 +11,12 @@ SRC_URI=""
LICENSE=""
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
+IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264"
RDEPEND="
|| (
- >=media-video/ffmpeg-0.10.3[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
- >=media-video/libav-0.8.2-r2[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+ >=media-video/ffmpeg-0.10.3[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+ >=media-video/libav-0.8.2-r2[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
)
"
DEPEND=""