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.

7 files changed, 49 insertions, 49 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index cbd50892f8a..77a0537f35b 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/05/29 17:21:16 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/06/21 15:55:54 drochner Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		1
-
 .if ${MACHINE_ARCH} == "i386"
 DEPENDS+=       	win32-codecs>=011227:../../multimedia/win32-codecs
 PLIST_SUBST+=		I386=""
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index cda05993aa0..273573961c2 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.9 2004/05/12 16:37:07 drochner Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/06/21 15:55:54 drochner Exp $
 #
 
-DISTNAME=		xine-lib-1-rc4
-PKGNAME=		xine-lib-1rc4
+DISTNAME=		xine-lib-1-rc5
+PKGNAME=		xine-lib-1rc5
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index a9d9d79e560..faa65ae7c7c 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2004/05/29 02:14:27 reed Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2004/06/21 15:55:55 drochner Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -36,6 +36,8 @@ lib/libxine.so
 lib/libxine.so.9
 lib/libxine.so.9.1
 lib/pkgconfig/libxine.pc
+lib/xine/plugins/1.0.0/post/xineplug_post_audio_filter_upmix.a
+lib/xine/plugins/1.0.0/post/xineplug_post_audio_filter_upmix.so
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.a
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
 lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.a
@@ -185,7 +187,6 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
 man/man1/xine-config.1
 share/aclocal/xine.m4
 share/doc/xine/README
-share/doc/xine/README.config_en
 share/doc/xine/README.dvb
 share/doc/xine/README.dxr3
 share/doc/xine/README.freebsd
@@ -200,6 +201,7 @@ share/doc/xine/hackersguide/architecture.png
 share/doc/xine/hackersguide/hackersguide.html
 share/doc/xine/hackersguide/library.png
 share/doc/xine/hackersguide/overlays.png
+share/doc/xine/hackersguide/post_frame.png
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 4f3c3873d85..15d5ea337f0 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.5 2004/05/12 16:37:07 drochner Exp $
+$NetBSD: distinfo,v 1.6 2004/06/21 15:55:55 drochner Exp $
 
-SHA1 (xine-lib-1-rc4.tar.gz) = 1cf447ce447a5572e40aea9fa25e19f73ba2decf
-Size (xine-lib-1-rc4.tar.gz) = 6788315 bytes
+SHA1 (xine-lib-1-rc5.tar.gz) = b38aa71ab717ba04f03591d1d003da4ce23ed1cf
+Size (xine-lib-1-rc5.tar.gz) = 7052663 bytes
 SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519
 SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
-SHA1 (patch-ag) = 23fca3bd89be1f852456d31e46f6449b577c0dad
+SHA1 (patch-ag) = bc7374182a0812baf619e9648c608f1b80982b67
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
 SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99
-SHA1 (patch-am) = 98d95c618ee15df9ff592b3a677387507841c2d7
-SHA1 (patch-ao) = d4cbdf5da7c912b4306681032d6d964b84760909
+SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
+SHA1 (patch-ao) = aa9fbe13b00f6e8bbf1857b4d29147dc63bbc8d4
 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
 SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded
 SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
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 =