summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-05-17 20:45:11 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-05-17 20:45:11 +0000
commit1bb1de66fd5723f152bd26a696587caaba58f6c6 (patch)
tree24be081b41509a3e76c2558b731e1de0e76b7f5b
parentwhitespace (diff)
downloadhistorical-1bb1de66fd5723f152bd26a696587caaba58f6c6.tar.gz
historical-1bb1de66fd5723f152bd26a696587caaba58f6c6.tar.bz2
historical-1bb1de66fd5723f152bd26a696587caaba58f6c6.zip
ffmpeg provides libpostproc
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/Manifest22
-rw-r--r--virtual/ffmpeg/ffmpeg-0.10.3.ebuild9
3 files changed, 16 insertions, 20 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index ff907ab06bb4..14830daf86c1 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.34 2012/05/17 13:57:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.35 2012/05/17 20:45:11 aballier Exp $
+
+ 17 May 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.3.ebuild:
+ ffmpeg provides libpostproc
*ffmpeg-0.10.3 (17 May 2012)
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index f2070befdb1c..323653643534 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -2,23 +2,13 @@
Hash: SHA1
EBUILD ffmpeg-0.10.2-r1.ebuild 728 RMD160 5e024d535c346830aa13c367676bffa82c9d5a39 SHA1 2c562b06081d7888527e95a3c6ce4b8a62065477 SHA256 724f78e1fcf425acdb626efb6dab8b90641fe2e67683c03bff3c5404b1d18a47
-EBUILD ffmpeg-0.10.3.ebuild 764 RMD160 ca3ff1ab892e50c7386758d493eeaebc169789a4 SHA1 50ee5503390da73670034b1e0773d23e2a33fba6 SHA256 393b83d660a14c1740a1e2449a2a7194722014cd109f9f644b607045fadb36b9
-MISC ChangeLog 5565 RMD160 5d9f742cb60d1451b620c8a6935688037b455789 SHA1 7ed04088220434de3f9b42e4765a5cef0f2660c8 SHA256 e1d93867b93608f0de012fc103079040b5e4ca55398da0b561336cb43433375f
+EBUILD ffmpeg-0.10.3.ebuild 800 RMD160 4a1f0f198dafb9fd827fc5a64c7233d71bc3cdc9 SHA1 dee225298f1bb13dd99ac7b821ce3a4840c72ad5 SHA256 570cc782f09d1fe6f848793076ac09fbaac7af27f71f9c2050059b3b28422695
+MISC ChangeLog 5669 RMD160 574602c151fc3ed1b87f9acd0f11a07a81cb808c SHA1 bc6400d1166048de2c2187beacf78a5b2dea7c1c SHA256 ad89669b59d9642d653646bffdd7e6a094b16d75c1ec184187256a463bd48f1f
MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPtQPZAAoJEOSiRoyO7jvofU8P/39kcNWSKdQzj++3rucOvbXR
-7KEiX0mVwqLUF22Xs8bk8OgTcUrF98eiJRLjlztje8Zbo9kZo0yVoIsCbriw0ZqC
-6dcsd5IEz6/wNuUtJwsnA2kri+T88R0P38WVrl2dGj/bWTuAxZnC0+06CNx1CEhP
-uRT5Caaod4lFwhakqyOmyOBnC+ZkC2bA6Jf9oWDyBBTZAd0qd5Q+mNJ9joTc7kZW
-1XZjTbn3fznYtsJh/CFjDMqthOeROMNkhU9HuVjrblrTpajgtgA5Ob+walO3hdIS
-Yu6kDbW3ljDykXMDhs/khxVP926XTEWsW3WNrHG2Yb6IZ6YO5+L9MUCl7vt6bOtO
-YMlXdEtNeZT1Wk+1pQnjIoLR0QiUv2JtoUkXogqY4Mym5JPU9jeS3T1Uru275KPT
-3FdtSQX6cOtq2DBuXTfDSb8TSa8zpnOHRJmXChgz8tLx+usrctQi58xBt7E3QAka
-XBVUOJck0DrgmPiFiuZbvTk9xvnGbJeIIKfNvIRbaIjeJgWoTE2pOLUiGEjNiEk+
-UV9KgVP+UJT1k9useMP/K37An/Ahvcd7VA/F50Q08akc91Qgykbygn/CpLMCxgb3
-v0gjX7MU8qnMlPOPKc2SYMzPRw3fmmAe++ScuQa5STYMG/yyesTChB6wLcnjL6i4
-e4MFmiutA4R5LQIr0v8O
-=rwxf
+iEYEARECAAYFAk+1Y10ACgkQvFcC4BYPU0rZhgCbBP9Vhy5hztDXm95C1DhTkBWU
+eXIAoIqtxLUa7QNBU0f3iM5So9HSiy0R
+=BUSe
-----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
index 9a72ed32ebd5..8d80c23fa581 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.1 2012/05/17 13:57:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.2 2012/05/17 20:45:11 aballier Exp $
EAPI=4
@@ -15,9 +15,12 @@ IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
RDEPEND="
|| (
- >=media-video/ffmpeg-0.10.3-r1[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+ >=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-libs/libpostproc
+ || (
+ >=media-video/ffmpeg-0.10.3
+ media-libs/libpostproc
+ )
"
DEPEND=""