7 files changed, 48 insertions, 84 deletions

diff --git a/multimedia/libxine/files/extra-patch-src:input:input_cdda.c b/multimedia/libxine/files/extra-patch-src:input:input_cdda.c
deleted file mode 100644
index 16e13737b59a..000000000000
--- a/multimedia/libxine/files/extra-patch-src:input:input_cdda.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/input/input_cdda.c.orig	Sat Oct  4 01:35:54 2003
-+++ src/input/input_cdda.c	Sat Nov 15 21:05:51 2003
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <dirent.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -666,18 +667,26 @@
-   unsigned char *data) {
- 
-   int fd = this_gen->fd;
-+#if  __FreeBSD_version < 501106
-   struct ioc_read_audio cdda;
-+#endif
- 
-   while( num_frames ) {
-+#if  __FreeBSD_version < 501106
-     cdda.address_format = CD_MSF_FORMAT;
-     cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND;
-     cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE;
-     cdda.address.msf.frame = frame % CD_FRAMES_PER_SECOND;
-     cdda.nframes = 1;
-     cdda.buffer = data;
-+#endif
- 
-+#if  __FreeBSD_version >= 501106
-+    if (pread(fd, data, CD_RAW_FRAME_SIZE, frame * CD_RAW_FRAME_SIZE) != CD_RAW_FRAME_SIZE) {
-+#else
-     /* read a frame */
-     if(ioctl(fd, CDIOCREADAUDIO, &cdda) < 0) {
-+#endif
-       perror("CDIOCREADAUDIO");
-       return -1;
-     }
diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure
index 478c788bafaa..e836de8831af 100644
--- a/multimedia/libxine/files/patch-configure
+++ b/multimedia/libxine/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Nov 15 02:57:21 2004
-+++ configure	Mon Nov 15 02:57:39 2004
-@@ -25382,7 +25382,7 @@
+--- configure.orig	Sun Dec 11 03:18:42 2005
++++ configure	Sun Dec 11 03:23:42 2005
+@@ -26269,7 +26269,7 @@
                   "ac_cv_lib_avcodec_pp_get_context" \
                   "ac_cv_lib_postproc_pp_get_context" \
                   "ac_cv_lib_avcodec_register_avcodec"; do
@@ -9,3 +9,12 @@
          done
  
                  if test "${ac_cv_header_avcodec_h+set}" = set; then
+@@ -26804,7 +26804,7 @@
+       fi
+     else
+             CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
+-      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
++      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}"
+       cat >conftest.$ac_ext <<_ACEOF
+ #include <avcodec.h>
+ #include <postprocess.h>
diff --git a/multimedia/libxine/files/patch-src:input:input_cdda.c b/multimedia/libxine/files/patch-src:input:input_cdda.c
index 20bb278984eb..a0e655ea642b 100644
--- a/multimedia/libxine/files/patch-src:input:input_cdda.c
+++ b/multimedia/libxine/files/patch-src:input:input_cdda.c
@@ -1,11 +1,11 @@
---- src/input/input_cdda.c.orig	Mon Oct 10 00:51:19 2005
-+++ src/input/input_cdda.c	Mon Oct 10 00:52:58 2005
-@@ -1473,7 +1473,7 @@
-     return;
-   }
-   else {
--    fprintf(fd, filecontent);
-+    fprintf(fd, "%s", filecontent);
-     fclose(fd);
-   }
-   
+--- src/input/input_cdda.c.orig	Sun Dec 11 03:34:00 2005
++++ src/input/input_cdda.c	Sun Dec 11 03:34:07 2005
+@@ -32,7 +32,7 @@
+ #include <unistd.h>
+ 
+ #include <sys/types.h>
+-#ifdef SYS_PARAM_H
++#ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+ #ifdef HAVE_DIRENT_H
diff --git a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
index ae36d5b7838a..a642a0744ac0 100644
--- a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
+++ b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
@@ -1,5 +1,5 @@
---- src/libreal/audio_decoder.c.orig	Thu Dec 16 22:59:10 2004
-+++ src/libreal/audio_decoder.c	Thu Dec 30 08:55:14 2004
+--- src/libreal/audio_decoder.c.orig	Sun Oct 23 07:09:47 2005
++++ src/libreal/audio_decoder.c	Sun Dec 11 02:49:37 2005
 @@ -48,6 +48,14 @@
  #include "buffer.h"
  #include "xineutils.h"
@@ -15,7 +15,7 @@
  typedef struct {
    audio_decoder_class_t   decoder_class;
  
-@@ -709,22 +717,12 @@
+@@ -709,24 +717,12 @@
  
    /* try some auto-detection */
  
@@ -33,13 +33,15 @@
 -    default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
 -  if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/usr/lib/codecs";
 -  if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/win32";
-+  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
++  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
 +    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
++  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
 +    default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
++  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
 +    default_real_codec_path = "/usr/local/lib/win32";
    
    real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
diff --git a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
index 83330e62a7b8..829547cfcf88 100644
--- a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
@@ -1,5 +1,5 @@
---- src/libreal/xine_decoder.c.orig	Thu Dec 16 22:59:10 2004
-+++ src/libreal/xine_decoder.c	Thu Dec 30 08:56:38 2004
+--- src/libreal/xine_decoder.c.orig	Thu Oct 27 23:58:56 2005
++++ src/libreal/xine_decoder.c	Sun Dec 11 02:52:23 2005
 @@ -47,6 +47,14 @@
  #include "buffer.h"
  #include "xineutils.h"
@@ -15,7 +15,7 @@
  typedef struct {
    video_decoder_class_t   decoder_class;
  
-@@ -589,22 +597,12 @@
+@@ -589,25 +597,13 @@
  
    /* try some auto-detection */
  
@@ -33,14 +33,18 @@
 -    default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
 -  if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/usr/lib/codecs";
 -  if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/win32";
-+  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
+-  
++  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
 +    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
++  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
 +    default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
++  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
 +    default_real_codec_path = "/usr/local/lib/win32";
-   
++
    real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
  					     default_real_codec_path,
+ 					     _("path to RealPlayer codecs"),
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
index fc1444e3d60f..98e41c4f0d4d 100644
--- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
@@ -1,11 +1,12 @@
---- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig	Sat Sep 17 01:51:42 2005
-+++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h	Sat Sep 17 01:52:41 2005
-@@ -1,7 +1,6 @@
--#include <malloc.h>
-+#include <stdlib.h>
+--- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig	Sat Jul 30 03:14:40 2005
++++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h	Sun Dec 11 02:54:16 2005
+@@ -1,8 +1,6 @@
  #include <string.h>
  #include <math.h>
+-#ifdef HAVE_MALLOC_H
 -#include <malloc.h>
+-#endif
++#include <stdlib.h>
  
  #define USE_FOR_DSCALER
  
diff --git a/multimedia/libxine/files/patch-src:video_out:video_out_xv.c b/multimedia/libxine/files/patch-src:video_out:video_out_xv.c
deleted file mode 100644
index 3740304d22ef..000000000000
--- a/multimedia/libxine/files/patch-src:video_out:video_out_xv.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/video_out/video_out_xv.c.orig	Wed Apr 28 01:56:34 2004
-+++ src/video_out/video_out_xv.c	Sun May  9 21:51:48 2004
-@@ -47,7 +47,11 @@
- #if defined (__SVR4) && defined (__sun)
- # include <sys/int_types.h>
- #else
--# include <stdint.h>
-+# if defined(HAVE_STDINT_H)
-+#  include <stdint.h>
-+# else
-+#  include <inttypes.h>
-+# endif
- #endif
- 
- #include <sys/types.h>