Fix codecsdir handling; default to real ones, the default can be overriden with codec...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index d1403667f6315f9ac4cd35202e1d8f02ef25c0ef..dfc30b08190d7d1a550ecf574a0f9c953cec1895 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.721 2010/04/23 13:04:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.722 2010/04/24 11:57:49 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Fix codecsdir handling; default to real ones, the default can be overriden
+  with codecpath=somewhere in cli or config file, bug #310389 and bug
+  #309931
 
   23 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20100213-r1.ebuild,

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index cbd00f7e15a6e5f642fd46a7ff73852b32c95da1..d8c9384843ee04ee597271eb4b0dc0ed71dc1052 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847
 AUX mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch 986 RMD160 4ff6e06c604c3d609d1f4cbdd560577d89f3eabc SHA1 cf26d0c5a6b5ab9a36864cfdfb34106e2676ab2f SHA256 63e43820838365fec77e53d7f2b70091045b350c5c4e7c304c5ca692c20551d7
 AUX mplayer-1.0_rc2_p20090731-linguas.patch 699 RMD160 eccde57fe14b664e962ca5c997fa6b72ebadc763 SHA1 0f036a975250a7ef6429f9c6dce036453c3a1d25 SHA256 c0939c548249afbc45905570c99bb6593175ebaf6e34bfceda284253600d9d22
@@ -12,6 +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 19804 RMD160 1f3287c53e98c0b655a1bf0632243f4419770570 SHA1 72bf48a6f6f85b3a2f4b534dc9eb6a80ce38bee3 SHA256 e99ba917f51972d703ace4d353820e6f1643620aad6824eca0438be0c5b172a7
-MISC ChangeLog 127517 RMD160 68916cea962f868e211f580b04977ed59d6bcd68 SHA1 ded52dcfca0e975a95a0febdd2aec8680c61fdf6 SHA256 e70f91a567500f2977bdf25017347654ae6e9029a16d401394042582901ce2d2
+EBUILD mplayer-9999.ebuild 19733 RMD160 55e741a5233e91ef67bfe8fec666ce4c6c39d39b SHA1 677ae1ed5901f7308cd67b6449c34a565dd5e331 SHA256 95cf9009bf9bf587e47f14d3f12f6e0977f81b3165d29f3a3115d16600033131
+MISC ChangeLog 127747 RMD160 ef55344f3e1827695c3902df0a7f86fe6a7720eb SHA1 9d8050b857f5947307df50c7471b7f01965b7ca0 SHA256 b404402332d983a0f9d418572d112b13e9d41d1bf398aed6eccd27a4a5433f91
 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
+-----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 639fd667e8695cf8f667e9a7a0223c5bfdf4972d..b1f1824966cd406bc9ee6082ff02542023c4966d 100644 (file)
--- 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.36 2010/04/23 13:04:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.37 2010/04/24 11:57:49 aballier Exp $
 
 EAPI="2"
 
@@ -418,7 +418,6 @@ src_configure() {
        fi
        use bs2b || myconf+=" --disable-libbs2b"
        use schroedinger || myconf+=" --disable-libschroedinger-lavc"
-       use xanim && myconf+=" --xanimcodecsdir=/usr/lib/xanim/mods"
        if ! use png && ! use gmplayer; then
                myconf+=" --disable-png"
        fi
@@ -484,8 +483,8 @@ src_configure() {
 
        # Real binary codec support only available on x86, amd64
        if use real; then
-               use x86 && myconf+=" --realcodecsdir=/opt/RealPlayer/codecs"
-               use amd64 && myconf+=" --realcodecsdir=/usr/$(get_libdir)/codecs"
+               use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
+               use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
        elif ! use bindist; then
                        myconf+=" $(use_enable win32codecs win32dll)"
        fi