summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-12 13:40:13 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-12 13:40:13 +0000
commit83ea236beffc980e8c3a5e0664cc3fcd2844e5f3 (patch)
treee6bbc0e5cc6772d3aa4ad13f01456488dd128cd0 /media-video/libav
parentAnd unmask PyFoam, so it can be used with latest openfoam (diff)
downloadhistorical-83ea236beffc980e8c3a5e0664cc3fcd2844e5f3.tar.gz
historical-83ea236beffc980e8c3a5e0664cc3fcd2844e5f3.tar.bz2
historical-83ea236beffc980e8c3a5e0664cc3fcd2844e5f3.zip
Update deps to match latest reality.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'media-video/libav')
-rw-r--r--media-video/libav/ChangeLog5
-rw-r--r--media-video/libav/Manifest12
-rw-r--r--media-video/libav/libav-9999.ebuild7
3 files changed, 14 insertions, 10 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 2ddeeddb89e6..22f7a7b452b3 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/libav
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.10 2011/04/11 13:30:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.11 2011/04/12 13:40:13 scarabeus Exp $
+
+ 12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild:
+ Update deps to match latest reality.
11 Apr 2011; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
libav-9999.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index a4529548dde4..b9c2ea891524 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX 0.6.2-fix_enable_hardcoded_tables.patch 1387 RMD160 3ccd0be1f6612ad45dcd78dee17817cf03bcda87 SHA1 13d1e51c17c25ba9adfb9d878334343746f917e0 SHA256 2e72e53be9df93128fc75ad4adfa9208d31f496c7bb9924c8a2e14ee2cb8d9f6
AUX 0.6.2-float_arrays.patch 1611 RMD160 960188d97261729526187c53a281a03c31a6a95a SHA1 92bb3062933cd9540eb8b05efc6cbebb38e94a0c SHA256 311e255309dfd6a045e38303d80b534aec9444cfe314d0b4d585688075c7dd7d
@@ -8,13 +8,13 @@ DIST libav-0.7_pre20110327.tar.xz 3496216 RMD160 3c7d6e3c05eb18575520d287615229f
EBUILD libav-0.6.2.ebuild 7533 RMD160 1bddb36b6993fffbb60f99720746eb0bef479099 SHA1 f89c1bec58f536e13d040a2ebb352216765e41e3 SHA256 9f4beecf6b25c7d99c34cdc17081002d737bff08f6a62c118db30730d051d594
EBUILD libav-0.6.9999.ebuild 7480 RMD160 bef818254c619c434a5c92eee489ff98153ecbd9 SHA1 a37fa450a9a288e1d90996e8a2ce41abb98e0eff SHA256 38bf1b9cb10b49b50bd805ed404447fd8aef3bad6baaeafaa7dea8a8252ae162
EBUILD libav-0.7_pre20110327.ebuild 7599 RMD160 9a944d8b477ca204c6273c415e0e05d664cb3347 SHA1 7efdc9795b64432c98036856ce0b50c37ba25115 SHA256 142caaad04431a584457b425d232dadecc79e358900e7ca03518c99101c75d67
-EBUILD libav-9999.ebuild 7777 RMD160 cc86737159bba8c80619d14c89519edf9f81d960 SHA1 cac96ff30212ddbc77a5f84f86721ab03d9a9090 SHA256 308b35b5ea41d238006fa44fb47e484f2402c51febb54b03483f0347d6293f23
-MISC ChangeLog 2150 RMD160 0b0d524ba6673e20043d5869172661655efe74fb SHA1 15b32b4190857a18065283ec26b59faa41618eaf SHA256 f891fd60a9d2de09ebfb27f05149507b2fb5652c963b5c28eb42eb50a6124e94
+EBUILD libav-9999.ebuild 7821 RMD160 1ac54f80f6bce1481c5cd92db7afea2c7486d6a3 SHA1 88b38f0311e22bcae58d0a5b7fc52c5265ee7e7e SHA256 e8e3c9b627fd48bafbe7133bed787a042030707ac7f37ea35780f90253e58fe2
+MISC ChangeLog 2266 RMD160 c587b41827ea6089ba7c03fe52daa45fd95e6d3e SHA1 fba5556d727ba30d9c582ac7bb9478f76372c3f1 SHA256 b695b16bfe4c8b20d6c4587e27ac2ac704bd329f67fe6c5c2dd4da89f3688fcb
MISC metadata.xml 2224 RMD160 b31aadc76506beb9d1f3973e463713b6f8905138 SHA1 9aab9663adb18b42339de393e0579c3409bcb2ac SHA256 d09c61e2ab128ee5889f990f9a61b497179dd1f150c99aa3286201b3a7b2ab4a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk2jAoMACgkQcXOrnRGRc47z1AD+N3bcugwx/6ZjbxZJ2bkXI3gf
-qzKSMpVGZ60Cj/btb5kBAIo44cz5+zRxJnwOxUKxNsHgkyvv/TZj0ZWevNz4iX/m
-=7lAj
+iEYEARECAAYFAk2kVkIACgkQHB6c3gNBRYdGmQCfWiswiCTw+yBFKUnP9Zy9+5bH
+2SYAn1lUhTdNH0I5KwVqZE+mWDVuACIz
+=rfD6
-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 2e58fcc75475..f28c4044cab9 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.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/media-video/libav/libav-9999.ebuild,v 1.7 2011/04/11 13:30:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.8 2011/04/12 13:40:13 scarabeus Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="
speex? ( >=media-libs/speex-1.2_beta3 )
vaapi? ( x11-libs/libva )
video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
- vpx? ( media-libs/libvpx )
+ vpx? ( >=media-libs/libvpx-0.9.6 )
X? ( x11-libs/libX11 x11-libs/libXext )
zlib? ( sys-libs/zlib )
"
@@ -114,7 +114,8 @@ src_configure() {
use mp3 && myconf+=" --enable-libmp3lame"
use amr && myconf+=" --enable-libvo-amrwbenc --enable-version3"
use faac && myconf+=" --enable-libfaac --enable-nonfree"
- use aac && myconf+=" --enable-libvo-aacenc --enable-version3"
+ # faac has priority
+ use faac || use aac && myconf+=" --enable-libvo-aacenc --enable-version3"
uses="theora vorbis x264 xvid"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"