summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2005-03-22 07:14:55 +0000
committerChris White <chriswhite@gentoo.org>2005-03-22 07:14:55 +0000
commit0535cccd9ee984abf6aeef69c5a2640f8334aea8 (patch)
tree180e646d95b8bb32e5514aed9e0274e5d763b270 /media-video/mplayer
parentChanged to 3dnowext to better match the cpuflag for use in ecpu_check. (diff)
downloadhistorical-0535cccd9ee984abf6aeef69c5a2640f8334aea8.tar.gz
historical-0535cccd9ee984abf6aeef69c5a2640f8334aea8.tar.bz2
historical-0535cccd9ee984abf6aeef69c5a2640f8334aea8.zip
Fixing bug #85861 as well as changing over to 3dnowext to match the cpu flag in mplayer-1.0_pre6-r2.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog7
-rw-r--r--media-video/mplayer/Manifest10
-rw-r--r--media-video/mplayer/mplayer-1.0_pre6-r2.ebuild14
3 files changed, 18 insertions, 13 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2916a855783b..ea53224dea56 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
# 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.285 2005/03/21 23:06:23 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.286 2005/03/22 07:14:55 chriswhite Exp $
+
+ 22 Mar 2005; Chris White <chriswhite@gentoo.org>
+ mplayer-1.0_pre6-r2.ebuild:
+ Fixing bug #85861 as well as changing over to 3dnowext to match the cpu flag
+ in mplayer-1.0_pre6-r2.
22 Mar 2005; Chris White <chriswhite@gentoo.org>
files/mplayer-1.0_pre6-pic.patch:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b3f03c346973..3008deee860f 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 9a2f2119d756c25de71707b354fe6718 ChangeLog 52577
+MD5 fc81d84f1713e2e77d6aa934ceb2c012 ChangeLog 52764
MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
MD5 6922dce70bbab5cbe8c21e003ffd5226 mplayer-1.0_pre4-r7.ebuild 12234
MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050
@@ -9,7 +9,7 @@ MD5 a899c1b15e110f948f5eaba5746a7016 mplayer-1.0_pre5-r3.ebuild 14739
MD5 8f9db270042c019287fc969f41ac8801 mplayer-1.0_pre5-r4.ebuild 16480
MD5 a1ed43e3644e0eef95cd878a4bf2ead1 mplayer-1.0_pre5-r5.ebuild 16786
MD5 788c97fffc9327cee36ea8b524db7606 mplayer-1.0_pre6-r1.ebuild 16491
-MD5 a535eef0cbde3917672511ab0e6b0b65 mplayer-1.0_pre6-r2.ebuild 17304
+MD5 f6371d1f972da97cfe0b361510a11dfd mplayer-1.0_pre6-r2.ebuild 17357
MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
@@ -55,7 +55,7 @@ MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFCP0uyFdQwWVoAgN4RAiifAKD5im+FffIExhvKX3Ol74fOEjQiaQCgmjub
-bChPjez23HE7r1bD/r/6MUs=
-=mwV+
+iD8DBQFCP742FdQwWVoAgN4RAk8DAKDkMsDkt3+CCf1WoHu115gYaB2u5QCg0T2f
+1VJ5TSKJtwKFOUQb74zT8yo=
+=WnBk
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
index 4808729cbd42..e45eaa5dd761 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
@@ -1,11 +1,11 @@
# 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-r2.ebuild,v 1.1 2005/03/20 17:23:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.2 2005/03/22 07:14:55 chriswhite Exp $
inherit eutils flag-o-matic kernel-mod
RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
BLUV=1.4
SVGV=1.9.17
@@ -229,7 +229,7 @@ src_compile() {
# check cpu flags
if use x86
then
- CPU_FLAGS=(3dnow 3dnowex mmx sse sse2 mmxext)
+ CPU_FLAGS=(3dnow 3dnowext mmx sse sse2 mmxext)
ecpu_check CPU_FLAGS
fi
@@ -333,11 +333,11 @@ src_compile() {
#############
# Video Output #
#############
- myconf="${myconf} $(use_enable 3dfx)"
+ # 3dfx requires dga to build. See bug #85861
if use 3dfx; then
- myconf="${myconf} --enable-tdfxvid"
+ myconf="${myconf} --enable-tdfxvid --enable-3dfx --enable-dga"
else
- myconf="${myconf} --disable-tdfxvid"
+ myconf="${myconf} --disable-tdfxvid --disable-3dfx"
fi
if use fbcon && use 3dfx; then
myconf="${myconf} --enable-tdfxfb"
@@ -433,7 +433,7 @@ src_compile() {
myconf="${myconf} --enable-3dnow"
fi
- if has_pic && use x86 || use !3dnowex; then
+ if has_pic && use x86 || use !3dnowext; then
myconf="${myconf} --disable-3dnowex"
else
myconf="${myconf} --enable-3dnowex"