diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-03 10:37:23 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-03 10:37:23 +0000 |
| commit | efe18fa0b22789308ef12107724f48e05b5d3de8 (patch) | |
| tree | ff310c2f5259be845980baa549d3a69b4088b73b | |
| parent | Version bump: link against OOBS_LIBS so strict linking works, store OobsUser'... (diff) | |
| download | gentoo-2-efe18fa0b22789308ef12107724f48e05b5d3de8.tar.gz gentoo-2-efe18fa0b22789308ef12107724f48e05b5d3de8.tar.bz2 gentoo-2-efe18fa0b22789308ef12107724f48e05b5d3de8.zip | |
Preffer ffmpeg over libav so user dont get confusing msg during unsattisfied useflags. (they will when we switch to libav anyway but it does not matter.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force)
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 9 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.6-r1.ebuild (renamed from virtual/ffmpeg/ffmpeg-0.6.ebuild) | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog index a0403df100c1..60cbaad6957e 100644 --- a/virtual/ffmpeg/ChangeLog +++ b/virtual/ffmpeg/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for virtual/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.7 2011/03/31 15:25:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.8 2011/04/03 10:37:23 scarabeus Exp $ + +*ffmpeg-0.6-r1 (03 Apr 2011) + + 03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -ffmpeg-0.6.ebuild, + +ffmpeg-0.6-r1.ebuild: + Preffer ffmpeg over libav so user dont get confusing msg during unsattisfied + useflags. (they will when we switch to libav anyway but it does not matter. 31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -ffmpeg-0.5.ebuild: Just drop 0.5 ffmpeg, things are easier without it now. Only thing so far diff --git a/virtual/ffmpeg/ffmpeg-0.6.ebuild b/virtual/ffmpeg/ffmpeg-0.6-r1.ebuild index 9d5153743fb1..90b4c6223cff 100644 --- a/virtual/ffmpeg/ffmpeg-0.6.ebuild +++ b/virtual/ffmpeg/ffmpeg-0.6-r1.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.ebuild,v 1.4 2011/03/31 14:39:01 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.6-r1.ebuild,v 1.1 2011/04/03 10:37:23 scarabeus Exp $ EAPI=4 @@ -15,8 +15,8 @@ IUSE="X +encode mp3 sdl theora threads vaapi vdpau x264" RDEPEND=" || ( - >=media-video/libav-0.6[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=] >=media-video/ffmpeg-0.6[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=] + >=media-video/libav-0.6[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=] ) " DEPEND="" |