minor fix

Package-Manager: portage-1.589-cvs

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 5ed1639d03a2caf8c05c5a3813e4e0bd39d6f273..dc197dd86cf9c5283ba011b64dea184384311b03 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.330 2005/11/01 16:41:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.331 2005/11/06 23:23:32 lu_zero Exp $
 
   01 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
   -files/mplayer-1.0_pre6-codecs.patch,
@@ -27,6 +27,9 @@
   30 Oct 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
   Removed ancient divx4linux support, internal support if far better anyway.
 
+  06 Nov 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  disable x264 for now
+
   10 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
   +files/mplayer-1.0_pre7-gcc4-amd64.patch, mplayer-1.0_pre7-r1.ebuild:
   Fix for gcc-4.0.1 and amd64

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index dcc06728c909821bb0d182059ebc96a48692a890..42448636dd4973f81b49777e76a6d584dc17bfcc 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,12 +1,12 @@
-MD5 4adfa27c8b965e63820dea1c57c83d3d ChangeLog 61417
-MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432
-MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
-MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
-MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b4ae569a508d2078007f8eb2e0f8fea9 mplayer-1.0_pre7-r1.ebuild 16018
+MD5 07a692e8625d9a1cb9b70bab429d6e6a ChangeLog 61518
 MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
-MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre7-ppc64.patch 353
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412
 MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
+MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432
+MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
 MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 52d472d3d7b2cd28b410933de58c22bb mplayer-1.0_pre7-r1.ebuild 15966
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre7-ppc64.patch 353

diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index 29b362bc8763efb51131601e914b37a5474cc2bd..be7ce92e1a6959b290c7955ae87f7a41db70e9f2 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.11 2005/11/01 16:41:13 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.12 2005/11/06 23:23:32 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -211,8 +211,8 @@ src_compile() {
        else
        unset CFLAGS CXXFLAGS
        fi
-
-       local myconf=
+       #FIXME make it work in the snapshot
+       local myconf="--disable-x264"
        ################
        #Optional features#
        ###############