summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-06-18 06:50:47 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-06-18 06:50:47 +0000
commit3a887c29cc14cb5265676a2272a319dd91422054 (patch)
tree5b809d199b5620271c9a4130f3aa8dea32fc2c8d /media-video
parentSort IUSE and make zlib enabled by default, by Nikoli <nikoli@lavabit.com>, b... (diff)
downloadhistorical-3a887c29cc14cb5265676a2272a319dd91422054.tar.gz
historical-3a887c29cc14cb5265676a2272a319dd91422054.tar.bz2
historical-3a887c29cc14cb5265676a2272a319dd91422054.zip
sort depend by useflag, patch by Nikoli <nikoli@lavabit.com>, bug #324453
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/Manifest8
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild9
2 files changed, 9 insertions, 8 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ff238d0cc1a5..bf1eda8eaa84 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,13 +7,13 @@ DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a
EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
EBUILD ffmpeg-0.6.ebuild 7808 RMD160 0b39b664e9bb620b87865541b4e3c698c86da286 SHA1 7723509cc581138f302be0ca4409327bf35c3aa2 SHA256 c9ae2bc6a3b87cf761e7a7503674f642bebd8394e0e4effd3ffc895bd04e563f
-EBUILD ffmpeg-9999-r1.ebuild 7851 RMD160 0f8cb1cd359bc95967012e6f563873b0621ede11 SHA1 75e08f4da86587e58ecff8855c9e3859543f58cf SHA256 1cb8ee6d6ef52edad88c07f6ced70f2597b60cc5e48a28348fa3733c7b0e04e4
+EBUILD ffmpeg-9999-r1.ebuild 7852 RMD160 ad55ebbed7ab940b91daf897e7d1ebcdee70e4a0 SHA1 c8921d84e419f96e03f67eb5d2ee707666b649e1 SHA256 cbce8d2822827e15829b9a1d40206b8a3fa472bb3deccc09b84988c45da1ed71
MISC ChangeLog 53566 RMD160 bf3bbe8093e793e907513b568359ed26bcdd4038 SHA1 756ba2a242f78853706236fcefd9467cf15b89ad SHA256 e78f2743e3c05110460cf9b5da3f008265e2995d329153cbcd1e1063053524dd
MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkwbFn4ACgkQvFcC4BYPU0rafwCgrfqM/O/sSXY7B99hIbGnxEiP
-9VwAn1S3wklaZajvm/KYQnZMwnwhLeCD
-=XGnv
+iEYEARECAAYFAkwbF04ACgkQvFcC4BYPU0rRjQCeJEljWK2r0trDxmWJ/i3NL04D
+PjMAoJlSXMvKkhibPBdVnNbWT0h7tWvN
+=9bAy
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 7ab3891596e8..a779907adfca 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.40 2010/06/18 06:47:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.41 2010/06/18 06:50:47 aballier Exp $
EAPI="2"
@@ -72,13 +72,14 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
DEPEND="${RDEPEND}
>=sys-devel/make-3.81
dirac? ( dev-util/pkgconfig )
+ doc? ( app-text/texi2html )
+ mmx? ( dev-lang/yasm )
rtmp? ( dev-util/pkgconfig )
schroedinger? ( dev-util/pkgconfig )
- mmx? ( dev-lang/yasm )
- doc? ( app-text/texi2html )
test? ( net-misc/wget )
v4l? ( sys-kernel/linux-headers )
- v4l2? ( sys-kernel/linux-headers )"
+ v4l2? ( sys-kernel/linux-headers )
+"
src_prepare() {
if [[ ${PV} = *9999* ]]; then