summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2005-11-06 23:23:32 +0000
committerLuca Barbato <lu_zero@gentoo.org>2005-11-06 23:23:32 +0000
commit019979ce65de84fda722a77853b26e30f0827acc (patch)
tree1841ab893ecbffac688c671e7df0d97c175b8d61 /media-video
parentModular X deps (diff)
downloadgentoo-2-019979ce65de84fda722a77853b26e30f0827acc.tar.gz
gentoo-2-019979ce65de84fda722a77853b26e30f0827acc.tar.bz2
gentoo-2-019979ce65de84fda722a77853b26e30f0827acc.zip
minor fix
(Portage version: 1.589-cvs)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/mplayer-1.0_pre7-r1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 5ed1639d03a2..dc197dd86cf9 100644
--- 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/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index 29b362bc8763..be7ce92e1a69 100644
--- 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#
###############