update to xine-lib-1-rc5

changes:
rc4a:
Some have experienced problems with rc4 due a bug managing the colorkey
overlay for XV (XVideo). With some video cards (most notably Matrox), it
caused parts of the image to not be displayed properly. These bugs have
now been fixed. Others have experienced compilation problems in our
previous releases resulting in static noise being produced for WMA streams.
This has also been fixed in rc4a.
Users of 5.1 and other audio surround setups will need to reconfigure their
xine settings. A newer, more user-friendly, "Speaker arrangement" config
item is now provided and must be used.
rc5:
xine-lib 1-rc5 contains important fixes from our previous release,
most notably compilation fixes for AMD64 plataform, fixed
downloading of reference files (asx, rm, etc) with HTTP, some
crashes with win32 DLLs and playback issues of some MPEG streams.
There are cool new features as well, like the surround 5.1 upmix
plugin and MacOS X support.

3 files changed, 35 insertions, 35 deletions

diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 54bdf8d1d0a..b367ccefbf9 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2004/03/28 20:14:22 mycroft Exp $
+$NetBSD: patch-ag,v 1.4 2004/06/21 15:55:55 drochner Exp $
 
---- configure.ac.orig	2004-03-16 21:44:17.000000000 +0000
-+++ configure.ac	2004-03-28 02:13:31.000000000 +0000
-@@ -347,6 +347,9 @@
+--- configure.ac.orig	2004-06-21 01:39:04.000000000 +0200
++++ configure.ac
+@@ -351,6 +351,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -12,25 +12,25 @@ $NetBSD: patch-ag,v 1.3 2004/03/28 20:14:22 mycroft Exp $
  
  dnl ---------------------------------------------
  dnl IPv6
-@@ -385,7 +388,7 @@
- AC_CHECK_LIB(GL, glBegin,
- 	[AC_CHECK_HEADER(GL/gl.h,
-              [ ac_have_opengl="yes"
--               OPENGL_LIBS="-lGL" 
-+               OPENGL_LIBS="-lGL -lm" 
- 	       AC_CHECK_LIB(glut, glutInit, dnl check for glut
- 	                    [ ac_have_glut="yes"
-                               GLUT_LIBS="-lglut"
-@@ -403,7 +406,7 @@
-              ],
- 	[])],
-    [],
--   [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS])
-+   [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS])
- AC_SUBST(OPENGL_LIBS)
- AC_SUBST(GLUT_LIBS)
- AC_SUBST(GLU_LIBS)
-@@ -580,8 +583,7 @@
+@@ -398,7 +401,7 @@ case "$host" in
+ 	AC_CHECK_LIB(GL, glBegin,
+ 		[AC_CHECK_HEADER(GL/gl.h,
+ 		     [ ac_have_opengl="yes"
+-		       OPENGL_LIBS="-lGL" 
++		       OPENGL_LIBS="-lGL -lm" 
+ 		       AC_CHECK_LIB(glut, glutInit, dnl check for glut
+ 				    [ ac_have_glut="yes"
+ 				      GLUT_LIBS="-lglut"
+@@ -416,7 +419,7 @@ case "$host" in
+ 		     ],
+ 		[])],
+ 	   [],
+-	   [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS])
++	   [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS])
+ 	;;
+ esac
+ 
+@@ -596,8 +599,7 @@ dnl Checks for Xinerama extension
  dnl ---------------------------------------------
  
  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
@@ -40,7 +40,7 @@ $NetBSD: patch-ag,v 1.3 2004/03/28 20:14:22 mycroft Exp $
                ac_have_xinerama="yes"],,
               [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
  dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
-@@ -993,9 +995,10 @@
+@@ -1031,9 +1033,10 @@ dnl ------------------------------------
  dnl gnome-vfs support
  dnl ---------------------------------------------
  
diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am
index 047e45d22e0..c87336b0ba2 100644
--- a/multimedia/xine-lib/patches/patch-am
+++ b/multimedia/xine-lib/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2004/05/12 16:37:07 drochner Exp $
+$NetBSD: patch-am,v 1.3 2004/06/21 15:55:55 drochner Exp $
 
---- src/libw32dll/wine/ldt_keeper.c.orig	2004-05-12 18:33:31.000000000 +0200
-+++ src/libw32dll/wine/ldt_keeper.c	2004-05-12 18:41:51.000000000 +0200
-@@ -152,18 +152,9 @@
+--- src/libw32dll/wine/ldt_keeper.c.orig	2004-06-13 01:19:56.000000000 +0200
++++ src/libw32dll/wine/ldt_keeper.c
+@@ -155,18 +155,9 @@ void Setup_FS_Segment(void)
  
  void Check_FS_Segment(void)
  {
@@ -16,7 +16,7 @@ $NetBSD: patch-am,v 1.2 2004/05/12 16:37:07 drochner Exp $
 -    
 -    if( fs != teb_sel ) {
 -      printf("ldt_keeper: FS segment is not set or has being lost!\n");
--      printf("            Please report this error to xine-devel@sourceforge.net\n");
+-      printf("            Please report this error to xine-devel@lists.sourceforge.net\n");
 -      printf("            Aborting....\n");
 -      abort();
 -    }
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index 06e77cfd234..3aead6ee22f 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,16 +1,16 @@
-$NetBSD: patch-ao,v 1.2 2004/03/11 17:26:02 jmmv Exp $
+$NetBSD: patch-ao,v 1.3 2004/06/21 15:55:55 drochner Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2003-12-28 16:25:04.000000000 +0100
-+++ src/libw32dll/wine/Makefile.in
-@@ -219,6 +219,7 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
+--- src/libw32dll/wine/Makefile.in.orig	2004-05-12 16:54:20.000000000 +0200
++++ src/libw32dll/wine/Makefile.in	2004-05-17 21:28:41.000000000 +0200
+@@ -327,6 +327,7 @@
  VORBIS_LIBS = @VORBIS_LIBS@
  W32DLL_DEP = @W32DLL_DEP@
  W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
 +WINE_LIBS = @WINE_LIBS@
+ XGETTEXT = @XGETTEXT@
  XINE_ACFLAGS = @XINE_ACFLAGS@
  XINE_BIN_AGE = @XINE_BIN_AGE@
- XINE_BUILD_CC = @XINE_BUILD_CC@
-@@ -329,7 +330,7 @@ CONFIG_CLEAN_FILES =
+@@ -476,7 +477,7 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  
  libwine_la_LDFLAGS =