summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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.ebuild7
3 files changed, 12 insertions, 10 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c42df11b3581..4e8010cb77dd 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.738 2010/05/06 13:38:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.739 2010/05/09 16:44:58 aballier Exp $
+
+ 09 May 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+ internal a52dec support has been dropped, use external one
*mplayer-1.0_rc4_p20100506 (06 May 2010)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 713a7bde9ac3..8e6d1cadb857 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,13 +11,13 @@ DIST mplayer-1.0_rc4_p20100506.tar.bz2 8966725 RMD160 3355600313ac6e6e661acfcdec
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_p20100506.ebuild 20201 RMD160 3e41cf9ad5ce3765d2a926306af22fcc1e030ae4 SHA1 d0c1f0726bcb4cf84b3362bc9d73adade6c36d64 SHA256 309efb0404b25189ac3082576d1e437acec8ecd30dc8db1d7e4e6e7941940927
-EBUILD mplayer-9999.ebuild 20223 RMD160 023de2de57daad2923edcb675728c63c5f502db4 SHA1 faf6662a382438d3ef9123fd7861a6a9b72bc704 SHA256 cc65f3d51cff0826da0d3d2790888658fbd74ca044283a94be0a401c9034e7a8
-MISC ChangeLog 130597 RMD160 b33628d4458e7f5d4a1c391aa889bad1961eb8a0 SHA1 12d7e1247551bf303e71da1765e9d7a29a0b227c SHA256 a319fe2a936f05fa8c24042dcfe0099f23a5ac9b570dd062af9f1102d4b58ccf
+EBUILD mplayer-9999.ebuild 20178 RMD160 b6cbf97650f74f7764960558cdd72263600c02d9 SHA1 cb783aebe6f6cf610547d614f177003367b1daaf SHA256 3fb4e02b64656a43ed9a5c596b9a7a60feb707f2041b7d7ee9d06598a5d34bfe
+MISC ChangeLog 130731 RMD160 d74a9d550b071bacbd5cd71c3f230932e11d6af1 SHA1 faa1c55df5ff56069d5437a4e3e5adfae24a5288 SHA256 b53bad48ffcbfa827a1cdb028bc4e7bdc56b18827620d298b07471b5705145f2
MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkvixlEACgkQHB6c3gNBRYfHXACeMiRGvnW812rOWgUb27+2uRsS
-CY8AnjpYHCiIXArx/stMKrTVutrP46ID
-=5r8g
+iEYEARECAAYFAkvm5pAACgkQvFcC4BYPU0rGjwCfQkGJaHbDFcEr6iR1OhnhkKQm
+t6EAn0NE1tRmFhg1hBBGV8so998rBFey
+=MA8x
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index d7bd5a4c036d..51e6d2792b48 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.57 2010/05/05 08:37:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.58 2010/05/09 16:44:58 aballier Exp $
EAPI="2"
@@ -88,6 +88,7 @@ RDEPEND+="
xvmc? ( x11-libs/libXvMC )
)
)
+ a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
amr? ( !bindist? ( media-libs/opencore-amr ) )
@@ -392,12 +393,10 @@ src_configure() {
##########
# Codecs #
##########
- # Won't work with external liba52
- myconf+=" --disable-liba52"
- use a52 && myconf+=" --enable-liba52-internal"
# Use internal musepack codecs for SV7 and SV8 support
myconf+=" --disable-musepack"
+ use a52 || myconf+=" --disable-liba52"
myconf+=" --disable-faad-internal" # always use system media-libs/faad2
use dirac || myconf+=" --disable-libdirac-lavc"
use dts || myconf+=" --disable-libdca"