diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-18 00:21:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-18 00:21:34 +0000 |
| commit | a65ce6ff9b1a80763d9f188f2a73c531a8a4e7de (patch) | |
| tree | e7021f1fde8e6c00382561892ac75ea727c2eb19 /virtual/ffmpeg | |
| parent | Force recent patch version so devs do not need to worry about inconsistent tr... (diff) | |
| download | gentoo-2-a65ce6ff9b1a80763d9f188f2a73c531a8a4e7de.tar.gz gentoo-2-a65ce6ff9b1a80763d9f188f2a73c531a8a4e7de.tar.bz2 gentoo-2-a65ce6ff9b1a80763d9f188f2a73c531a8a4e7de.zip | |
Revert libpostproc entirely from the virtual wrt http://bugs.gentoo.org/show_bug.cgi?id=416411#c16
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'virtual/ffmpeg')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 7 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild | 7 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.10.3.ebuild | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index d3473501882d..ee067749b842 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.38 2012/05/17 21:12:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.39 2012/05/18 00:21:34 ssuominen Exp $ + + 18 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild, + ffmpeg-0.10.3.ebuild: + Revert libpostproc entirely from the virtual wrt + http://bugs.gentoo.org/show_bug.cgi?id=416411#c16 17 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild: || ( ) block for allowing media-video/ffmpeg, media-libs/libpostproc and diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild index d94543a50b48..914e8ed83f5d 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.10 2012/05/17 21:12:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.11 2012/05/18 00:21:34 ssuominen Exp $ EAPI=4 @@ -18,10 +18,5 @@ 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/ffmpeg-0.10.2 - media-libs/libpostproc - <=media-video/libav-0.8.2 - ) " DEPEND="" diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild index 8d80c23fa581..873adf5e3a4e 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.2 2012/05/17 20:45:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.3 2012/05/18 00:21:34 ssuominen Exp $ EAPI=4 @@ -18,9 +18,5 @@ RDEPEND=" >=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-video/ffmpeg-0.10.3 - media-libs/libpostproc - ) " DEPEND="" |