Update to 0.9.9.

7 files changed, 58 insertions, 41 deletions

diff --git a/multimedia/libxine/files/patch-Makefile.am b/multimedia/libxine/files/patch-Makefile.am
new file mode 100644
index 000000000000..ac4a8416b18c
--- /dev/null
+++ b/multimedia/libxine/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Thu May 16 23:50:02 2002
++++ Makefile.am	Thu May 16 23:50:14 2002
+@@ -4,7 +4,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.3
+ 
+-SUBDIRS = doc m4 intl po misc include src
++SUBDIRS = doc intl po misc include src
+ 
+ EXTRA_DIST = cvscompile.sh automake.diff \
+              debian/README.Debian debian/changelog debian/control \
diff --git a/multimedia/libxine/files/patch-src:input:Makefile.am b/multimedia/libxine/files/patch-src:input:Makefile.am
index 261585a13598..691b53444ddd 100644
--- a/multimedia/libxine/files/patch-src:input:Makefile.am
+++ b/multimedia/libxine/files/patch-src:input:Makefile.am
@@ -1,26 +1,25 @@
---- src/input/Makefile.am.orig	Sat Dec  8 09:36:21 2001
-+++ src/input/Makefile.am	Tue Dec 11 10:14:50 2001
-@@ -17,10 +17,10 @@
+--- src/input/Makefile.am.orig	Thu May 16 22:20:25 2002
++++ src/input/Makefile.am	Thu May 16 22:20:29 2002
+@@ -15,10 +15,9 @@
  if HAVE_CDROM_IOCTLS
  in_dvd = xineplug_inp_dvd.la
  in_vcd = xineplug_inp_vcd.la
 -in_cda = xineplug_inp_cda.la
-+#in_cda = xineplug_inp_cda.la
  endif
  
 -lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) $(in_cda) \
 +lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) \
  	xineplug_inp_stdin_fifo.la xineplug_inp_net.la \
- 	xineplug_inp_rtp.la xineplug_inp_http.la
+ 	xineplug_inp_rtp.la xineplug_inp_http.la xineplug_inp_mms.la
  
-@@ -45,8 +45,8 @@
- xineplug_inp_http_la_SOURCES = input_http.c
+@@ -53,10 +52,6 @@
+ xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c
+ xineplug_inp_http_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
  xineplug_inp_http_la_LDFLAGS = -avoid-version -module
- 
+-
 -xineplug_inp_cda_la_SOURCES = input_cda.c
+-xineplug_inp_cda_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 -xineplug_inp_cda_la_LDFLAGS = -avoid-version -module
-+#xineplug_inp_cda_la_SOURCES = input_cda.c
-+#xineplug_inp_cda_la_LDFLAGS = -avoid-version -module
  
  include_HEADERS = input_plugin.h
- noinst_HEADERS = dvd_udf.h read_cache.h
+ noinst_HEADERS = dvd_udf.h read_cache.h net_buf_ctrl.h mms.h
diff --git a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
index 8e8fa240fe90..5a1826987a2f 100644
--- a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
@@ -1,5 +1,5 @@
---- src/liba52/xine_decoder.c.orig	Sat Jan  5 21:43:16 2002
-+++ src/liba52/xine_decoder.c	Fri Apr  5 17:52:50 2002
+--- src/liba52/xine_decoder.c.orig	Sun Apr 28 22:57:28 2002
++++ src/liba52/xine_decoder.c	Thu May 16 22:16:31 2002
 @@ -36,8 +36,8 @@
  #include <fcntl.h>
  
@@ -11,7 +11,7 @@
  #include "buffer.h"
  #include "xine_internal.h"
  #include "xineutils.h"
-@@ -59,7 +59,7 @@
+@@ -58,7 +58,7 @@
    int              frame_length, frame_todo;
    uint16_t         syncword;
  
@@ -20,12 +20,12 @@
    int              a52_flags;
    int              a52_bit_rate;
    int              a52_sample_rate;
-@@ -158,8 +158,11 @@
+@@ -154,8 +154,11 @@
+   this->output_open   = 0;
    this->pts           = 0;
-   this->last_pts      = 0;
  
 -  if( !this->samples )
--    this->samples = a52_init (xine_mm_accel());
+-    this->samples = a52_init (xine_mm_accel(), &this->samples_base);
 +  this->a52_state = a52_init (xine_mm_accel());
 +
 +  if( (this->a52_state) != NULL )
@@ -34,7 +34,7 @@
  
    /*
     * find out if this driver supports a52 output
-@@ -288,7 +291,7 @@
+@@ -284,7 +287,7 @@
      
      a52_output_flags = this->a52_flags_map[this->a52_flags & A52_CHANNEL_MASK];
      
@@ -43,7 +43,7 @@
  		   this->frame_buffer, 
  		   &a52_output_flags,
  		   &level, 384)) {
-@@ -297,7 +300,7 @@
+@@ -293,7 +296,7 @@
      }
      
      if (this->disable_dynrng)
@@ -52,12 +52,12 @@
  
      this->have_lfe = a52_output_flags & A52_LFE;
      if (this->have_lfe)
-@@ -337,7 +340,7 @@
-     int_samples = buf->mem;
+@@ -334,7 +337,7 @@
+     buf->num_frames = 256*6;
  
      for (i = 0; i < 6; i++) {
 -      if (a52_block (&this->a52_state, this->samples)) {
 +      if (a52_block (this->a52_state)) {
  	printf ("liba52: a52_block error\n");
- 	return; 
-       }
+ 	buf->num_frames = 0;
+ 	break; 
diff --git a/multimedia/libxine/files/patch-src:libsputext:xine_decoder.c b/multimedia/libxine/files/patch-src:libsputext:xine_decoder.c
new file mode 100644
index 000000000000..e9b94f99831c
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libsputext:xine_decoder.c
@@ -0,0 +1,15 @@
+--- src/libsputext/xine_decoder.c.orig	Thu May 16 22:51:25 2002
++++ src/libsputext/xine_decoder.c	Thu May 16 22:51:33 2002
+@@ -36,11 +36,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+-#ifdef __FreeBSD__
+-# include <sys/iconv.h>
+-#else
+-# include <iconv.h>
+-#endif
++#include <iconv.h>
+ 
+ #include "buffer.h"
+ #include "events.h"
diff --git a/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am
deleted file mode 100644
index 604e19e594e6..000000000000
--- a/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/libw32dll/DirectShow/Makefile.am.orig	Fri Jan 11 04:59:50 2002
-+++ src/libw32dll/DirectShow/Makefile.am	Tue Jan 29 12:12:58 2002
-@@ -1,3 +1,4 @@
-+INCLUDES = @INCLUDES@ -I$(srcdir)/..
- 
- CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
- 	-Wmissing-prototypes -Wimplicit-function-declaration \
diff --git a/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am
deleted file mode 100644
index 52658e0cc015..000000000000
--- a/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libw32dll/wine/Makefile.am.orig	Fri Jan 11 04:59:51 2002
-+++ src/libw32dll/wine/Makefile.am	Mon Jan 28 23:07:30 2002
-@@ -4,6 +4,8 @@
- 
- ##
- ##
-+INCLUDES = @INCLUDES@ -I$(srcdir)/..
-+
- CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
- 	-Wmissing-prototypes -Wimplicit-function-declaration \
- 	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
diff --git a/multimedia/libxine/files/patch-video_out:video_out_syncfb.c b/multimedia/libxine/files/patch-video_out:video_out_syncfb.c
new file mode 100644
index 000000000000..79d7dfadf678
--- /dev/null
+++ b/multimedia/libxine/files/patch-video_out:video_out_syncfb.c
@@ -0,0 +1,10 @@
+--- src/video_out/video_out_syncfb.c.orig	Thu May 16 23:32:35 2002
++++ src/video_out/video_out_syncfb.c	Thu May 16 23:32:57 2002
+@@ -39,6 +39,7 @@
+ #include <sys/ioccom.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/shm.h>