new mplayer release, cleanups

6 files changed, 197 insertions, 189 deletions

diff --git a/media-video/mplayer/files/digest-mplayer-0.18_pre b/media-video/mplayer/files/digest-mplayer-0.18_pre
deleted file mode 100644
index 791df2e132f7..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.18_pre
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc86cd8cdc61d6aea243c6e539b5df2e MPlayer-0.18pre.tgz
diff --git a/media-video/mplayer/files/digest-mplayer-0.18_pre-r1 b/media-video/mplayer/files/digest-mplayer-0.18_pre-r1
deleted file mode 100644
index 791df2e132f7..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.18_pre-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc86cd8cdc61d6aea243c6e539b5df2e MPlayer-0.18pre.tgz
diff --git a/media-video/mplayer/files/digest-mplayer-0.50_pre3 b/media-video/mplayer/files/digest-mplayer-0.50_pre3
new file mode 100644
index 000000000000..8b1cb064a3a8
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-0.50_pre3
@@ -0,0 +1,4 @@
+MD5 52532a9def8d6870928cc16d367f67ea MPlayer-0.50pre3.tar.bz2
+MD5 fe5d70fb6d2c2d1291940f947e12d471 default.tar.bz2
+MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip
+MD5 acf35b2fc004a89c829531555d73f1e6 divx.dll
diff --git a/media-video/mplayer/mplayer-0.18_pre-r1.ebuild b/media-video/mplayer/mplayer-0.18_pre-r1.ebuild
deleted file mode 100644
index 78a1f73b568e..000000000000
--- a/media-video/mplayer/mplayer-0.18_pre-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Authors Bruce Locke <blocke@shivan.org>, Martin Schlemmer <azarah@gentoo.org>
-#         Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.18_pre-r1.ebuild,v 1.2 2001/09/28 18:50:23 azarah Exp $
-
-MY_P="MPlayer-0.18pre"
-S=${WORKDIR}/${MY_P}?
-DESCRIPTION="Media Player for Linux"
-SRC_URI="http://mp.dev.hu/MPlayer/releases/${MY_P}.tgz"
-HOMEPAGE="http://mplayer.sourceforge.net"
-
-DEPEND="virtual/glibc
-        dev-lang/nasm
-        media-libs/win32codecs
-        opengl? ( media-libs/mesa )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-        esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="virtual/glibc
-         media-libs/win32codecs
-         opengl? ( media-libs/mesa )
-         sdl? ( media-libs/libsdl )
-         ggi? ( media-libs/libggi )
-         svga? ( media-libs/svgalib )
-         X? ( virtual/x11 )
-         esd? ( media-sound/esound )
-         alsa? ( media-libs/alsa-lib )"
-
-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"
-	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"
-
-	./configure --mandir=/usr/share/man --prefix=/usr --host=${CHOST} ${myconf} || die
-	make OPTFLAGS="${CFLAGS}" all || die
-}
-
-src_install() {
-	make prefix=${D}/usr/share BINDIR=${D}/usr/bin install || die
-	mkdir -p ${D}/usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-
-	# Install a wrapper for mplayer to handle the codecs.conf
-	mv ${D}/usr/bin/mplayer ${D}/usr/bin/mplayer-bin
-	exeinto /usr/bin ; doexe ${FILESDIR}/mplayer
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	if [ "`use X`" ] ; then
-		if [ "`use sdl`" ] ; then
-			video="sdl"
-		elif [ "`use ggi`" ] ; then
-			video="ggi"
-		elif [ "`use opengl`" ] ; then
-			video="gl"
-		else
-			video="x11"
-		fi
-	else
-		if [ "`use fbcon`" ] ; then
-			video="fbdev"
-		elif [ "`use svga`" ] ; then
-			video="svga"
-		fi
-	fi
-	if [ "`use sdl`" ] ; then
-		audio="sdl"
-	elif [ "`use alsa`" ] ; then
-		audio="alsa"
-	elif [ "`use oss`" ] ; then
-		audio="oss"
-	fi
-	sed -e "s/vo=sdl/vo=${video}/" -e "s/ao=sdl/ao=${audio}/" ${FILESDIR}/mplayer.conf > mplayer.conf
-
-	insinto /etc
-	doins mplayer.conf ${FILESDIR}/codecs.conf
-}
diff --git a/media-video/mplayer/mplayer-0.18_pre.ebuild b/media-video/mplayer/mplayer-0.18_pre.ebuild
deleted file mode 100644
index ee42ebdf5fcf..000000000000
--- a/media-video/mplayer/mplayer-0.18_pre.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.18_pre.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-MY_P="MPlayer-0.18pre"
-S=${WORKDIR}/${MY_P}?
-DESCRIPTION="Media Player for Linux"
-SRC_URI="http://mp.dev.hu/MPlayer/releases/${MY_P}.tgz"
-HOMEPAGE="http://mplayer.sourceforge.net"
-
-DEPEND="opengl? ( media-libs/mesa ) sdl? ( media-libs/libsdl ) \
-	ggi? ( media-libs/libggi ) svga? ( media-libs/svgalib ) \
-	X? ( virtual/x11 ) esd? ( media-sound/esound ) \
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="$DEPEND"
-
-
-src_compile() {
-
-  local myconf
-  local myprefix
-  myprefix="/usr/X11R6"
-  
-  if [ -z "`use nls`" ] ; then
-	myconf="${myconf} --disable-nls"
-  fi
-
-  if [ -z "`use opengl`" ] ; then
-	myconf="${myconf} --disable-gl"
-  fi
-
-  if [ -z "`use sdl`" ] ; then
-	myconf="${myconf} --disable-sdl"
-  fi
-
-  if [ -z "`use ggi`" ] ; then
-	myconf="${myconf} --disable-ggi"
-  fi
-
-  if [ -z "`use mmx`" ] ; then
-	myconf="${myconf} --disable-mmx --disable-mmx2"
-  fi
-
-  if [ -z "`use 3dnow`" ] ; then
-	myconf="${myconf} --disable-3dnow --disable-3dnowex"
-  fi
-
-  if [ -z "`use sse`" ] ; then
-	myconf="${myconf} --disable-sse"
-  fi
-
-  if [ -z "`use svga`" ] ; then
-	myconf="${myconf} --disable-svga"
-  fi
-
-  if [ -z "`use X`" ] ; then
-	myconf="${myconf} --disable-x11 --disable-xv"
-  	myprefix="/usr"
-  fi
-
-  if [ -z "`use oss`" ] ; then
-	myconf="${myconf} --disable-ossaudio"
-  fi
-
-  if [ -z "`use alsa`" ] ; then
-	myconf="${myconf} --disable-alsa"
-  fi
-
-  if [ -z "`use esd`" ] ; then
-	myconf="${myconf} --disable-esd"
-  fi
-
-  try ./configure --mandir=/usr/share/man --prefix=`cat ${T}/myprefix` --host=${CHOST} ${myconf}
-
-  try make OPTFLAGS="${CFLAGS}" all
-
-  echo "${myprefix}" > ${T}/myprefix
-
-}
-
-src_install() {
-  make prefix=${D}/`cat ${T}/myprefix` install
-
-  if [ -f ${D}/usr/X11R6/bin/fibmap_mplayer ] ; then
-	dodir /usr/bin
-	mv ${D}/usr/X11R6/bin/fibmap_mplayer ${D}/usr/bin
-  fi
-
-  rm DOCS/*.1
-  dodoc DOCS/*
-}
-
diff --git a/media-video/mplayer/mplayer-0.50_pre3.ebuild b/media-video/mplayer/mplayer-0.50_pre3.ebuild
new file mode 100644
index 000000000000..eb69570daa7f
--- /dev/null
+++ b/media-video/mplayer/mplayer-0.50_pre3.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Authors Bruce Locke <blocke@shivan.org>, Martin Schlemmer <azarah@gentoo.org>,
+#         Donny Davies <woodchip@gentoo.org>
+
+MY_P="MPlayer-0.50pre"
+PRE_VERSION="3"
+S=${WORKDIR}/${MY_P}?
+
+# Only install Skin if GUI should be build (gtk as USE flag)
+if [ "`use gtk`" ] ; then
+	A="${MY_P}${PRE_VERSION}.tar.bz2 default.tar.bz2 mp-arial-iso-8859-1.zip divx.dll"
+	SRC_URI="ftp://mplayerhq.hu/MPlayer/releases/${A}
+		 ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2
+		 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
+		 http://mplayerhq.hu/MPlayer/releases/divx.dll"
+else		  
+        A="${MY_P}${PRE_VERSION}.tar.bz2 mp-arial-iso-8859-1.zip divx.dll"
+        SRC_URI="ftp://mplayerhq.hu/MPlayer/releases/${A}
+                 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
+		 http://mplayerhq.hu/MPlayer/releases/divx.dll"
+fi
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu"
+
+# Experimental USE flags dvd and decss
+DEPEND="virtual/glibc
+        dev-lang/nasm
+        media-libs/win32codecs
+	>=media-libs/divx4linux-20010824
+        dvd? ( media-libs/libdvdread )
+        decss? ( media-libs/libdvdcss )
+	opengl? ( media-libs/mesa )
+        sdl? ( media-libs/libsdl )
+        ggi? ( media-libs/libggi )
+        svga? ( media-libs/svgalib )
+        X? ( virtual/x11 )
+	gtk? ( x11-libs/gtk+ )
+        esd? ( media-sound/esound )
+        alsa? ( media-libs/alsa-lib )
+	ogg? ( media-libs/libogg )"
+
+RDEPEND="virtual/glibc
+        media-libs/win32codecs
+        >=media-libs/divx4linux-20010824
+        dvd? ( media-libs/libdvdread )
+        decss? ( media-libs/libdvdcss )
+	opengl? ( media-libs/mesa )
+        sdl? ( media-libs/libsdl )
+        ggi? ( media-libs/libggi )
+        svga? ( media-libs/svgalib )
+        X? ( virtual/x11 )
+        gtk? ( x11-libs/gtk+ )
+	esd? ( media-sound/esound )
+        alsa? ( media-libs/alsa-lib )
+	ogg? ( media-libs/libogg )"
+
+
+src_unpack() {
+
+	if [ "`use gtk`" ] ; then
+		unpack ${MY_P}${PRE_VERSION}.tar.bz2 default.tar.bz2 \
+			mp-arial-iso-8859-1.zip
+	else
+		unpack ${MY_P}${PRE_VERSION}.tar.bz2 mp-arial-iso-8859-1.zip
+	fi
+
+	# 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"
+	use gtk    && myconf="${myconf} --enable-gui"
+	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 --mandir=/usr/share/man --prefix=/usr --host=${CHOST} ${myconf} || die
+	emake OPTFLAGS="${CFLAGS}" all || die
+	
+}
+
+src_install() {
+
+	make prefix=${D}/usr/share BINDIR=${D}/usr/bin 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}
+
+	# 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 sdl`" ] ; then
+			video="sdl"
+		elif [ "`use ggi`" ] ; then
+			video="ggi"
+		elif [ "`use xv`" ] ; then
+			video="xv"
+                elif [ "`use dga`" ] ; then
+                        video="dga"
+		elif [ "`use opengl`" ] ; then
+			video="gl"
+		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
+	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
+
+	# Install the new divx.dll
+	insinto /usr/lib/win32
+	doins /usr/portage/distfiles/divx.dll
+	
+}
+
+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 you 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
+
+}
+