fix bug with subtitles and region 4 dvds

8 files changed, 42 insertions, 290 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index b7349400ccca..7a6bcab92532 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.22 2002/06/10 12:06:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.23 2002/06/13 18:58:02 azarah Exp $
+
+*mplayer-0.90_pre5-r1 (13 Jun 2002)
+
+  13 Jun 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre5-r1 :
+
+  Fix missing subtitles for region 4 DVD's, bug #3679, thanks to report
+  from Bernardo S. A. Silva.
 
 *mplayer-0.90_pre5 (10 Jun 2002)
 
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre3-r1 b/media-video/mplayer/files/digest-mplayer-0.90_pre3-r1
deleted file mode 100644
index 5adb5ce1127e..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b41dc64edcce90554033c9a71e114115 MPlayer-0.90pre3.tar.bz2 2322749
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 9234ea2b1616a14cabd3933bbb87604f dxr3.patch 40778
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre4 b/media-video/mplayer/files/digest-mplayer-0.90_pre5-r1
index 3d99376473f0..5f7978a41b66 100644
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre4
+++ b/media-video/mplayer/files/digest-mplayer-0.90_pre5-r1
@@ -1,3 +1,3 @@
-MD5 987436bd5f94a718d4813a6c69f07625 MPlayer-0.90pre4.tar.bz2 2424843
+MD5 e5655c304af41b23701653eb7a810d3f MPlayer-0.90pre5.tar.bz2 2438747
 MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
 MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/mplayer-0.90_pre3-widget.patch b/media-video/mplayer/files/mplayer-0.90_pre3-widget.patch
deleted file mode 100644
index 577ffe8dc0c8..000000000000
--- a/media-video/mplayer/files/mplayer-0.90_pre3-widget.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Gui/mplayer/widgets.c.orig	Sun May  5 21:53:25 2002
-+++ Gui/mplayer/widgets.c	Sun May  5 21:54:24 2002
-@@ -25,6 +25,7 @@
- 
- #include "../../config.h"
- #include "../../help_mp.h"
-+#include "../../mp_msg.h"
- 
- GtkWidget     * SkinBrowser;
- GtkWidget     * PlayList;
diff --git a/media-video/mplayer/files/mplayer-0.90_pre4-widget.patch b/media-video/mplayer/files/mplayer-0.90_pre4-widget.patch
deleted file mode 100644
index 577ffe8dc0c8..000000000000
--- a/media-video/mplayer/files/mplayer-0.90_pre4-widget.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Gui/mplayer/widgets.c.orig	Sun May  5 21:53:25 2002
-+++ Gui/mplayer/widgets.c	Sun May  5 21:54:24 2002
-@@ -25,6 +25,7 @@
- 
- #include "../../config.h"
- #include "../../help_mp.h"
-+#include "../../mp_msg.h"
- 
- GtkWidget     * SkinBrowser;
- GtkWidget     * PlayList;
diff --git a/media-video/mplayer/files/mplayer-0.90_pre5-spudec.c.patch b/media-video/mplayer/files/mplayer-0.90_pre5-spudec.c.patch
new file mode 100644
index 000000000000..25895422299b
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-0.90_pre5-spudec.c.patch
@@ -0,0 +1,22 @@
+--- MPlayer-0.90pre5/spudec.c.orig	Wed May 29 21:27:06 2002
++++ MPlayer-0.90pre5/spudec.c	Thu Jun 13 20:52:03 2002
+@@ -448,7 +448,8 @@
+ #if 1
+   // check if we have a complete packet (unfortunatelly packet_size is bad
+   // for some disks)
+-  if (spu->packet_offset == spu->packet_size){
++//  if (spu->packet_offset == spu->packet_size){
++  {
+     unsigned int x=0,y;
+     while(x+4<=spu->packet_offset){
+       y=get_be16(spu->packet+x+2); // next control pointer
+@@ -469,7 +470,8 @@
+     }
+   }
+ #else
+-  if (spu->packet_offset == spu->packet_size) {
++//  if (spu->packet_offset == spu->packet_size) {
++  {
+     spudec_decode(spu, pts100);
+     spu->packet_offset = 0;
+   }
diff --git a/media-video/mplayer/mplayer-0.90_pre4.ebuild b/media-video/mplayer/mplayer-0.90_pre4.ebuild
deleted file mode 100644
index 8ec300f73775..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre4.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# 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.90_pre4.ebuild,v 1.2 2002/05/23 06:50:14 seemant Exp $
-
-# 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
-	 gtk? ( http://www.ibiblio.org/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
-RDEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/win32codecs-0.60
-	dvd? ( media-libs/libdvdread
-	       media-libs/libdvdcss )
-	gtk? ( =x11-libs/gtk+-1.2*
-	       media-libs/libpng )
-	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-1.9.10"
-
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-SLOT="0"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 mp-arial-iso-8859-1.zip
-
-	# Fix bug with the default Skin
-	use gtk && ( \
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
-	)
-
-	cd ${S}
-	# Fixes some compile problems, thanks to Gwenn Gueguen
-	patch -p0 <${FILESDIR}/${P}-widget.patch || die "widget patch failed"
-}
-
-src_compile() {
-
-	if use matrox; then
-	        check_KV
-	fi
-        
-	local myconf=""
-
-	# Some people have compile problems with the vidix stuff
-	myconf="${myconf} --disable-vidix"
-
-	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-x11 --disable-xv --disable-xmga --disable-png"
-
-	use matrox && use X \
-		&& myconf="${myconf} --enable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 --enable-xv --enable-png"
-
-	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-dvdread --enable-css" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread --disable-css"
-
-	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
-	CFLAGS="" \
-	CXXFLAGS="" \
-	./configure --prefix=/usr \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-linux-devfs \
-		${myconf} || die
-
-	CFLAGS="" \ 
-	CXXFLAGS="" \
-	emake all || die
-	
-	use matrox && ( \
-		cd drivers 
-		emake all || die
-	)
-}
-
-src_install() {
-
-	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 ...
-	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 and Gnome menu entry
-	use gtk && ( \
-		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
-	)
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/icon.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	)
-
-	# 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
-	local video="sdl" audio="sdl"
-	use X && (
-		use gtk && video="xv" \
-		|| use sdl && video="sdl" \
-		|| use xv && video="xv" \
-		|| use opengl && video="gl" \
-		|| use ggi && video="ggi" \
-		|| use dga && video="dga" \
-		|| video="x11"
-	) || (
-		use fbcon && video="fbdev" \
-		|| use svga && video="svga" \
-		|| use aalib && video="aa"
-	)
-
-	use sdl && audio="sdl" \
-	|| use alsa && (
-		[ -e /usr/lib/libasound.so.2 ] && audio="alsa9" \
-		|| audio="alsa5"
-	) || use oss audio="oss" \
-	
-	# 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 
-	
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-
-	use matrox && ( \
-		dodir /lib/modules/${KV}/kernel/drivers/char
-		cp ${S}/drivers/mga_vid.o ${D}/lib/modules/${KV}/kernel/drivers/char
-	)
-}
-
-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 '#                                                                    #'
-	use gtk &>/dev/null \
-		|| echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-	depmod -a
-}
diff --git a/media-video/mplayer/mplayer-0.90_pre3-r1.ebuild b/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild
index 01c42d58fba5..49de573c5eb7 100644
--- a/media-video/mplayer/mplayer-0.90_pre3-r1.ebuild
+++ b/media-video/mplayer/mplayer-0.90_pre5-r1.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.90_pre3-r1.ebuild,v 1.3 2002/05/23 06:50:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild,v 1.1 2002/06/13 18:58:03 azarah Exp $
 
 # Handle PREversions as well
 MY_PV=${PV/_/}
@@ -9,7 +9,6 @@ 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://ftp.mplayerhq.hu/MPlayer/patches/dxr3.patch
 	 gtk? ( http://www.ibiblio.org/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 )"
@@ -56,6 +55,13 @@ src_unpack() {
 	cd ${S}
 	# Fixes some compile problems, thanks to Gwenn Gueguen
 	patch -p0 <${FILESDIR}/${P}-widget.patch || die "widget patch failed"
+	# Fixes include problem - Azarah (10 Jun 2002)
+	patch -p1 <${FILESDIR}/${P}-stream-include.patch || die
+	# Fixes install location for vidix drivers, thanks to Mezei Zoltan.
+	patch -p1 <${FILESDIR}/${P}-vidix-destpath.patch || die
+	# Fix missing subtitles for some regions (4), bug #3679, thanks
+	# to Bernardo Silva
+	patch -p1 <${FILESDIR}/${P}-spudec.c.patch || die
 }
 
 src_compile() {
@@ -67,7 +73,7 @@ src_compile() {
 	local myconf=""
 
 	# Some people have compile problems with the vidix stuff
-	myconf="${myconf} --disable-vidix"
+#	myconf="${myconf} --disable-vidix"
 
 	use 3dnow \
 		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
@@ -155,8 +161,9 @@ src_compile() {
 
 src_install() {
 
-	make prefix=${D}/usr/share \
+	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 \