see changelog

Package-Manager: portage-2.1.2.2

4 files changed, 125 insertions, 83 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 1445d198e5f6..16e11195a6af 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.465 2007/03/23 14:52:01 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.466 2007/03/25 15:06:01 beandog Exp $
+
+*mplayer-1.0_rc2_pre20070321-r4 (25 Mar 2007)
+
+  25 Mar 2007; Steve Dibb <beandog@gentoo.org>
+  +mplayer-1.0_rc2_pre20070321-r4.ebuild:
+  - Remove dependency on media-libs/a52dec
+  - Fix tdfx use flag (bug 172170)
+  - Remove LINGUAS use flags, rely on variable from make.conf to set languages,
+  add notice of special ordering
+  - Fix CPU optimization use flags ( bug 155232 )
+  - Remove -j1 from MAKEOPTS ( bug 86245 )
 
 *mplayer-1.0_rc2_pre20070321-r3 (23 Mar 2007)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b6bbce6af11d..442a4a6993a5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -45,18 +45,18 @@ EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54
 MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
-EBUILD mplayer-1.0_rc2_pre20070321-r2.ebuild 16888 RMD160 abbc9fd36adba60b160f1bee54e3fc93a8de5b7f SHA1 0114f947735420ea098fe6f897e0a72702c72668 SHA256 1fd7cbd7f5f6cb95092556c273e1c81735491629a069e9cb52d1f51b6c942045
-MD5 fa3af362bb97a3b74b19720e1f53b248 mplayer-1.0_rc2_pre20070321-r2.ebuild 16888
-RMD160 abbc9fd36adba60b160f1bee54e3fc93a8de5b7f mplayer-1.0_rc2_pre20070321-r2.ebuild 16888
-SHA256 1fd7cbd7f5f6cb95092556c273e1c81735491629a069e9cb52d1f51b6c942045 mplayer-1.0_rc2_pre20070321-r2.ebuild 16888
 EBUILD mplayer-1.0_rc2_pre20070321-r3.ebuild 17492 RMD160 fef9dd011982544b3872b2cc457c45cca5632b77 SHA1 c0c7e5ad4e94a15985038f47210e48574a9d4c01 SHA256 e0513cfbdd79214018d84ea0ded25dc04fdae94917f4799a28f20085e6d4c443
 MD5 fa96eb6d57f863dab2747b4b6645fc6e mplayer-1.0_rc2_pre20070321-r3.ebuild 17492
 RMD160 fef9dd011982544b3872b2cc457c45cca5632b77 mplayer-1.0_rc2_pre20070321-r3.ebuild 17492
 SHA256 e0513cfbdd79214018d84ea0ded25dc04fdae94917f4799a28f20085e6d4c443 mplayer-1.0_rc2_pre20070321-r3.ebuild 17492
-MISC ChangeLog 83397 RMD160 339f0adcddb07707dad99d8cfc8c1298b45fa9c2 SHA1 0383ae773683e6951e9c5d378184bc80d890f837 SHA256 101ef747405ffc8c35b2a83bd5f5e4cfbedd71d4a54b5e82ca945b05d4df2f1a
-MD5 1490a56e2cfe75a1e54937c86ac41c0b ChangeLog 83397
-RMD160 339f0adcddb07707dad99d8cfc8c1298b45fa9c2 ChangeLog 83397
-SHA256 101ef747405ffc8c35b2a83bd5f5e4cfbedd71d4a54b5e82ca945b05d4df2f1a ChangeLog 83397
+EBUILD mplayer-1.0_rc2_pre20070321-r4.ebuild 17814 RMD160 c896fa651eb29a5e615f6e3d7ecbb6c7d73c034b SHA1 d4a7a43377e314daffa9b2e3ec5095fa12eecadd SHA256 766b2fb682293a302713dfb3666524e2d53448189816e0f1ddd1ad8510852d44
+MD5 857d6190bf74e54d7bf5ef6f9bdc0571 mplayer-1.0_rc2_pre20070321-r4.ebuild 17814
+RMD160 c896fa651eb29a5e615f6e3d7ecbb6c7d73c034b mplayer-1.0_rc2_pre20070321-r4.ebuild 17814
+SHA256 766b2fb682293a302713dfb3666524e2d53448189816e0f1ddd1ad8510852d44 mplayer-1.0_rc2_pre20070321-r4.ebuild 17814
+MISC ChangeLog 83818 RMD160 7e6cbe0baea0aad32ffadc23ad08fc23085c75b4 SHA1 81305e582d55a3ddef7f92cc41e8b07cc230ed1b SHA256 481e3e55a8dc486cbab0c46bad4ca6ad3d099665529f77e296647d9a7997897a
+MD5 0b721789aaaae198d5a0752351f0e48b ChangeLog 83818
+RMD160 7e6cbe0baea0aad32ffadc23ad08fc23085c75b4 ChangeLog 83818
+SHA256 481e3e55a8dc486cbab0c46bad4ca6ad3d099665529f77e296647d9a7997897a ChangeLog 83818
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -73,9 +73,9 @@ SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/di
 MD5 d7bbbcb7a88505edca78e82546995d4f files/digest-mplayer-1.0_rc1-r2 1997
 RMD160 95a72a90b4c19fc9063c6fab3bdb9647c6c5686f files/digest-mplayer-1.0_rc1-r2 1997
 SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/digest-mplayer-1.0_rc1-r2 1997
-MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321-r2 2039
-RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321-r2 2039
-SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321-r2 2039
 MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321-r3 2039
 RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321-r3 2039
 SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321-r3 2039
+MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321-r4 2039
+RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321-r4 2039
+SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321-r4 2039
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r2 b/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r4
index 8cac4a7078e1..8cac4a7078e1 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r2
+++ b/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r4
diff --git a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r2.ebuild b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
index 4565db235369..83e59f79b987 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r2.ebuild,v 1.1 2007/03/22 15:08:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild,v 1.1 2007/03/25 15:06:01 beandog Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -8,16 +8,13 @@ RESTRICT="nostrip"
 IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
 cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
 dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
-jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl speex srt sse sse2 svga theora tivo truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc zoran"
-
-LANGS="bg cs da de el es fr hu it ja ko mk nb no pl ro ru sk sv tr uk pt_BR zh_CN zh_TW"
+jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
+unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
+speex srt sse sse2 svga theora tivo truetype v4l v4l2 vidix win32codecs X x264
+xanim xinerama xv xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx tga vesa"
 
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
 for X in ${VIDEO_CARDS}; do
 	IUSE="${IUSE} video_cards_${X}"
 done
@@ -34,8 +31,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
 			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
 	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
 	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
 		   ${AMR_URI}/26_series/26.204/26204-510.zip )"
 
@@ -43,13 +40,18 @@ DESCRIPTION="Media Player for Linux "
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 RDEPEND="sys-libs/ncurses
-	win32codecs? (
-		!livecd? (
-			!bindist? ( media-libs/win32codecs ) ) )
-	x86? ( real? ( !bindist? ( media-video/realplayer ) ) )
-	amd64? ( real? ( !bindist? ( media-libs/amd64codecs ) ) )
-	x86? ( mp2? ( media-sound/toolame ) )
-	amd64? ( mp2? ( media-sound/toolame ) )
+	!livecd? (
+		!bindist? (
+			x86? (
+				win32codecs? ( media-libs/win32codecs )
+				real? ( media-libs/win32codecs
+					media-video/realplayer )
+				)
+			amd64? ( real? ( media-libs/amd64codecs ) )
+		)
+	)
+	x86? ( mp2? ( media-sound/twolame ) )
+	amd64? ( mp2? ( media-sound/twolame ) )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
@@ -59,12 +61,12 @@ RDEPEND="sys-libs/ncurses
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
+	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
 	encode? (
-		media-sound/lame
+		aac? ( media-libs/faac )
 		dv? ( media-libs/libdv )
+		mp3? ( media-sound/lame )
 		x264? ( media-libs/x264-svn )
-		aac? ( media-libs/faac )
 		)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
@@ -78,7 +80,7 @@ RDEPEND="sys-libs/ncurses
 	jpeg? ( media-libs/jpeg )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	lzo? ( =dev-libs/lzo-1* )
+	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	musepack? ( >=media-libs/libmpcdec-1.2.2 )
 	nas? ( media-libs/nas )
@@ -87,13 +89,13 @@ RDEPEND="sys-libs/ncurses
 	pnm? ( media-libs/netpbm )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
+	speex? ( >=media-libs/speex-1.1.7 )
 	srt? ( >=media-libs/freetype-2.1
 		media-libs/fontconfig )
 	svga? ( media-libs/svgalib )
-	!hppa? ( !ppc64? ( tdfx? ( x11-libs/libXxf86vm
+	video_cards_tdfx? ( x11-libs/libXxf86vm
 		x11-libs/libXext
-		x11-drivers/xf86-video-tdfx ) ) )
+		x11-drivers/xf86-video-tdfx )
 	theora? ( media-libs/libtheora )
 	live? ( >=media-plugins/live-2007.02.20 )
 	truetype? ( >=media-libs/freetype-2.1
@@ -110,6 +112,8 @@ RDEPEND="sys-libs/ncurses
 	video_cards_vesa? ( x11-libs/libXxf86vm
 		x11-libs/libXext
 		x11-drivers/xf86-video-vesa )
+	vidix? ( x11-libs/libXxf86vm
+		x11-libs/libXext )
 	xinerama? ( x11-libs/libXinerama
 		x11-libs/libXxf86vm
 		x11-libs/libXext )
@@ -151,6 +155,19 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
+pkg_setup() {
+
+	if [[ -n ${LINGUAS} ]]; then
+		elog "For MPlayer's language support, the configuration will"
+		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
+		elog "than one language enabled, then the first one in the list will"
+		elog "be used to output the messages, if a translation is available."
+		elog "man pages will be created for all languages where translations"
+		elog "are also available."
+	fi
+
+}
+
 src_unpack() {
 
 	unpack ${P}.tar.bz2
@@ -161,10 +178,10 @@ src_unpack() {
 			font-arial-cp1250.tar.bz2
 	fi
 
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
 	use gtk && unpack Blue-${BLUV}.tar.bz2
 
+	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
+
 	use amr && unpack 26104-510.zip && unpack 26204-510.zip
 
 	# amr (float) support
@@ -184,10 +201,9 @@ src_unpack() {
 	cd ${S}
 
 	# Fix hppa compilation
-	# [ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
+	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
 
-	if use svga
-	then
+	if use svga; then
 		echo
 		einfo "Enabling vidix non-root mode."
 		einfo "(You need a proper svgalib_helper.o module for your kernel"
@@ -212,42 +228,25 @@ src_unpack() {
 src_compile() {
 
 	local myconf=" --disable-tv-bsdbt848 \
-		--disable-vidix-external \
 		--disable-faad-external \
 		--disable-libcdio"
 
-	# have fun with LINGUAS variable
+	# MPlayer reads in the LINGUAS variable from make.conf, and sets
+	# the languages accordingly.  Some will have to be altered to match
+	# upstream's naming scheme.
 	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-	local myconf_linguas="--language=en"
-	for x in ${LANGS}; do
-		if use linguas_${x}; then
-			myconf_linguas="${myconf_linguas} --language=${x}"
-		fi
-	done
-	myconf="${myconf} ${myconf_linguas}"
 
 	################
 	#Optional features#
 	###############
-	if use cpudetection || use livecd || use bindist
-	then
-		myconf="${myconf} --enable-runtime-cpudetection"
-	fi
-
 	use bidi || myconf="${myconf} --disable-fribidi"
 	use bl && myconf="${myconf} --enable-bl"
 	use cddb || myconf="${myconf} --disable-cddb"
 	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
 	use enca || myconf="${myconf} --disable-enca"
 	use ftp || myconf="${myconf} --disable-ftp"
-	use srt || myconf="${myconf} --disable-ass"
 	use tivo || myconf="${myconf} --disable-vstream"
 
-	if use iconv && use unicode; then
-		myconf="${myconf} --charset=UTF-8"
-	else
-		myconf="${myconf} --disable-iconv --charset=noconv"
-	fi
 
 	# DVD support
 	# dvdread and libdvdcss are internal libs
@@ -256,27 +255,36 @@ src_compile() {
 	# upstream's suggestion.  We don't.
 	# dvdnav support is known to be buggy, but it is the only option
 	# for accessing some DVDs.
-	if use dvd
-	then
+	if use dvd; then
 		use dvdread || myconf="${myconf} --disable-dvdread"
 		use dvdnav || myconf="${myconf} --disable-dvdnav"
 	else
 		myconf="${myconf} --disable-dvdnav --disable-dvdread"
 	fi
 
-	if use encode
-	then
+	if use encode; then
+		use aac || myconf="${myconf} --disable-faac"
 		use dv || myconf="${myconf} --disable-libdv"
 		use x264 || myconf="${myconf} --disable-x264"
-		use aac || myconf="${myconf} --disable-faac"
 	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264
-		--disable-faac"
+		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
+			--disable-faac"
 	fi
 
+	# SRT (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
 	if ! use srt; then
-		use truetype || myconf="${myconf} --disable-freetype"
+		myconf="${myconf} --disable-ass"
+		if ! use truetype; then
+			myconf="${myconf} --disable-freetype"
+			if ! use iconv; then
+				myconf="${myconf} --disable-iconv --charset=noconv"
+			fi
+		fi
 	fi
+	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
+
 	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
 	myconf="${myconf} $(use_enable joystick)"
 	use ipv6 || myconf="${myconf} --disable-inet6"
@@ -284,18 +292,20 @@ src_compile() {
 	use rtc || myconf="${myconf} --disable-rtc"
 	use samba || myconf="${myconf} --disable-smb"
 
-	# Video4Linux / Radio support
-	if ( use v4l || use v4l2 || use radio ); then
+	# DVB / Video4Linux / Radio support
+	if ( use dvb || use v4l || use v4l2 || use radio ); then
+		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
 		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
 		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		if use radio; then
+		if ( use dvb || use v4l || use v4l2 ) && use radio; then
 			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
 		else
 			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
 		fi
 	else
 		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
-			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848"
+			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
+			--disable-dvb --disable-dvbhead"
 	fi
 
 	# disable PVR support
@@ -329,29 +339,29 @@ src_compile() {
 		else
 			myconf="${myconf} --disable-real"
 		fi
-		! use livecd && ! use bindist && \
+		if ! use livecd && ! use bindist && ! use real; then
 			myconf="${myconf} $(use_enable win32codecs win32dll)"
+		fi
 	fi
 
 	#############
 	# Video Output #
 	#############
 
-	#use aalib && myconf="${myconf} --enable-aa"
 	for x in directfb ivtv ggi md5sum sdl xinerama; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
 	use aalib || myconf="${myconf} --disable-aa"
-	use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
 	use fbcon || myconf="${myconf} --disable-fbdev"
 	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
 	use libcaca || myconf="${myconf} --disable-caca"
 	use opengl || myconf="${myconf} --disable-gl"
-	use svga ||	myconf="${myconf} --disable-vidix-internal"
 	use video_cards_mga || myconf="${myconf} --disable-mga"
 	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
 	use video_cards_tga || myconf="${myconf} --disable-tga"
 	use video_cards_vesa || myconf="${myconf} --disable-vesa"
+	use vidix || myconf="${myconf} --disable-vidix-internal \
+		--disable-vidix-external"
 	use zoran || myconf="${myconf} --disable-zr"
 
 	# GTK gmplayer gui
@@ -380,15 +390,27 @@ src_compile() {
 	for x in alsa arts esd jack nas openal; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
-	use oss || myconf="${myconf} --disable-ossaudio"
+	if ! use radio; then
+		use oss || myconf="${myconf} --disable-ossaudio"
+	fi
 
 	#################
 	# Advanced Options #
 	#################
 	# Platform specific flags, hardcoded on amd64 (see below)
-	for x in 3dnow 3dnowext mmx mmxext sse sse2; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
+	if use x86 || use amd64 || use ppc; then
+		if use cpudetection || use livecd || use bindist; then
+			myconf="${myconf} --enable-runtime-cpudetection"
+		fi
+	fi
+	if use mmx; then
+		for x in 3dnow 3dnowext mmxext sse sse2; do
+			use ${x} || myconf="${myconf} --disable-${x}"
+		done
+	else
+		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
+		--disable-sse2 --disable-3dnow --disable-3dnowext"
+	fi
 	use debug && myconf="${myconf} --enable-debug=3"
 
 	if use ppc64 && use altivec; then
@@ -437,7 +459,8 @@ src_compile() {
 
 	# we run into problems if -jN > -j1
 	# see #86245
-	MAKEOPTS="${MAKEOPTS} -j1"
+	# This should have long ago been fixed, commenting out
+	#MAKEOPTS="${MAKEOPTS} -j1"
 
 	einfo "Make"
 	emake || die "Failed to build MPlayer!"
@@ -457,7 +480,7 @@ src_install() {
 		 install || die "Failed to install MPlayer!"
 	einfo "Make install completed"
 
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS Changelog README
 	# Install the documentation; DOCS is all mixed up not just html
 	if use doc ; then
 		find "${S}/DOCS" -type d | xargs -- chmod 0755
@@ -486,7 +509,7 @@ src_install() {
 		doins ${FILESDIR}/mplayer.desktop
 	fi
 
-	if ! use truetype; then
+	if ! use srt && ! use truetype; then
 		dodir /usr/share/mplayer/fonts
 		local x=
 		# Do this generic, as the mplayer people like to change the structure
@@ -503,6 +526,14 @@ src_install() {
 	insinto /etc
 	newins ${S}/etc/example.conf mplayer.conf
 
+	if use srt || use truetype;	then
+		cat >> ${D}/etc/mplayer.conf << EOT
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+EOT
+	fi
+
 	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
 
 	#mv the midentify script to /usr/bin for emovix.