fixed mmx bug, added 3dfx support

7 files changed, 65 insertions, 448 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index d98bb4647fc0..16668764320f 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.2 2002/02/17 15:30:23 azarah Exp $
+
+  17 Feb 2002; M.Schlemmer <azarah@gentoo.org> mplayer-0.60-r2.ebuild :
+
+  Make DVD support default.  Changed the USE flag for DVD decription from
+  'decss' to 'css'.  Added 3DFX support with the '3dfx' use variable. Fixed
+  a problem where if 'sse' or '3dnow' was in USE, but now MMX, sound would be
+  distorted .. this should resolve bug #536.
 
 *mplayer-0.60-r1 (1 Feb 2002)
 
diff --git a/media-video/mplayer/files/digest-mplayer-0.50-r2 b/media-video/mplayer/files/digest-mplayer-0.50-r2
deleted file mode 100644
index 032a82531c5b..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.50-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b8c4fc82db0571a237bbed81c602d48c MPlayer-0.50.tar.bz2 1275743
-MD5 fe5d70fb6d2c2d1291940f947e12d471 default.tar.bz2 166257
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
diff --git a/media-video/mplayer/files/digest-mplayer-0.50-r3 b/media-video/mplayer/files/digest-mplayer-0.50-r3
deleted file mode 100644
index 032a82531c5b..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.50-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b8c4fc82db0571a237bbed81c602d48c MPlayer-0.50.tar.bz2 1275743
-MD5 fe5d70fb6d2c2d1291940f947e12d471 default.tar.bz2 166257
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
diff --git a/media-video/mplayer/files/digest-mplayer-0.60 b/media-video/mplayer/files/digest-mplayer-0.60-r2
index 7af23c4ed86a..7af23c4ed86a 100644
--- a/media-video/mplayer/files/digest-mplayer-0.60
+++ b/media-video/mplayer/files/digest-mplayer-0.60-r2
diff --git a/media-video/mplayer/mplayer-0.50-r2.ebuild b/media-video/mplayer/mplayer-0.50-r2.ebuild
deleted file mode 100644
index e8036719106b..000000000000
--- a/media-video/mplayer/mplayer-0.50-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer:  Desktop Team <desktop@cvs.gentoo.org>
-# Authors Bruce Locke <blocke@shivan.org>, Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.50-r2.ebuild,v 1.3 2001/11/18 21:45:59 azarah Exp $
-
-# Handle PREversions as well
-MY_PV="`echo ${PV} |sed -e 's/_//'`"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-# Only install Skin if GUI should be build (gtk as USE flag)
-SRC_URI="ftp://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
-	 gtk? ( ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2 )"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu"
-
-# Experimental USE flags dvd and decss
-DEPEND="virtual/glibc
-        dev-lang/nasm
-	app-arch/unzip
-        media-libs/win32codecs
-	>=media-libs/divx4linux-20011010
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
-	opengl? ( virtual/opengl )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-        esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )"
-
-RDEPEND="virtual/glibc
-        media-libs/win32codecs
-        >=media-libs/divx4linux-20011010
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
-	opengl? ( virtual/opengl )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-        gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-	esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )"
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix bug with the default Skin
-	cd ${WORKDIR}/default
-	patch <${FILESDIR}/default-skin.diff
-}
-
-src_compile() {
-
-	local myconf
-	use 3dnow  || myconf="${myconf} --disable-3dnow --disable-3dnowex"
-	use mmx    || myconf="${myconf} --disable-mmx --disable-mmx2"
-	use X      || myconf="${myconf} --disable-x11 --disable-xv"
-	# Try to fix bug where build will fail with gtk in USE, but not X
-	# NB: hope opengl, sdl, ggi build fine ... i will test later.
-	use gtk    && myconf="${myconf} --enable-gui --enable-x11 --enable-xv"
-	use oss    || myconf="${myconf} --disable-ossaudio"
-	use nls    || myconf="${myconf} --disable-nls"
-	use opengl || myconf="${myconf} --disable-gl"
-	use sdl    || myconf="${myconf} --disable-sdl"
-	use ggi    || myconf="${myconf} --disable-ggi"
-	use sse    || myconf="${myconf} --disable-sse"
-	use svga   || myconf="${myconf} --disable-svga"
-	use alsa   || myconf="${myconf} --disable-alsa"
-	use esd    || myconf="${myconf} --disable-esd"
-	use ogg    || myconf="${myconf} --disable-oggvorbis"
-	use decss  && myconf="${myconf} --enable-css"
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    ${myconf} || die
-		    
-	emake OPTFLAGS="${CFLAGS}" all || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr/share					\
-	     BINDIR=${D}/usr/bin					\
-	     mandir=${D}/usr/share/man					\
-	     install || die
-	
-	# MAN pages are already installed ...
-	rm DOCS/*.1
-	# Install the rest of the documentation
-	dodir /usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-	doalldocs
-
-	# Install the default Skin
-	if [ "`use gtk`" ] ; then
-	
-		insinto /usr/share/mplayer/Skin/default
-		doins ${WORKDIR}/default/*
-		
-		# Permissions is fried by default
-		chmod a+rx ${D}/usr/share/mplayer/Skin/default/
-		chmod a+r ${D}/usr/share/mplayer/Skin/default/*
-	fi
-
-	# Install the font used by OSD and the GUI
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
-	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	if [ "`use X`" ] ; then
-		if [ "`use gtk`" ] ; then
-			video="xv"
-		elif [ "`use sdl`" ] ; then
-			video="sdl"
-		elif [ "`use xv`" ] ; then
-			video="xv"
-		elif [ "`use opengl`" ] ; then
-			video="gl"
-		elif [ "`use ggi`" ] ; then
-			video="ggi"
-                elif [ "`use dga`" ] ; then
-                        video="dga"
-		else
-			video="x11"
-		fi
-	else
-		if [ "`use fbcon`" ] ; then
-			video="fbdev"
-                elif [ "`use svga`" ] ; then
-                        video="svga"
-		elif [ "`use aalib`" ] ; then
-			video="aa"
-		fi
-	fi
-	if [ "`use sdl`" ] ; then
-		audio="sdl"
-	elif [ "`use alsa`" ] ; then
-		audio="alsa"
-	elif [ "`use oss`" ] ; then
-		audio="oss"
-	fi
-	
-	# Note to myself:  do not change " into '
-	sed -e "s/vo=xv/vo=${video}/"					\
-	    -e "s/ao=oss/ao=${audio}/"					\
-	    -e 's/include =/#include =/'				\
-	    ${S}/etc/example.conf > ${T}/mplayer.conf
-
-	insinto /etc
-	doins ${T}/mplayer.conf 
-	
-	# Thanks goes to Mog for this one!
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-}
-
-pkg_postinst() {
-
-	echo
-	echo '######################################################################'
-	echo '# MPlayer users that are going to use the GUI, please note the       #'
-	echo '# following:                                                         #'
-	echo '#                                                                    #'
-	echo '#   The GUI works best with mplayer -vo xv -gui, but since there is  #'
-	echo '#   no USE flag for XVideo, or for using the GUI, the autodetection  #'
-	echo '#   process cannot detect this by default (SDL will be used rather). #'
-	echo '#   So, if your setup supports XVideo (xvinfo should give output),   #'
-	echo '#   maybe do something like:                                         #'
-	echo '#                                                                    #'
-	echo '#     echo "vo = xv" >~/.mplayer/config                              #'
-	echo '#     echo "gui = 1" >>~/.mplayer/config                             #'
-	echo '#                                                                    #'
-	echo '#   after launching mplayer for the first time.                      #'
-	echo '#                                                                    #'
-	echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-}
-
diff --git a/media-video/mplayer/mplayer-0.50-r3.ebuild b/media-video/mplayer/mplayer-0.50-r3.ebuild
deleted file mode 100644
index 103cc6912ba1..000000000000
--- a/media-video/mplayer/mplayer-0.50-r3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer:  Desktop Team <desktop@cvs.gentoo.org>
-# Authors Bruce Locke <blocke@shivan.org>, Martin Schlemmer <azarah@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.50-r2.ebuild,v 1.3 2001/11/18 21:45:59 azarah Exp
-
-# Handle PREversions as well
-MY_PV="`echo ${PV} |sed -e 's/_//'`"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-# Only install Skin if GUI should be build (gtk as USE flag)
-SRC_URI="ftp://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
-	 gtk? ( ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2 )"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu"
-
-# Experimental USE flags dvd and decss
-DEPEND="virtual/glibc
-        dev-lang/nasm
-	app-arch/unzip
-        media-libs/win32codecs
-	>=media-libs/divx4linux-20011010
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
-	opengl? ( virtual/opengl )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-        esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )"
-
-RDEPEND="virtual/glibc
-        media-libs/win32codecs
-        >=media-libs/divx4linux-20011010
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
-	opengl? ( virtual/opengl )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-        gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-	esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )"
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix bug with the default Skin
-	cd ${WORKDIR}/default
-	patch <${FILESDIR}/default-skin.diff
-
-	if [ "`use mga`" ] ; then
-		cd ${S}/drivers;
-		cp mga_vid.c mga_vid.c.orig
-		sed -e "s://#define MGA_ALLOW_IRQ:#define MGA_ALLOW_IRQ:" mga_vid.c.orig > mga_vid.c 
-	fi
-}
-
-src_compile() {
-
-	local myconf
-	use 3dnow  || myconf="${myconf} --disable-3dnow --disable-3dnowex"
-	use mmx    || myconf="${myconf} --disable-mmx --disable-mmx2"
-	use X      || myconf="${myconf} --disable-x11 --disable-xv"
-	# Try to fix bug where build will fail with gtk in USE, but not X
-	# NB: hope opengl, sdl, ggi build fine ... i will test later.
-	use gtk    && myconf="${myconf} --enable-gui --enable-x11 --enable-xv"
-	use oss    || myconf="${myconf} --disable-ossaudio"
-	use nls    || myconf="${myconf} --disable-nls"
-	use opengl || myconf="${myconf} --disable-gl"
-	use sdl    || myconf="${myconf} --disable-sdl"
-	use ggi    || myconf="${myconf} --disable-ggi"
-	use sse    || myconf="${myconf} --disable-sse"
-	use svga   || myconf="${myconf} --disable-svga"
-	use alsa   || myconf="${myconf} --disable-alsa"
-	use esd    || myconf="${myconf} --disable-esd"
-	use ogg    || myconf="${myconf} --disable-oggvorbis"
-	use decss  && myconf="${myconf} --enable-css"
-	use mga    && myconf="${myconf} --enable-mga"
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    ${myconf} || die
-		    
-	emake OPTFLAGS="${CFLAGS}" all || die
-	if [ "`use mga`" ] ; then
-		cd drivers
-		emake all
-	fi
-}
-
-src_install() {
-
-	make prefix=${D}/usr/share					\
-	     BINDIR=${D}/usr/bin					\
-	     mandir=${D}/usr/share/man					\
-	     install || die
-	
-	# MAN pages are already installed ...
-	rm DOCS/*.1
-	# Install the rest of the documentation
-	dodir /usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-	doalldocs
-
-	# Install the default Skin
-	if [ "`use gtk`" ] ; then
-	
-		insinto /usr/share/mplayer/Skin/default
-		doins ${WORKDIR}/default/*
-		
-		# Permissions is fried by default
-		chmod a+rx ${D}/usr/share/mplayer/Skin/default/
-		chmod a+r ${D}/usr/share/mplayer/Skin/default/*
-	fi
-
-	# Install the font used by OSD and the GUI
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
-	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	if [ "`use X`" ] ; then
-		if [ "`use gtk`" ] ; then
-			video="xv"
-		elif [ "`use sdl`" ] ; then
-			video="sdl"
-		elif [ "`use xv`" ] ; then
-			video="xv"
-		elif [ "`use opengl`" ] ; then
-			video="gl"
-		elif [ "`use ggi`" ] ; then
-			video="ggi"
-                elif [ "`use dga`" ] ; then
-                        video="dga"
-		else
-			video="x11"
-		fi
-	else
-		if [ "`use fbcon`" ] ; then
-			video="fbdev"
-                elif [ "`use svga`" ] ; then
-                        video="svga"
-		elif [ "`use aalib`" ] ; then
-			video="aa"
-		fi
-	fi
-	if [ "`use sdl`" ] ; then
-		audio="sdl"
-	elif [ "`use alsa`" ] ; then
-		audio="alsa"
-	elif [ "`use oss`" ] ; then
-		audio="oss"
-	fi
-	
-	# Note to myself:  do not change " into '
-	sed -e "s/vo=xv/vo=${video}/"					\
-	    -e "s/ao=oss/ao=${audio}/"					\
-	    -e 's/include =/#include =/'				\
-	    ${S}/etc/example.conf > ${T}/mplayer.conf
-
-	insinto /etc
-	doins ${T}/mplayer.conf 
-	
-	# Thanks goes to Mog for this one!
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-
-	if ["`use mga`" ] ; then
-		cp drivers/mga_vid.o ${D}/lib/modules/`uname -r`/kernel/drivers/char/
-	fi
-}
-
-pkg_postinst() {
-
-	echo
-	echo '######################################################################'
-	echo '# MPlayer users that are going to use the GUI, please note the       #'
-	echo '# following:                                                         #'
-	echo '#                                                                    #'
-	echo '#   The GUI works best with mplayer -vo xv -gui, but since there is  #'
-	echo '#   no USE flag for XVideo, or for using the GUI, the autodetection  #'
-	echo '#   process cannot detect this by default (SDL will be used rather). #'
-	echo '#   So, if your setup supports XVideo (xvinfo should give output),   #'
-	echo '#   maybe do something like:                                         #'
-	echo '#                                                                    #'
-	echo '#     echo "vo = xv" >~/.mplayer/config                              #'
-	echo '#     echo "gui = 1" >>~/.mplayer/config                             #'
-	echo '#                                                                    #'
-	echo '#   after launching mplayer for the first time.                      #'
-	echo '#                                                                    #'
-	echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-	depmod -a
-}
-
diff --git a/media-video/mplayer/mplayer-0.60.ebuild b/media-video/mplayer/mplayer-0.60-r2.ebuild
index ff30c2d30064..e192065c08fc 100644
--- a/media-video/mplayer/mplayer-0.60.ebuild
+++ b/media-video/mplayer/mplayer-0.60-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.60.ebuild,v 1.5 2002/01/14 02:45:27 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.60-r2.ebuild,v 1.1 2002/02/17 15:30:23 azarah Exp $
 
 # Handle PREversions as well
 MY_PV=${PV/_/}
@@ -18,19 +18,19 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 # 'encode' in USE for MEncoder
 # Experimental USE flags dvd and decss
 RDEPEND="virtual/glibc
-        >=media-libs/win32codecs-${PV}
+	>=media-libs/win32codecs-${PV}
 	>=media-libs/divx4linux-20011025
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
+	media-libs/libdvdread
+	css?    ( media-libs/libdvdcss )
 	opengl? ( virtual/opengl )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-        esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )
+	sdl?    ( media-libs/libsdl )
+	ggi?    ( media-libs/libggi )
+	svga?   ( media-libs/svgalib )
+	X?      ( virtual/x11 )
+	gtk?    ( >=x11-libs/gtk+-1.2.10-r4 )
+	esd?    ( media-sound/esound )
+	alsa?   ( media-libs/alsa-lib )
+	ogg?    ( media-libs/libogg )
 	encode? ( media-sound/lame )"
 
 DEPEND="${RDEPEND}
@@ -56,30 +56,38 @@ src_unpack() {
 
 src_compile() {
 
-	local myconf
-	use 3dnow  || myconf="${myconf} --disable-3dnow --disable-3dnowex"
-	use mmx    || myconf="${myconf} --disable-mmx --disable-mmx2"
-	use X      || myconf="${myconf} --disable-x11 --disable-xv --disable-xmga"
-	# Try to fix bug where build will fail with gtk in USE, but not X
-	# NB: hope opengl, sdl, ggi build fine ... i will test later.
-	use gtk    && myconf="${myconf} --enable-gui --enable-x11 --enable-xv"
-	use oss    || myconf="${myconf} --disable-ossaudio"
-	use nls    || myconf="${myconf} --disable-nls"
-	use opengl || myconf="${myconf} --disable-gl"
-	use sdl    || myconf="${myconf} --disable-sdl"
-	use ggi    || myconf="${myconf} --disable-ggi"
-	use sse    || myconf="${myconf} --disable-sse"
-	use svga   || myconf="${myconf} --disable-svga"
-	use alsa   || myconf="${myconf} --disable-alsa"
-	use esd    || myconf="${myconf} --disable-esd"
-	use ogg    || myconf="${myconf} --disable-oggvorbis"
-	use encode && myconf="${myconf} --enable-mencoder --enable-tv"
-	use encode || myconf="${myconf} --disable-mencoder"
-	use dvd    && myconf="${myconf} --enable-dvdread"
-	use decss  && myconf="${myconf} --enable-dvdread --enable-css"
-	use mga    && myconf="${myconf} --enable-mga"
-	use mga    && \
-	use X      && myconf="${myconf} --enable-xmga"
+	local myconf=""
+
+	use 3dnow         || myconf="${myconf} --disable-3dnow --disable-3dnowex"
+	use sse           || myconf="${myconf} --disable-sse --disable-sse2"
+	# Only disable MMX if 3DNOW or SSE is not in USE
+	use mmx           || { \
+	    use 3dnow     || { \
+	        use sse   || myconf="${myconf} --disable-mmx --disable-mmx2"
+	    }
+	    use sse       || { \
+	        use 3dnow || myconf="${myconf} --disable-mmx --disable-mmx2"
+	    }
+	}
+	# Only disable X if gtk is not in USE
+	use X             || { \
+	    use gtk       || myconf="${myconf} --disable-x11 --disable-xv --disable-xmga"
+	}
+	use gtk           && myconf="${myconf} --enable-gui --enable-x11 --enable-xv"
+	use oss           || myconf="${myconf} --disable-ossaudio"
+	use opengl        || myconf="${myconf} --disable-gl"
+	use sdl           || myconf="${myconf} --disable-sdl"
+	use ggi           || myconf="${myconf} --disable-ggi"
+	use svga          || myconf="${myconf} --disable-svga"
+	use alsa          || myconf="${myconf} --disable-alsa"
+	use ogg           || myconf="${myconf} --disable-vorbis"
+	use encode        && myconf="${myconf} --enable-mencoder --enable-tv"
+	use encode        || myconf="${myconf} --disable-mencoder"
+	use css           && myconf="${myconf} --enable-dvdread --enable-css"
+	use mga           && myconf="${myconf} --enable-mga"
+	use mga           && \
+	use X             && myconf="${myconf} --enable-xmga"
+	use 3dfx          && myconf="${myconf} --enable-3dfx --enable-tdfxfb"
 
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
@@ -88,10 +96,11 @@ src_compile() {
 	CFLAGS="-O2 -pipe"
 	CXXFLAGS="-O2 -pipe"
 	
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    ${myconf} || die
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-dvdread \
+		${myconf} || die
 		    
 	emake OPTFLAGS="${CFLAGS}" all || die
 	
@@ -103,10 +112,11 @@ src_compile() {
 
 src_install() {
 
-	make prefix=${D}/usr/share					\
-	     BINDIR=${D}/usr/bin					\
-	     CONFDIR=${D}/usr/share/mplayer				\
-	     mandir=${D}/usr/share/man					\
+	make prefix=${D}/usr/share \
+	     BINDIR=${D}/usr/bin \
+	     CONFDIR=${D}/usr/share/mplayer \
+	     DATADIR=${D}/usr/share/mplayer \
+	     mandir=${D}/usr/share/man \
 	     install || die
 	
 	# MAN pages are already installed ...
@@ -126,6 +136,7 @@ src_install() {
 		chmod a+r ${D}/usr/share/mplayer/Skin/default/*
 
 		# Fix the symlink
+		rm -rf ${D}/usr/bin/gmplayer
 		dosym /usr/bin/mplayer /usr/bin/gmplayer
 	fi
 	if [ "`use gnome`" ] ; then
@@ -139,6 +150,7 @@ src_install() {
 	# Install the font used by OSD and the GUI
 	dodir /usr/share/mplayer/fonts
 	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
+	rm -rf ${D}/usr/share/mplayer/font
 	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
 
 	# This tries setting up mplayer.conf automagically
@@ -171,7 +183,7 @@ src_install() {
 	if [ "`use sdl`" ] ; then
 		audio="sdl"
 	elif [ "`use alsa`" ] ; then
-		audio="alsa"
+		audio="alsa5"
 	elif [ "`use oss`" ] ; then
 		audio="oss"
 	fi