summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-04-24 12:18:44 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-04-24 12:18:44 +0000
commitdfdeb91fa49628270faf12d12de27c1dbd809fbd (patch)
tree57445afe0bfc66d543090583282c213528322834 /media-video/mplayer
parentFix codecsdir handling; default to real ones, the default can be overriden wi... (diff)
downloadhistorical-dfdeb91fa49628270faf12d12de27c1dbd809fbd.tar.gz
historical-dfdeb91fa49628270faf12d12de27c1dbd809fbd.tar.bz2
historical-dfdeb91fa49628270faf12d12de27c1dbd809fbd.zip
fix opencore-amr automagic dep
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/Manifest10
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild3
3 files changed, 11 insertions, 7 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index dfc30b08190d..ab4788049a7f 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.722 2010/04/24 11:57:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.723 2010/04/24 12:18:43 aballier Exp $
+
+ 24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+ fix opencore-amr automagic dep
24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
Fix codecsdir handling; default to real ones, the default can be overriden
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index d8c9384843ee..7cf5a4e86a40 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,13 +15,13 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484
DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
-EBUILD mplayer-9999.ebuild 19733 RMD160 55e741a5233e91ef67bfe8fec666ce4c6c39d39b SHA1 677ae1ed5901f7308cd67b6449c34a565dd5e331 SHA256 95cf9009bf9bf587e47f14d3f12f6e0977f81b3165d29f3a3115d16600033131
-MISC ChangeLog 127747 RMD160 ef55344f3e1827695c3902df0a7f86fe6a7720eb SHA1 9d8050b857f5947307df50c7471b7f01965b7ca0 SHA256 b404402332d983a0f9d418572d112b13e9d41d1bf398aed6eccd27a4a5433f91
+EBUILD mplayer-9999.ebuild 19812 RMD160 1aa9e9363154df8e40a0b7baf9828829dd9d59f8 SHA1 6c2ce988035a74d9237ff2137ab32f0ae5ccf758 SHA256 50ea6a59b59cb965a27871c0834d681c3c655badc48a5727e5baf48f35e99792
+MISC ChangeLog 127854 RMD160 2f195009eff1c7fb52787dc9e631e968bcad5bfc SHA1 513fa1b455e0cd6071412eefcb628911f63a71c3 SHA256 8f2d376713e08c96c776ad2ddf7fa42d622cdcf28e6b06dd1f738c517ec81daf
MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkvS3MQACgkQvFcC4BYPU0o1nQCfYBCYODL6+oxyG0w8SF9zW2L4
-rJ4AoK66D2dnBWxzIyjY5MlCqW+Y6cMa
-=7KYe
+iEYEARECAAYFAkvS4akACgkQvFcC4BYPU0qmNACfU3ulIBuRpQnOb3KxNu6ezdFz
+cNUAoJbC1jbYhOnfbJf9fp2loqamg9Xg
+=5AwM
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index b1f1824966cd..8aceeb0c204a 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.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/mplayer/mplayer-9999.ebuild,v 1.37 2010/04/24 11:57:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.38 2010/04/24 12:18:44 aballier Exp $
EAPI="2"
@@ -418,6 +418,7 @@ src_configure() {
fi
use bs2b || myconf+=" --disable-libbs2b"
use schroedinger || myconf+=" --disable-libschroedinger-lavc"
+ use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
if ! use png && ! use gmplayer; then
myconf+=" --disable-png"
fi