Update to 1.0. (At last!)

1 files changed, 43 insertions, 30 deletions

diff --git a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
index 47ff6e57de68..83330e62a7b8 100644
--- a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
@@ -1,33 +1,46 @@
---- src/libreal/xine_decoder.c.orig	Mon Dec 15 07:13:24 2003
-+++ src/libreal/xine_decoder.c	Mon Jan 12 00:04:26 2004
-@@ -589,24 +589,15 @@
+--- 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
+@@ -47,6 +47,14 @@
+ #include "buffer.h"
+ #include "xineutils.h"
  
-     /* try some auto-detection */
++#if defined(__FreeBSD__)
++void ___brk_addr(void) {exit(0);}
++void __ctype_b(void) {exit(0);}
++char **__environ={NULL};
++#undef stderr
++FILE *stderr=NULL;
++#endif
++
+ typedef struct {
+   video_decoder_class_t   decoder_class;
  
--    if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
-+    if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
-       config->update_string (config, "codec.real_codecs_path", 
--			     "/usr/local/RealPlayer8/Codecs");
--    if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
-+			     "/usr/local/lib/RealPlayer8/Codecs");
-+    if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
-       config->update_string (config, "codec.real_codecs_path", 
--			     "/usr/RealPlayer8/Codecs");
--    if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
-+			     "/usr/local/lib/RealPlayer9/users/Real/Codecs");
-+    if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
-       config->update_string (config, "codec.real_codecs_path", 
--			     "/usr/lib/RealPlayer8/Codecs");
--    if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--      config->update_string (config, "codec.real_codecs_path", 
--			     "/opt/RealPlayer8/Codecs");
--    if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
--      config->update_string (config, "codec.real_codecs_path", 
--			     "/usr/lib/RealPlayer9/users/Real/Codecs");
--    if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
--      config->update_string (config, "codec.real_codecs_path", 
--			     "/usr/lib/win32");
-+			     "/usr/local/lib/win32");
-   }
+@@ -589,22 +597,12 @@
  
-   lprintf ("real codec path : %s\n",  real_codec_path);
+   /* try some auto-detection */
+ 
+-  if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/usr/local/RealPlayer8/Codecs";
+-  if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/usr/RealPlayer8/Codecs";
+-  if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/usr/lib/RealPlayer8/Codecs";
+-  if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/opt/RealPlayer8/Codecs";
+-  if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
+-    default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
+-    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/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)) 
++    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
++  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)) 
++    default_real_codec_path = "/usr/local/lib/win32";
+   
+   real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
+ 					     default_real_codec_path,