Removed sse2 as it's broken. Custom CFLAGS now holds. Ncurses as default terminal lib as per bug #64212.

6 files changed, 45 insertions, 64 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a0993b0152de..e810159b6d76 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.210 2004/10/16 05:16:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.211 2004/10/17 00:21:46 chriswhite Exp $
+
+  16 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r3.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Removed sse2 as it's broken. Custom CFLAGS now holds. Ncurses as default
+  terminal lib as per bug #64212.
 
   15 Oct 2004; Seemant Kulleen <seemant@gentoo.org>
   files/mplayer-1.0_pre5-yuv2rgb_fix.patch:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 21c60bab9f01..60e0ec87224d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,32 +1,32 @@
-MD5 42e71d724dca61a5ebe33d0c347f4e4f mplayer-1.0_pre5-r2.ebuild 14285
-MD5 f3805b6605c967bb9a73433e2f4b72b7 mplayer-1.0_pre5-r4.ebuild 15190
-MD5 a85740a291e190516009abeccd91c6f7 mplayer-1.0_pre4-r7.ebuild 12611
-MD5 ec9437b6385a558b6da1fa5a1d12c618 ChangeLog 39610
-MD5 1e280b6d342af22ba5586da17800087c mplayer-1.0_pre5-r3.ebuild 15492
+MD5 37ab52d913a699c8dd7a08c0e0ebb45a ChangeLog 39890
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 27d3b9d9184cc1f8a2e8a89acb03b161 mplayer-1.0_pre4-r7.ebuild 12329
+MD5 1c05859d6d0b69b9811614c5fe1e1c05 mplayer-1.0_pre5-r4.ebuild 15163
+MD5 d994774e1e84665b3a64bdd961b63af8 mplayer-1.0_pre5-r2.ebuild 14055
+MD5 1ed43eec75b033b049966125fd375710 mplayer-1.0_pre5-r3.ebuild 15443
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 6c62fe3136b83cc8ea960f4563df8555 files/digest-mplayer-1.0_pre5-r4 360
+MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 88afe4c7008da4f33b5b89ddc1ab8069 files/digest-mplayer-1.0_pre5-r3 527
+MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
 MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
 MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
-MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
+MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
+MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
+MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445
-MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
-MD5 88afe4c7008da4f33b5b89ddc1ab8069 files/digest-mplayer-1.0_pre5-r3 527
-MD5 6c62fe3136b83cc8ea960f4563df8555 files/digest-mplayer-1.0_pre5-r4 360
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
-MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
index d637698bab0b..47474ee1316d 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.14 2004/09/06 20:42:39 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.15 2004/10/17 00:21:47 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad  matroska matrox mmx mmx2 mpeg mythtv nas network nls oggvorbis opengl oss png rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad  matroska matrox mmx mmx2 mpeg mythtv nas network nls oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -66,7 +66,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
 	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36"
+	>=sys-apps/portage-2.0.36
+	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
@@ -76,18 +77,6 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc alpha amd64 ~ia64 ~hppa ~sparc"
 
-
-pkg_setup() {
-	echo
-	einfo "Please note that we do not use C[XX]FLAGS from /etc/make.conf"
-	einfo "or the environment, as the upstream maintainers will then"
-	einfo "ignore bug reports and refuse support."
-
-	echo
-	ebeep 3
-	epause 5
-}
-
 src_unpack() {
 
 	unpack MPlayer-${MY_PV}.tar.bz2 \
@@ -213,7 +202,6 @@ src_compile() {
 	myconf="${myconf} $(use_enable 3dnow)"
 	myconf="${myconf} $(use_enable 3dnowex)"
 	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable sse2)"
 	myconf="${myconf} $(use_enable mmx)"
 	myconf="${myconf} $(use_enable mmx2)"
 
@@ -244,7 +232,6 @@ src_compile() {
 		cd ${S}
 	fi
 
-	unset CFLAGS CXXFLAGS
 	./configure --prefix=/usr 		\
 		--confdir=/usr/share/mplayer	\
 		--datadir=/usr/share/mplayer	\
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
index 5bedad3129da..928986c15c41 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.18 2004/09/06 20:42:39 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.19 2004/10/17 00:21:47 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -72,7 +72,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
 	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36"
+	>=sys-apps/portage-2.0.36
+	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
@@ -82,17 +83,6 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa sparc"
 
-
-pkg_setup() {
-	echo
-	einfo "Please note that we do not use C[XX]FLAGS from /etc/make.conf"
-	einfo "or the environment, as the MPlayer guys then do not give support"
-	einfo "in case of bug reports!."
-	echo
-	ebeep 3
-	epause 5
-}
-
 src_unpack() {
 
 	unpack MPlayer-${MY_PV}.tar.bz2 \
@@ -328,7 +318,6 @@ src_compile() {
 	# it *will* be removed asap; in the meantime, doesn't hurt anything.
 	echo "${myconf}" > ${T}/configure-options
 
-	unset CFLAGS CXXFLAGS
 	./configure --prefix=/usr \
 		--confdir=/usr/share/mplayer \
 		--datadir=/usr/share/mplayer \
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
index b799439f8b7a..cb2daa7b8f23 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.9 2004/10/07 03:12:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild,v 1.10 2004/10/17 00:21:47 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -73,7 +73,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	xinerama? ( virtual/x11 )
 	!mips? ( !hppa? ( !ia64? ( !alpha? ( jack? ( >=media-libs/bio2jack-0.3-r1 ) ) ) ) )
 	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36"
+	>=sys-apps/portage-2.0.36
+	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
@@ -317,7 +318,6 @@ src_compile() {
 	myconf="${myconf} $(use_enable 3dnow)"
 	myconf="${myconf} $(use_enable 3dnowex)";
 	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable sse2)";
 	myconf="${myconf} $(use_enable mmx)"
 	myconf="${myconf} $(use_enable mmx2)"
 	myconf="${myconf} $(use_enable 3dnow)"
@@ -364,7 +364,6 @@ src_compile() {
 	# it *will* be removed asap; in the meantime, doesn't hurt anything.
 	echo "${myconf}" > ${T}/configure-options
 
-	unset CFLAGS CXXFLAGS
 	./configure --prefix=/usr \
 		--confdir=/usr/share/mplayer \
 		--datadir=/usr/share/mplayer \
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
index e78c8a4eb816..c956df6aa872 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 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-r4.ebuild,v 1.7 2004/10/07 03:12:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.8 2004/10/17 00:21:47 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -73,7 +73,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	xinerama? ( virtual/x11 )
 	jack? ( >=media-libs/bio2jack-0.3-r1 )
 	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36"
+	>=sys-apps/portage-2.0.36
+	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
@@ -304,7 +305,6 @@ src_compile() {
 	myconf="${myconf} $(use_enable 3dnow)"
 	myconf="${myconf} $(use_enable 3dnowex)";
 	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable sse2)";
 	myconf="${myconf} $(use_enable mmx)"
 	myconf="${myconf} $(use_enable mmx2)"
 	myconf="${myconf} $(use_enable 3dnow)"