diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 21:09:24 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-17 21:09:24 +0000 |
| commit | 421863feeff7202cfea91f0ef654b81503058df7 (patch) | |
| tree | 261a71c20e17d475704281e6f4c433c8417ff522 /virtual | |
| parent | Version bump (diff) | |
| download | historical-421863feeff7202cfea91f0ef654b81503058df7.tar.gz historical-421863feeff7202cfea91f0ef654b81503058df7.tar.bz2 historical-421863feeff7202cfea91f0ef654b81503058df7.zip | |
Fix last change differently.
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | virtual/ffmpeg/Manifest | 18 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | 9 |
3 files changed, 19 insertions, 16 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index 966c8ba72389..7c2802befb3f 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,12 +1,10 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.36 2012/05/17 20:56:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.37 2012/05/17 21:09:24 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. + || ( ) block for allowing media/video/ffmpeg, media-libs/libpostproc and + <=media-video/libav-0.8.2 as providers for getting postproc wrt #416407 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 d2520942e97a..18b175f02d64 100644 --- a/virtual/ffmpeg/Manifest +++ b/virtual/ffmpeg/Manifest @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD ffmpeg-0.10.2-r1.ebuild 728 RMD160 e485618fd5ec8843e36f554adcc457f5f4841f82 SHA1 2d0a7df889bbeb7bf3b0f25687d273a891e6b6d4 SHA256 41ab8c639c825032d7ecd5a9d0d610e6d018a6394693635aaa76ac1efaed62ac +EBUILD ffmpeg-0.10.2-r1.ebuild 811 RMD160 52e71711a154a36383a19b4cfed078663eef84ff SHA1 691ede892ae85b5425c69b568cc390c4429196bb SHA256 9804b19d46c4bcd277da4e737f9abd2d8de14c2bbd767f71f3dc097232a49939 EBUILD ffmpeg-0.10.3.ebuild 800 RMD160 4a1f0f198dafb9fd827fc5a64c7233d71bc3cdc9 SHA1 dee225298f1bb13dd99ac7b821ce3a4840c72ad5 SHA256 570cc782f09d1fe6f848793076ac09fbaac7af27f71f9c2050059b3b28422695 -MISC ChangeLog 5986 RMD160 cd5a3dad435ecb04e50ba632f76d6c12b6467844 SHA1 ace4523d22b88ad85c506c96624772f37a0f429e SHA256 2537217eb1d5d23ab6434f47a3f542663deec9609c883ad35ef00fa7a376edfe +MISC ChangeLog 5899 RMD160 48fb675facd9a6805c62eb5a21a7ba98b5e0026d SHA1 d47489c5ea35ab712cfa02da88b8a7a59671c467 SHA256 804fcd5dab5abe3faf4a255a503254f27153d759868f77ef40bf535192866e5b MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPtWXmAAoJEEdUh39IaPFN488H/38IQiEXwDhRDH5K7EEldnG/ -AaiQbIGuScsFCOF9kMn3P+2kaQH8pSZPGNZp7wNAvXpW1k5UY3VDVzGovzRQNFWd -NqCH8VabXQjRzCiDsi4huRGtHbOym0PQgTMNsfSGWtEq8WfmrgERlBF1w/TpTP7L -zCo9fsc8e2Lv8jvZE24ADAVk8x93yCmk8C/yA30sCBJd8CN9HehqPt6h9t5k4cSv -OvZOsP+1zUGf0OGWsKfH5DFz+L+BTqVa/VVJxYTGbqlgE2vO4SkyL+cheNIHqDVu -irmJLdV4EH/xffg2O9TVXT4bbRczreQkYOqi1UhU0Mip7diJbkMdcUN+06fhfoo= -=bNap +iQEcBAEBAgAGBQJPtWkCAAoJEEdUh39IaPFNJrUIAIcFhPmvB1Th1LulLlf8kDKM +dQ3gbK8dVTW0c90CRhiPE1kSpBnJOpuhrqiCWjWRo99zW99Hq7olNjNvokfM4yCV +w9G8O6gitA6AI+EcpQ3z65AcZs7EwLa15B7AjHGT4vq7H0guNTAIYaUXFLSUYstM +LztPU90S6lVHrAG1EgElNmY0urwYsnABTJpKr+KPPbeMSvCOxEiBZB3ECYfwyK+n +UX2/mxlQsHpX26KqCiVCHLriMejcxpwd5rY7SDTRuIGeLmp0Yj1QvcCg5pnJsZlZ +Zoa8xxYjsk2prgg4sEZ0jnaANBfVQNqAg+wGvwgSjWIMbthVHtI929l3qvG4b3M= +=Qn84 -----END PGP SIGNATURE----- diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild index 8dc5160d5af4..13999dfc3b61 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.8 2012/05/17 20:56:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.9 2012/05/17 21:09:24 ssuominen Exp $ EAPI=4 @@ -16,7 +16,12 @@ 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.2[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=] + ) + || ( + media-video/ffmpeg + media-libs/libpostproc + <=media-video/libav-0.8.2 ) " DEPEND="" |