[MPlayer-dev-eng] Some misc patches to fix compile/install issues in general

[Martin Schlemmer]

Hi

I am responsible for keeping MPlayer in a general working order
in Gentoo Linux (http://www.gentoo.org/).

Since MPlayer-0.90_pre4 (or maybe pre3 or earlier?) I had to apply a few
patches to have it working smoothly for all our users, and thought to
bring them to the attention of the MPlayer developers for review.

All the patches are attatched to this message, but if need be, I can
upload them to the ftp (they are small).

>From the source root they can be applied:
=========================================

# patch -p0 < mplayer-0.90_pre5-widget.patch

# patch -p1 < mplayer-0.90_pre6-stream-include.patch

# patch -p1 < mplayer-0.90_pre5-vidix-destpath.patch

# patch -p1 < mplayer-0.90_pre5-spudec.c.patch

# patch -p1 < mplayer-0.90_pre6-vidix-fail-install.patch

# patch -p1 < mplayer-0.90_pre6-no-dvd.patch


Description of what they do (short):
====================================

/* Fixes some include problems during compile, thanks
 * to Gwenn Gueguen
 */
mplayer-0.90_pre5-widget.patch

/* Fixes include problem - Azarah (10 Jun 2002)
 * Update for pre6 - Azarah (07 Aug 2002)
 */
mplayer-0.90_pre6-stream-include.patch

/* Fixes install location for vidix drivers, thanks
 * to Mezei Zoltan.
 */
mplayer-0.90_pre5-vidix-destpath.patch

/* Fix missing subtitles for some regions (4), bug #3679, thanks
 * to Bernardo Silva
 */
mplayer-0.90_pre5-spudec.c.patch

/* Fixes intermittant problems where vidix drivers do not get build,
 * and causes the install to fail - Azarah (06 Aug 2002)
 */
mplayer-0.90_pre6-vidix-fail-install.patch

/* Fixes compile problems if dvd support disabled.
 * Azarah (07 Aug 2002)
 */
mplayer-0.90_pre6-no-dvd.patch


NOTE: they do apply to current CVS snapshot.


Thanks,

-- 

Martin Schlemmer
Gentoo Linux Developer, Desktop Team Developer
Cape Town, South Africa

-------------- next part --------------
--- 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;
-------------- next part --------------
--- MPlayer-0.90pre5/Gui/mplayer/play.c	Mon Jun 10 11:39:17 2002
+++ MPlayer-0.90pre5.azarah/Gui/mplayer/play.c	Mon Jun 10 11:39:38 2002
@@ -10,6 +10,7 @@
 #include "../../help_mp.h"
 #include "../../libvo/x11_common.h"
 #include "../../input/input.h"
+#include "../../libmpdemux/stream.h"
 
 #include "../app.h"
 
--- MPlayer-0.90pre6/Gui/mplayer/gtk/pl.c.orig	Wed Aug  7 08:30:16 2002
+++ MPlayer-0.90pre6/Gui/mplayer/gtk/pl.c	Wed Aug  7 08:30:54 2002
@@ -13,6 +13,8 @@
 #include "../../../config.h"
 #include "../../../help_mp.h"
 
+#include "../../../libmpdemux/stream.h"
+
 #include "../../interface.h"
 #include "../widgets.h"
 #include "pl.h"
-------------- next part --------------
--- MPlayer-0.90pre5/vidix/drivers/Makefile.orig	Mon Jun 10 11:48:02 2002
+++ MPlayer-0.90pre5/vidix/drivers/Makefile	Mon Jun 10 11:48:54 2002
@@ -120,11 +120,11 @@
 # do nothing here
 
 install:
-	mkdir -p $(BINDIR)
-	install -m 755 -s -p *.so $(BINDIR)
+	mkdir -p $(LIBDIR)/mplayer/vidix
+	install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix
 uninstall:
-	rm -f $(BINDIR)/*.so
-	rmdir -p --ignore-fail-on-non-empty $(BINDIR)
+	rm -f $(LIBDIR)/mplayer/vidix/*.so
+	rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix
 
 #
 # include dependency files if they exist
-------------- next part --------------
--- 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;
   }
-------------- next part --------------
--- MPlayer-0.90pre6/vidix/drivers/Makefile.orig	Tue Aug  6 23:08:46 2002
+++ MPlayer-0.90pre6/vidix/drivers/Makefile	Tue Aug  6 23:10:51 2002
@@ -109,7 +109,7 @@
 
 install:
 	mkdir -p $(LIBDIR)/mplayer/vidix
-	install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix
+	install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix || :
 uninstall:
 	rm -f $(LIBDIR)/mplayer/vidix/*.so
 	rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix
-------------- next part --------------
--- MPlayer-0.90pre6/Gui/mplayer/play.c.orig	Wed Aug  7 08:28:50 2002
+++ MPlayer-0.90pre6/Gui/mplayer/play.c	Wed Aug  7 08:29:16 2002
@@ -108,9 +108,11 @@
      guiIntfStruct.TimeSec=0;
      guiIntfStruct.Position=0;
      guiIntfStruct.AudioType=0;
+#ifdef USE_DVDREAD
      guiIntfStruct.DVD.current_title=1;
      guiIntfStruct.DVD.current_chapter=1;
      guiIntfStruct.DVD.current_angle=1;
+#endif
 
      if ( !appMPlayer.subWindow.isFullScreen )
       {