new version

6 files changed, 52 insertions, 311 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index cc347984e9c8..970bbee8fb72 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2002/10/12 19:38:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.36 2002/10/27 19:36:26 azarah Exp $
+
+*mplayer-0.90_pre9 (27 Oct 2002)
+
+  27 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  New version.
 
 *mplayer-0.90_pre8-r1 (12 Oct 2002)
 
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre8 b/media-video/mplayer/files/digest-mplayer-0.90_pre8
deleted file mode 100644
index 1c4c958ce0fc..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre8
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 8c844865b05574a1cfb2813e8487d21b MPlayer-0.90pre8.tar.bz2 2692566
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 a5e01dd5fe14d2418a6ee349ff7a1c4b mp-arial-iso-8859-2.zip 255907
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre7 b/media-video/mplayer/files/digest-mplayer-0.90_pre9
index a045ca31684a..f618df9a03e4 100644
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre7
+++ b/media-video/mplayer/files/digest-mplayer-0.90_pre9
@@ -1,4 +1,4 @@
-MD5 09a601241ba87c04d103b7afffb72def MPlayer-0.90pre7.tar.bz2 2623243
+MD5 527fe1559507f60bbbf9d887d07a0ea9 MPlayer-0.90pre9.tar.bz2 2758568
 MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
 MD5 a5e01dd5fe14d2418a6ee349ff7a1c4b mp-arial-iso-8859-2.zip 255907
 MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/mplayer-0.90_pre9-no-dvd.patch b/media-video/mplayer/files/mplayer-0.90_pre9-no-dvd.patch
new file mode 100644
index 000000000000..46bd58b80afc
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-0.90_pre9-no-dvd.patch
@@ -0,0 +1,19 @@
+--- MPlayer-0.90pre9/Gui/mplayer/mw.h.orig	2002-10-27 21:04:25.000000000 +0200
++++ MPlayer-0.90pre9/Gui/mplayer/mw.h	2002-10-27 21:07:38.000000000 +0200
+@@ -457,8 +457,15 @@
+ 	  default: movie_aspect=-1;
+ 	 }
+ 	wsClearWindow( appMPlayer.subWindow );
++#ifdef USE_DVDREAD
+ 	if ( guiIntfStruct.StreamType == STREAMTYPE_DVD ) goto play_dvd_2;
+-	 else guiIntfStruct.FilenameChanged=1;
++	 else
++	  {
++#endif
++		guiIntfStruct.FilenameChanged=1;
++#ifdef USE_DVDREAD
++	  }
++#endif
+ 	break;
+ 
+ // --- timer events
diff --git a/media-video/mplayer/mplayer-0.90_pre8.ebuild b/media-video/mplayer/mplayer-0.90_pre8.ebuild
deleted file mode 100644
index 6067d7555695..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre8.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre8.ebuild,v 1.7 2002/10/24 23:23:45 blizzy Exp $
-
-IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb"
-
-# NOTE to myself:  Test this thing with and without dvd/gtk+ support,
-#                  as it seems the mplayer guys dont really care to
-#                  make it work without dvd support.
-
-# Handle PREversions as well
-MY_PV=${PV/_/}
-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
-	ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-2.zip
-	gtk? ( mirror://gentoo/distfiles/default-skin-0.1.tar.bz2 )"
-#	 This is to get the digest problem fixed.
-#	 gtk? ( ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2 )"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-# If 'dvd' in USE, only DEPEND on libdvdnav, as
-# we use libdvdkit that comes with.
-RDEPEND="x86? ( >=media-libs/divx4linux-20020418 )
-	x86? ( >=media-libs/win32codecs-0.60 )
-	dvd? ( media-libs/libdvdnav )
-	gtk? ( =x11-libs/gtk+-1.2*
-	       media-libs/libpng ) 
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib
-	       media-libs/libungif )
-	truetype? ( >=media-libs/freetype-2.1 )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame 
-	          >=media-libs/libdv-0.9.5 )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	>=sys-apps/portage-2.0.36"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2
-
-	use truetype || unpack mp-arial-iso-8859-1.zip mp-arial-iso-8859-2.zip
-
-	# Fix bug with the default Skin
-	if [ -n "`use gtk`" ]
-	then
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
-	fi
-}
-
-src_compile() {
-
-	use matrox && check_KV
-        
-	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"
-
-	# Only disable X if gtk is not in USE
-	use X || use gtk \
-		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
-		                     --disable-xmga --disable-png"
-	
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-	
-	use gif \
-		|| myconf="${myconf} --disable-gif"
-
-	use matrox && use X \
-		&& myconf="${myconf} --enable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 \
-		                     --enable-xv --enable-vm --enable-png"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
-	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 directfb \
-		|| myconf="${myconf} --disable-directfb"
-
-	use fbcon \
-		|| myconf="${myconf} --disable-fbdev"
-
-	use alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit --enable-dvdnav" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread \
-		                     --disable-css --disable-dvdnav"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	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
-	# optimizations, so extra should not be needed and is not
-	# recommended by the authors
-	unset CFLAGS CXXFLAGS
-	./configure --prefix=/usr \
-		--datadir=/usr/share/mplayer \
-		--confdir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-linux-devfs \
-		${myconf} || die
-
-	# emake borks on fast boxes - Azarah (07 Aug 2002)
-	make all || die
-	
-	if [ -n "`use matrox`" ]
-	then
-		cd drivers 
-		make all || die
-	fi
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/lib \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die
-
-	# Some stuff like transcode can use this one.
-	if [ -f ${S}/postproc/libpostproc.a ]
-	then
-		dolib ${S}/postproc/libpostproc.a
-		insinto /usr/include
-		doins ${S}/postproc/postprocess.h
-	fi
-
-	# Install the documentation
-	dohtml -r ${S}/DOCS/*
-
-	# Install the default Skin and Gnome menu entry
-	if [ -n "`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/*
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym /usr/bin/mplayer /usr/bin/gmplayer
-	fi
-
-	if [ -n "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/icon.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	# Install the font used by OSD and the GUI
-	if [ -z "`use truetype`" ]
-	then
-		dodir /usr/share/mplayer/fonts
-		cp -a ${WORKDIR}/iso-8859-[12]/ ${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
-	elif [ -f /usr/X11R6/lib/X11/fonts/truetype/arial.ttf ]
-	then
-		# For freetype we need a real truetype font in place ...
-		dosym /usr/X11R6/lib/X11/fonts/truetype/arial.ttf \
-			/usr/share/mplayer/subfont.ttf
-	fi
-
-	# This tries setting up mplayer.conf automagically
-	local video="" audio="sdl"
-	if [ -n "`use X`" ]
-	then
-		[ -z "${video}" ] && use sdl && video="sdl"
-		[ -z "${video}" ] && use xv && video="xv"
-		[ -z "${video}" ] && use opengl && video="gl"
-		[ -z "${video}" ] && use ggi && video="ggi"
-		[ -z "${video}" ] && use dga && video="dga"
-		[ -z "${video}" ] && video="x11"
-	else
-		[ -z "${video}" ] && use fbcon && video="fbdev"
-		[ -z "${video}" ] && use svga && video="svga"
-		[ -z "${video}" ] && use aalib && video="aa"
-		[ -z "${video}" ] && video="vesa"
-	fi
-
-	if [ -n "`use sdl`" ]
-	then
-		audio="sdl"
-	elif [ -n "`use alsa`" ]
-	then
-		if [ -e /usr/lib/libasound.so.2 ]
-		then
-			audio="alsa9"
-		else
-			audio="alsa5"
-		fi
-	elif [ -n "`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
-	dosym /etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-	
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-
-	if [ -n "`use matrox`" ]
-	then
-		check_KV
-		insinto /lib/modules/${KV}/kernel/drivers/char
-		doins ${S}/drivers/mga_vid.o
-	fi
-}
-
-pkg_postinst() {
-
-	if [ -n "`use truetype`" ]
-	then
-		einfo "Please note that with the new freetype support you need to"
-		einfo "copy a truetype (.ttf) font to ~/.mplayer/subfont.ttf"
-	fi
-
-	depmod -a &>/dev/null || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_pre7.ebuild b/media-video/mplayer/mplayer-0.90_pre9.ebuild
index 44a7bfbe1d66..0a205cf3f26a 100644
--- a/media-video/mplayer/mplayer-0.90_pre7.ebuild
+++ b/media-video/mplayer/mplayer-0.90_pre9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre7.ebuild,v 1.8 2002/10/24 23:23:45 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre9.ebuild,v 1.1 2002/10/27 19:36:26 azarah Exp $
 
 IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb"
 
@@ -9,12 +9,12 @@ IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv
 #                  make it work without dvd support.
 
 # Handle PREversions as well
-MY_PV=${PV/_/}
+MY_PV="${PV/_/}"
 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
-	ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-2.zip
+SRC_URI="http://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
+	http://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
+	http://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-2.zip
 	gtk? ( mirror://gentoo/distfiles/default-skin-0.1.tar.bz2 )"
 #	 This is to get the digest problem fixed.
 #	 gtk? ( ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2 )"
@@ -37,13 +37,18 @@ RDEPEND="x86? ( >=media-libs/divx4linux-20020418 )
 	ggi? ( media-libs/libggi )
 	sdl? ( media-libs/libsdl )
 	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
 	svga? ( media-libs/svgalib )
 	encode? ( media-sound/lame 
 	          >=media-libs/libdv-0.9.5 )
 	opengl? ( virtual/opengl )
 	directfb? ( dev-libs/DirectFB )
 	oggvorbis? ( media-libs/libvorbis )
+	nls? ( sys-devel/gettext )
+	media-sound/cdparanoia
 	>=sys-apps/portage-2.0.36"
+# Hardcode paranoia support for now, as there is no
+# related USE flag.
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
@@ -51,7 +56,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
+KEYWORDS="~x86 ~ppc"
 
 
 src_unpack() {
@@ -67,6 +72,9 @@ src_unpack() {
 		cd ${WORKDIR}/default
 		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
 	fi
+
+	# Fix compile without dvd support
+	cd ${S}; patch -p1 < ${FILESDIR}/${P}-no-dvd.patch || die
 }
 
 src_compile() {
@@ -96,8 +104,9 @@ src_compile() {
 	use gif \
 		|| myconf="${myconf} --disable-gif"
 
-	use matrox && use X \
-		&& myconf="${myconf} --enable-xmga"
+	( use matrox && use X ) \
+		&& myconf="${myconf} --enable-xmga" \
+		|| myconf="${myconf} --disable-xmga"
 
 	use gtk \
 		&& myconf="${myconf} --enable-gui --enable-x11 \
@@ -131,6 +140,9 @@ src_compile() {
 	use alsa \
 		|| myconf="${myconf} --disable-alsa"
 
+	use nas \
+		|| myconf="${myconf} --disable-nas"
+
 	use oggvorbis \
 		|| myconf="${myconf} --disable-vorbis"
 
@@ -150,6 +162,10 @@ src_compile() {
 	use 3dfx \
 		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
 
+	use nls \
+		&& myconf="${myconf} --enable-i18n" \
+		|| myconf="${myconf} --disable-i18n"
+
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
 	# optimizations, so extra should not be needed and is not
@@ -275,6 +291,7 @@ src_install() {
 	
 	insinto /usr/share/mplayer
 	doins ${S}/etc/codecs.conf
+	doins ${S}/etc/input.conf
 
 	if [ -n "`use matrox`" ]
 	then