summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2005-01-13 22:43:39 +0000
committerChris White <chriswhite@gentoo.org>2005-01-13 22:43:39 +0000
commit890e888ee02e52414ab7faec9532b4a40986befd (patch)
tree438db1a197aabfa669fcb62ca197aad30f918240 /media-video
parentFixed creation of tutorial docs. (Manifest recommit) (diff)
downloadgentoo-2-890e888ee02e52414ab7faec9532b4a40986befd.tar.gz
gentoo-2-890e888ee02e52414ab7faec9532b4a40986befd.tar.bz2
gentoo-2-890e888ee02e52414ab7faec9532b4a40986befd.zip
Re-fixing gif logic (someone messed with it :|) to fix #77463.
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/mplayer-1.0_pre5-r5.ebuild6
-rw-r--r--media-video/mplayer/mplayer-1.0_pre6.ebuild8
3 files changed, 12 insertions, 8 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c5fa4bec1fa1..0fb17f03803c 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# 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.254 2005/01/11 21:38:27 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.255 2005/01/13 22:43:39 chriswhite Exp $
+
+ 14 Jan 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+ mplayer-1.0_pre6.ebuild:
+ Re-fixing gif logic (someone messed with it :|) to fix #77463.
11 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> mplayer-1.0_pre6.ebuild:
mplayer now contains SIMD assembler code for AMD64. The AMD64 Team decided
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index 79388c056262..b0ce19fd4637 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.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_pre5-r5.ebuild,v 1.10 2005/01/09 06:35:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.11 2005/01/13 22:43:39 chriswhite Exp $
inherit eutils flag-o-matic kernel-mod
@@ -43,8 +43,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
>=media-libs/libdv-0.9.5
)
esd? ( media-sound/esound )
- gif? ( media-libs/giflib
- media-libs/libungif )
+ gif? ( media-libs/giflib )
+ !gif ( media-libs/libungif )
ggi? ( media-libs/libggi )
gtk? (
media-libs/libpng
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
index e6e056a8496a..e1520a6ae7e6 100644
--- a/media-video/mplayer/mplayer-1.0_pre6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6.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_pre6.ebuild,v 1.11 2005/01/11 21:38:27 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.12 2005/01/13 22:43:39 chriswhite Exp $
inherit eutils flag-o-matic kernel-mod
@@ -44,8 +44,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
dv? ( >=media-libs/libdv-0.9.5 )
)
esd? ( media-sound/esound )
- gif? ( media-libs/giflib
- media-libs/libungif )
+ gif? ( media-libs/giflib )
+ !gif ( media-libs/libungif )
ggi? ( media-libs/libggi )
gtk? (
media-libs/libpng
@@ -362,7 +362,7 @@ src_compile() {
if use amd64; then
myconf="${myconf} --enable-3dnow --enable-3dnowex --enable-sse --enable-mmx --enable-mmx2"
fi
-
+
if use ppc64
then
myconf="${myconf} --disable-altivec"