diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 20:56:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 20:56:09 +0000 |
| commit | 570860e9c269e6955739732da648e06b296ef0e5 (patch) | |
| tree | 776af84bf2965c9006c2c7c6ff1a4bc190d18c5d /virtual/ffmpeg | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | historical-570860e9c269e6955739732da648e06b296ef0e5.tar.gz historical-570860e9c269e6955739732da648e06b296ef0e5.tar.bz2 historical-570860e9c269e6955739732da648e06b296ef0e5.zip | |
Change >=media-video/libav-0.8.2 to <=media-video/libav-0.8.2 for ensuring stable users will have postproc as required by media-libs/xine-lib wrt #416407. Alternative is to force media-video/ffmpeg in media-libs/xine-lib again.
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'virtual/ffmpeg')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | virtual/ffmpeg/Manifest | 14 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | 4 |
3 files changed, 18 insertions, 8 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index 14830daf86c1..966c8ba72389 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.35 2012/05/17 20:45:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.36 2012/05/17 20:56:09 ssuominen Exp $ + + 17 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild: + Change >=media-video/libav-0.8.2 to <=media-video/libav-0.8.2 for ensuring + stable users will have postproc as required by media-libs/xine-lib wrt + #416407. Alternative is to force media-video/ffmpeg in media-libs/xine-lib + again. 17 May 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.3.ebuild: ffmpeg provides libpostproc diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest index 323653643534..d2520942e97a 100644 --- a/virtual/ffmpeg/Manifest +++ b/virtual/ffmpeg/Manifest @@ -1,14 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD ffmpeg-0.10.2-r1.ebuild 728 RMD160 5e024d535c346830aa13c367676bffa82c9d5a39 SHA1 2c562b06081d7888527e95a3c6ce4b8a62065477 SHA256 724f78e1fcf425acdb626efb6dab8b90641fe2e67683c03bff3c5404b1d18a47 +EBUILD ffmpeg-0.10.2-r1.ebuild 728 RMD160 e485618fd5ec8843e36f554adcc457f5f4841f82 SHA1 2d0a7df889bbeb7bf3b0f25687d273a891e6b6d4 SHA256 41ab8c639c825032d7ecd5a9d0d610e6d018a6394693635aaa76ac1efaed62ac EBUILD ffmpeg-0.10.3.ebuild 800 RMD160 4a1f0f198dafb9fd827fc5a64c7233d71bc3cdc9 SHA1 dee225298f1bb13dd99ac7b821ce3a4840c72ad5 SHA256 570cc782f09d1fe6f848793076ac09fbaac7af27f71f9c2050059b3b28422695 -MISC ChangeLog 5669 RMD160 574602c151fc3ed1b87f9acd0f11a07a81cb808c SHA1 bc6400d1166048de2c2187beacf78a5b2dea7c1c SHA256 ad89669b59d9642d653646bffdd7e6a094b16d75c1ec184187256a463bd48f1f +MISC ChangeLog 5986 RMD160 cd5a3dad435ecb04e50ba632f76d6c12b6467844 SHA1 ace4523d22b88ad85c506c96624772f37a0f429e SHA256 2537217eb1d5d23ab6434f47a3f542663deec9609c883ad35ef00fa7a376edfe MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk+1Y10ACgkQvFcC4BYPU0rZhgCbBP9Vhy5hztDXm95C1DhTkBWU -eXIAoIqtxLUa7QNBU0f3iM5So9HSiy0R -=BUSe +iQEcBAEBAgAGBQJPtWXmAAoJEEdUh39IaPFN488H/38IQiEXwDhRDH5K7EEldnG/ +AaiQbIGuScsFCOF9kMn3P+2kaQH8pSZPGNZp7wNAvXpW1k5UY3VDVzGovzRQNFWd +NqCH8VabXQjRzCiDsi4huRGtHbOym0PQgTMNsfSGWtEq8WfmrgERlBF1w/TpTP7L +zCo9fsc8e2Lv8jvZE24ADAVk8x93yCmk8C/yA30sCBJd8CN9HehqPt6h9t5k4cSv +OvZOsP+1zUGf0OGWsKfH5DFz+L+BTqVa/VVJxYTGbqlgE2vO4SkyL+cheNIHqDVu +irmJLdV4EH/xffg2O9TVXT4bbRczreQkYOqi1UhU0Mip7diJbkMdcUN+06fhfoo= +=bNap -----END PGP SIGNATURE----- diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild index 2dfd393cf70c..8dc5160d5af4 100644 --- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild +++ b/virtual/ffmpeg/ffmpeg-0.10.2-r1.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.2-r1.ebuild,v 1.7 2012/05/16 13:04:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.8 2012/05/17 20:56:09 ssuominen Exp $ EAPI=4 @@ -16,7 +16,7 @@ IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264" RDEPEND=" || ( >=media-video/ffmpeg-0.10.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] - >=media-video/libav-0.8.1[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] + <=media-video/libav-0.8.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] ) " DEPEND="" |