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
commit67cc225fc2a52fce8f1dd190d8b76f70d2e46e18 (patch)
tree2b788c3f54fae06b2d61ef68e9395d31e2e5835b
parentDisable modpython by default, add python module directory (#358359). Remove ... (diff)
downloadhistorical-67cc225fc2a52fce8f1dd190d8b76f70d2e46e18.tar.gz
historical-67cc225fc2a52fce8f1dd190d8b76f70d2e46e18.tar.bz2
historical-67cc225fc2a52fce8f1dd190d8b76f70d2e46e18.zip
virtual/ffmpeg: Add use flag jpeg2k
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/Manifest14
-rw-r--r--virtual/ffmpeg/ffmpeg-0.6.90.ebuild8
3 files changed, 10 insertions, 17 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/Manifest b/virtual/ffmpeg/Manifest
index b261dea6908e..e75ac8f604e9 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
EBUILD ffmpeg-0.6-r1.ebuild 654 RMD160 8c376598e0b5b75507a130a1837893d1ecf2efd2 SHA1 9a491f53969693edd3c47a3c9377de1362fbe4a1 SHA256 0829565f40df363e2f13de3406d40098332ebd1bb70c49c2d128532a02fdee6c
-EBUILD ffmpeg-0.6.90.ebuild 680 RMD160 e51f9bb96b0c93881b07561de6f1ff7704c4be3f SHA1 37f7a8ddadb0ca5c36045c296934c9c898c6ff88 SHA256 746022e3f83fd03c7af1dfda5b0328ca032cdd239b967ffbb5927cd0e99cdecc
-MISC ChangeLog 2530 RMD160 1564a7ab274d002685d05129b751ef4043ca9755 SHA1 b056653caf0fa7bce0035353043563c2b5939c09 SHA256 90b280326a3c41e741213ddf05971b4a013add435507b8f92ae100f8b5e99da1
+EBUILD ffmpeg-0.6.90.ebuild 700 RMD160 43f7f7525725d3103961f5ffcdc185208da8bf14 SHA1 53268d33554c6590563fdf893f8080f161ee88ba SHA256 65e718da33409ecd3a007e1a0b93e61950ffb8b759d5a364ce10f2b54d98c939
+MISC ChangeLog 2653 RMD160 eeb361432d703f612dd8185274d0397aeb50631e SHA1 93dc49f55405dc60c5a2cb590504f5fda20adcd1 SHA256 602aaceeefdeb5ca2920054aefc977a153f2f0bb35af237f8e4fdae743f3019a
MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2lnGMACgkQvFcC4BYPU0qCkQCfXC2V0/0Mw9jvh+7p2JMnSFKG
-mKMAoKLUnnEaCIXFUxpLZBY8cmGCZhm8
-=q42W
------END PGP SIGNATURE-----
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=""