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 | 0a4d9c10b42ad8903b235e3b58cb42c27ad5425a (patch) | |
| tree | bb2f3903f89a50d301de4cedb10618ab6b968e2e /virtual/ffmpeg | |
| parent | Version bump: link against OOBS_LIBS so strict linking works, store OobsUser'... (diff) | |
| download | historical-0a4d9c10b42ad8903b235e3b58cb42c27ad5425a.tar.gz historical-0a4d9c10b42ad8903b235e3b58cb42c27ad5425a.tar.bz2 historical-0a4d9c10b42ad8903b235e3b58cb42c27ad5425a.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.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
RepoMan-Options: --force
Diffstat (limited to 'virtual/ffmpeg')
| -rw-r--r-- | virtual/ffmpeg/ChangeLog | 9 | ||||
| -rw-r--r-- | virtual/ffmpeg/Manifest | 10 | ||||
| -rw-r--r-- | virtual/ffmpeg/ffmpeg-0.6-r1.ebuild (renamed from virtual/ffmpeg/ffmpeg-0.6.ebuild) | 4 |
3 files changed, 15 insertions, 8 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/Manifest b/virtual/ffmpeg/Manifest index 3d02f132c08d..8b61a06f6ea9 100644 --- a/virtual/ffmpeg/Manifest +++ b/virtual/ffmpeg/Manifest @@ -1,13 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD ffmpeg-0.6.ebuild 654 RMD160 d6052d8f919858de66e64b887ccb96378fe363bc SHA1 c9b44addf81f19e4a5e7e3ecf39dd7a23e6650f3 SHA256 666d6563c354ded23bc4beadbc3c8b0eaa624cd78c5fa0b08b5f8121c012a00e -MISC ChangeLog 1784 RMD160 9bdd02079faa2866b6dd456080d9df2e8aca410d SHA1 e03ac4f6a1e90d345ab826343ff6e69d8407fd1c SHA256 be47c3114cd2b77e2d60edb08ab535d6b02116eae8c23ad76986a5c9958fb569 +EBUILD ffmpeg-0.6-r1.ebuild 657 RMD160 b887bbd1559fd9b5f206bc809f02fc3a5729d39c SHA1 fc05f93f89f70db2026ef14c6e19aa433967d970 SHA256 0fd3253d5c121a494274729e36f819355c0cdc731b8a23f41c61cfaa97e77a37 +MISC ChangeLog 2072 RMD160 114eb6babb72c7f5a84374248e7cf7a9c13b255b SHA1 b9cfdd5f16cdf18d73315853e2f8440679570dcf SHA256 b9ad81dc1ca106f1e955e63adfe4affc5163366c349ccaacdd08e38a902a22ac MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2UnHUACgkQHB6c3gNBRYebAACgzcL3zUjtlrYH5H26CMI8xvar -je4AoMcsLCZo778B6dfvrUiVguIFcisK -=8OCn +iEYEARECAAYFAk2YTekACgkQHB6c3gNBRYcrhwCfWQhBz4eU5swMzBclrJYSx8YN +41wAn3rm1HuNV8k0z2gHLmMRRREtt+4V +=m3qP -----END PGP SIGNATURE----- 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="" |