summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2011-05-06 23:36:44 +0000
committerSebastian Pipping <sping@gentoo.org>2011-05-06 23:36:44 +0000
commit31cfa590356ba9788c0ee67fa41e6397e82685ba (patch)
treee4c6cf843a2547ea302f3c17025ff5b53dc435b4 /virtual/ffmpeg
parentDisable modpython by default, add python module directory (#358359). Remove ... (diff)
downloadgentoo-2-31cfa590356ba9788c0ee67fa41e6397e82685ba.tar.gz
gentoo-2-31cfa590356ba9788c0ee67fa41e6397e82685ba.tar.bz2
gentoo-2-31cfa590356ba9788c0ee67fa41e6397e82685ba.zip
virtual/ffmpeg: Add use flag jpeg2k
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'virtual/ffmpeg')
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/ffmpeg-0.6.90.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 12a2f115bce4..aa601f777ef7 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.11 2011/04/13 12:51:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.12 2011/05/06 23:36:44 sping Exp $
+
+ 06 May 2011; Sebastian Pipping <sping@gentoo.org> ffmpeg-0.6.90.ebuild:
+ Expose use flag jpeg2k for upcoming Blender 2.57
13 Apr 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.6.90.ebuild:
bump a little the ffmpeg revision required to get in the bugfixes/additions
diff --git a/virtual/ffmpeg/ffmpeg-0.6.90.ebuild b/virtual/ffmpeg/ffmpeg-0.6.90.ebuild
index 0164d1aa631b..c32f31bab680 100644
--- a/virtual/ffmpeg/ffmpeg-0.6.90.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.6.90.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.6.90.ebuild,v 1.2 2011/04/13 12:51:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.6.90.ebuild,v 1.3 2011/05/06 23:36:44 sping Exp $
EAPI=4
@@ -11,12 +11,12 @@ SRC_URI=""
LICENSE=""
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X +encode mp3 sdl theora threads vaapi vdpau x264"
+IUSE="X +encode jpeg2k mp3 sdl theora threads vaapi vdpau x264"
RDEPEND="
|| (
- >=media-video/ffmpeg-0.6.90_rc0-r2[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
- >=media-video/libav-0.6.90_rc[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
+ >=media-video/ffmpeg-0.6.90_rc0-r2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
+ >=media-video/libav-0.6.90_rc[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
)
"
DEPEND=""