xine-lib (1-rc3c)

  * fix the deadlock with non-seekable input plugins
  * guess codeset for OSD if nl_langinfo(CODESET) is missing or not working
  * new option - list of domains, where don't use proxy
  * fix possible crashes in front-ends that create and delete streams
  * send a message to the front-end when the audio device is busy
  * revert changes to the DVD plugin that made it impossible to play mounted
    DVDs
  * use xine network functions in CDDB lookups, fix connection timeout
  * preparing for future MinGW port
  * improved network buffer management policy.
  * asf/mmst/mmsh proper support for "media changing" command.
  * improve playback with separate subtitles, fix the seeking and a deadlock
  * DVD still menus fixed that were broken in rc3b
[Note: The way the previous was "fixed" is a kluge.]
  * deadlocks with network buffer control fixed
  * DXR3's letterboxed overlay mode works with pan&scan material
  * DXR3: timestamp handling for NAV packets fixes the menu on the first
    DVD of "24" season 1
  * fixed audio sync method "resampling"

5 files changed, 17 insertions, 19 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 518ef28da5f..6a161a22013 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/16 14:44:32 mycroft Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	1
-
 .if ${MACHINE_ARCH} == "i386"
 DEPENDS+=       	win32-codecs>=011227:../../multimedia/win32-codecs
 PLIST_SRC=		${PKGDIR}/PLIST.i386
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 826567150f4..d53fe9fd138 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2004/03/28 20:14:22 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/04/16 14:44:32 mycroft Exp $
 #
 
-DISTNAME=		xine-lib-1-rc3b
-PKGNAME=		xine-lib-1rc3b
+DISTNAME=		xine-lib-1-rc3c
+PKGNAME=		xine-lib-1rc3c
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/multimedia/xine-lib/buildlink2.mk b/multimedia/xine-lib/buildlink2.mk
index d11619ef045..acd0cced8df 100644
--- a/multimedia/xine-lib/buildlink2.mk
+++ b/multimedia/xine-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/04/16 14:44:32 mycroft Exp $
 #
 # This Makefile fragment is included by packages that use xine-lib.
 #
@@ -7,7 +7,7 @@
 XINE_LIB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xine-lib
-BUILDLINK_DEPENDS.xine-lib?=		xine-lib>=1rc3bnb1
+BUILDLINK_DEPENDS.xine-lib?=		xine-lib>=1rc3c
 BUILDLINK_PKGSRCDIR.xine-lib?=		../../multimedia/xine-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xine-lib=xine-lib
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index b47b654947c..6c132ae261a 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/16 14:44:32 mycroft Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxine-lib}
 BUILDLINK_PACKAGES+=	xine-lib
 
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3bnb1
+BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3c
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 .endif	# XINE_LIB_BUILDLINK3_MK
 
diff --git a/multimedia/xine-lib/patches/patch-aa b/multimedia/xine-lib/patches/patch-aa
index 5fd1e44f5c9..f44c17401d3 100644
--- a/multimedia/xine-lib/patches/patch-aa
+++ b/multimedia/xine-lib/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2004/03/11 17:26:02 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
 
---- src/xine-engine/video_decoder.c.orig	2003-12-08 11:36:27.000000000 +0100
-+++ src/xine-engine/video_decoder.c
-@@ -41,6 +41,10 @@
- #include "xineutils.h"
- #include <sched.h>
+--- src/xine-engine/video_decoder.c.orig	2004-04-08 16:03:42.000000000 +0000
++++ src/xine-engine/video_decoder.c	2004-04-16 14:29:15.000000000 +0000
+@@ -43,6 +43,10 @@
+ 
+ #define SPU_SLEEP_INTERVAL (90000/2)
  
 +#ifndef SCHED_OTHER
 +#define SCHED_OTHER 0
 +#endif
 +
+ 
  static void update_spu_decoder (xine_stream_t *stream, int type) {
  
-   int streamtype = (type>>16) & 0xFF;
-@@ -390,7 +394,9 @@ void _x_video_decoder_init (xine_stream_
+@@ -443,7 +447,9 @@
    } else {
       
      pthread_attr_t       pth_attrs;
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2004/03/11 17:26:02 jmmv Exp $
      int		       err, num_buffers;
      /* The fifo size is based on dvd playback where buffers are filled
       * with 2k of data. With 500 buffers and a typical video data rate
-@@ -411,10 +417,12 @@ void _x_video_decoder_init (xine_stream_
+@@ -464,10 +470,12 @@
      stream->spu_track_map_entries = 0;
    
      pthread_attr_init(&pth_attrs);