Update xine-lib to 1.0rc10.

Package changes are:
  * drop gnome-vfs dependency
  * use _POSIX_THREAD_PRIORITY_SCHEDULING for determining pthread
    capabilities (suggested by Nick Hudson)

xine-lib changes include:
  * loading and displaying png images (e.g. for logos)
  * capability of on-the-fly stream rewiring
  * libdvdnav: PGC based positioning:
    seeking on DVDs now spans the entire feature
  * font encoding cleanup (xinefonts use unicode now)
  * freetype2 support for OSD
  * ffmpeg sync (build 4663). WMV8 decoder enabled.
  * much more accurate time display with DVDs
  * xine health check fixes for non-mtrr machines
  * fixes for high-bandwidth RV30 streams
  * fix for vplayer format subtitles
  * fix for distorted display of some DVD menus
  * DVD title/part MRLs (dvd:/<title>.<part>) work much more reliable
  * OGM subtitles support
  * network controler improvements
  * generic error reporting mechanism using events
  * DVD: report the current menu type
  * DVD: menu calls ("Escape" in xine-ui) can now jump back from the
    menu into the movie as well

11 files changed, 82 insertions, 79 deletions

diff --git a/graphics/xine-lib/Makefile b/graphics/xine-lib/Makefile
index 242ff7285c7..284e8333b75 100644
--- a/graphics/xine-lib/Makefile
+++ b/graphics/xine-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/04/11 09:19:53 rh Exp $
 #
 
-DISTNAME=		xine-lib-1-beta9
+DISTNAME=		xine-lib-1-beta10
 PKGNAME=		${DISTNAME:S/-beta/.0rc/}
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -23,17 +23,22 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool-nofpic
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
+CONFIGURE_ENV+=		have_libpng="yes"
+CONFIGURE_ENV+=		PNG_CFLAGS="-I${PREFIX}/include"
+CONFIGURE_ENV+=		PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
 
+.include "../../audio/esound/buildlink2.mk"
+.include "../../audio/flac/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/SDL/buildlink2.mk"
-.include "../../audio/flac/buildlink2.mk"
-.include "../../audio/esound/buildlink2.mk"
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../graphics/xvidcore/buildlink2.mk"
 .include "../../graphics/aalib/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/Mesa/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xvidcore/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xine-lib/PLIST b/graphics/xine-lib/PLIST
index 81b83a2a0b3..d600719bcd9 100644
--- a/graphics/xine-lib/PLIST
+++ b/graphics/xine-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/06 11:06:01 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/04/11 09:19:53 rh Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -37,8 +37,8 @@ include/xine/xmlparser.h
 lib/libxine.a
 lib/libxine.la
 lib/libxine.so
-lib/libxine.so.5
-lib/libxine.so.5.0
+lib/libxine.so.6
+lib/libxine.so.6.0
 lib/pkgconfig/libxine.pc
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.a
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.la
@@ -91,6 +91,9 @@ lib/xine/plugins/1.0.0/xineplug_decode_gsm610.so
 lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.a
 lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.la
 lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.so
+lib/xine/plugins/1.0.0/xineplug_decode_image.a
+lib/xine/plugins/1.0.0/xineplug_decode_image.la
+lib/xine/plugins/1.0.0/xineplug_decode_image.so
 lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.a
 lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.la
 lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.so
@@ -187,6 +190,9 @@ lib/xine/plugins/1.0.0/xineplug_dmx_fli.so
 lib/xine/plugins/1.0.0/xineplug_dmx_games.a
 lib/xine/plugins/1.0.0/xineplug_dmx_games.la
 lib/xine/plugins/1.0.0/xineplug_dmx_games.so
+lib/xine/plugins/1.0.0/xineplug_dmx_image.a
+lib/xine/plugins/1.0.0/xineplug_dmx_image.la
+lib/xine/plugins/1.0.0/xineplug_dmx_image.so
 lib/xine/plugins/1.0.0/xineplug_dmx_mng.a
 lib/xine/plugins/1.0.0/xineplug_dmx_mng.la
 lib/xine/plugins/1.0.0/xineplug_dmx_mng.so
@@ -241,9 +247,6 @@ lib/xine/plugins/1.0.0/xineplug_inp_dvd.so
 lib/xine/plugins/1.0.0/xineplug_inp_file.a
 lib/xine/plugins/1.0.0/xineplug_inp_file.la
 lib/xine/plugins/1.0.0/xineplug_inp_file.so
-lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.a
-lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.la
-lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.so
 lib/xine/plugins/1.0.0/xineplug_inp_http.a
 lib/xine/plugins/1.0.0/xineplug_inp_http.la
 lib/xine/plugins/1.0.0/xineplug_inp_http.so
@@ -305,6 +308,7 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxine1.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libxine1.mo
diff --git a/graphics/xine-lib/buildlink2.mk b/graphics/xine-lib/buildlink2.mk
index 9ea68e54368..8f4426c4d72 100644
--- a/graphics/xine-lib/buildlink2.mk
+++ b/graphics/xine-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/06 11:06:01 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/04/11 09:19:53 rh 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>=1.0rc9
+BUILDLINK_DEPENDS.xine-lib?=		xine-lib>=1.0rc10
 BUILDLINK_PKGSRCDIR.xine-lib?=		../../graphics/xine-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xine-lib=xine-lib
diff --git a/graphics/xine-lib/distinfo b/graphics/xine-lib/distinfo
index 4fddbfbf7fe..8b9a4add91f 100644
--- a/graphics/xine-lib/distinfo
+++ b/graphics/xine-lib/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/06 11:06:01 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/04/11 09:19:53 rh Exp $
 
-SHA1 (xine-lib-1-beta9.tar.gz) = 15b8152f39552df45a4f12376c146f1f0fcdee84
-Size (xine-lib-1-beta9.tar.gz) = 3756004 bytes
-SHA1 (patch-aa) = 7b5aa3e5ab697765c3f5499e870c81954b2cf955
-SHA1 (patch-ab) = 92456071cf79bc6c786343757d7eb5fd1466e4e1
+SHA1 (xine-lib-1-beta10.tar.gz) = 7e3274691e5ea85d20acb1a1fdc2f4a31954697b
+Size (xine-lib-1-beta10.tar.gz) = 3799902 bytes
+SHA1 (patch-aa) = 5c7bd0a40f0039e15542131d38dda4ca98add552
+SHA1 (patch-ab) = 0521173759ee09b08c0a6d79db630d6851e148fb
 SHA1 (patch-ac) = 3a3ba0bf3262f28e58cac81eac158a29786045a3
-SHA1 (patch-ad) = b4c9ae1f9cb1ee4e02cb71145070be387ef8292c
-SHA1 (patch-ae) = 34b6a2f823fa10fdd0d21824c673750bd961ef56
+SHA1 (patch-ad) = fbd78c81a6dc0eafbf2c11519ba53b24b73a8669
+SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
 SHA1 (patch-af) = b667887439301d8efc6190b1456a0c446b933be8
-SHA1 (patch-ag) = 56696453509bf843b647836ee5ae53cfe55a1db0
-SHA1 (patch-ah) = cf99278c28e740960cb2ee1f19eb09ddbe5006c8
-SHA1 (patch-ai) = a6796c629da9700c4edb7a8e6fa10519be0c25e2
+SHA1 (patch-ag) = dd466b04766e9f7c43106ee163e339cf30a6a6ad
+SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
+SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
diff --git a/graphics/xine-lib/patches/patch-aa b/graphics/xine-lib/patches/patch-aa
index d7c9d4d27ef..3781532fcfa 100644
--- a/graphics/xine-lib/patches/patch-aa
+++ b/graphics/xine-lib/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- src/xine-engine/video_decoder.c.orig	2003-03-08 08:28:35.000000000 +1000
+--- src/xine-engine/video_decoder.c.orig	2003-04-06 10:23:10.000000000 +1000
 +++ src/xine-engine/video_decoder.c
 @@ -33,6 +33,10 @@
  #include "xineutils.h"
@@ -13,26 +13,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  /*
  #define LOG
  */
-@@ -375,7 +379,9 @@ void *video_decoder_loop (void *stream_g
+@@ -393,7 +397,9 @@ void *video_decoder_loop (void *stream_g
  void video_decoder_init (xine_stream_t *stream) {
    
    pthread_attr_t       pth_attrs;
-+#ifndef _PTH_PTHREAD_H_
++#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
    struct sched_param   pth_params;
 +#endif
    int		       err, num_buffers;
  
    /* The fifo size is based on dvd playback where buffers are filled
-@@ -398,10 +404,14 @@ void video_decoder_init (xine_stream_t *
+@@ -416,10 +422,12 @@ void video_decoder_init (xine_stream_t *
    stream->spu_track_map_entries = 0;
  
    pthread_attr_init(&pth_attrs);
-+#ifndef _PTH_PTHREAD_H_
++#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
    pthread_attr_getschedparam(&pth_attrs, &pth_params);
    pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
    pthread_attr_setschedparam(&pth_attrs, &pth_params);
-+#endif
-+#ifdef PTHREAD_SCOPE_SYSTEM
    pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
    
diff --git a/graphics/xine-lib/patches/patch-ab b/graphics/xine-lib/patches/patch-ab
index 4d908230d62..36ce3f05828 100644
--- a/graphics/xine-lib/patches/patch-ab
+++ b/graphics/xine-lib/patches/patch-ab
@@ -1,27 +1,25 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- src/xine-engine/audio_decoder.c.orig	2003-03-08 08:28:32.000000000 +1000
+--- src/xine-engine/audio_decoder.c.orig	2003-04-06 10:23:10.000000000 +1000
 +++ src/xine-engine/audio_decoder.c
-@@ -335,7 +335,9 @@ void *audio_decoder_loop (void *stream_g
+@@ -353,7 +353,9 @@ void *audio_decoder_loop (void *stream_g
  void audio_decoder_init (xine_stream_t *stream) {
  
    pthread_attr_t       pth_attrs;
-+#ifndef _PTH_PTHREAD_H_
++#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
    struct sched_param   pth_params;
 +#endif
    int                  err;
  
    if (stream->audio_out == NULL) {
-@@ -361,10 +363,14 @@ void audio_decoder_init (xine_stream_t *
+@@ -379,10 +381,12 @@ void audio_decoder_init (xine_stream_t *
    */
  
    pthread_attr_init(&pth_attrs);
-+#ifndef _PTH_PTHREAD_H_
++#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
    pthread_attr_getschedparam(&pth_attrs, &pth_params);
    pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
    pthread_attr_setschedparam(&pth_attrs, &pth_params);
-+#endif
-+#ifdef PTHREAD_SCOPE_SYSTEM
    pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
    
diff --git a/graphics/xine-lib/patches/patch-ad b/graphics/xine-lib/patches/patch-ad
index 409d44cbaac..d9704885b1e 100644
--- a/graphics/xine-lib/patches/patch-ad
+++ b/graphics/xine-lib/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-ad,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- src/input/libdvdnav/vm.c.orig	Sun Mar 23 04:25:40 2003
+--- src/input/libdvdnav/vm.c.orig	2003-04-08 05:21:53.000000000 +1000
 +++ src/input/libdvdnav/vm.c
 @@ -35,6 +35,7 @@
  #include <assert.h>
@@ -10,9 +10,9 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  #include <fcntl.h>
  
  #include "ifo_types.h"
-@@ -125,9 +126,10 @@ static void vm_print_current_domain_stat
+@@ -123,9 +124,10 @@ static void vm_print_current_domain_stat
  
- void dvd_read_name( vm_t *this, const char *devname) {
+ static void dvd_read_name(char *name, const char *device) {
      int fd, i;
 -#ifndef __FreeBSD__
 +#ifndef BSD
diff --git a/graphics/xine-lib/patches/patch-ae b/graphics/xine-lib/patches/patch-ae
index ec0f11d365b..ac510e6a602 100644
--- a/graphics/xine-lib/patches/patch-ae
+++ b/graphics/xine-lib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-ae,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- src/input/input_vcd.c.orig	Sat Feb 15 22:50:42 2003
+--- src/input/input_vcd.c.orig	2003-04-07 02:17:07.000000000 +1000
 +++ src/input/input_vcd.c
 @@ -32,6 +32,7 @@
  #include <errno.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  #include <string.h>
  #ifdef HAVE_LINUX_CDROM_H
  # include <linux/cdrom.h>
-@@ -93,7 +94,7 @@ typedef struct {
+@@ -94,7 +95,7 @@ typedef struct {
  #if defined (__linux__) || defined(__sun)
    struct cdrom_tochdr    tochdr;
    struct cdrom_tocentry  tocent[100];
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
    struct ioc_toc_header  tochdr;
    struct cd_toc_entry    *tocent;
    off_t                  cur_sec;
-@@ -118,7 +119,7 @@ typedef struct {
+@@ -119,7 +120,7 @@ typedef struct {
  
    int                    cur_track;
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
    uint8_t                cur_min, cur_sec, cur_frame;
  #endif
  
-@@ -175,7 +176,7 @@ static int input_vcd_read_toc (vcd_input
+@@ -176,7 +177,7 @@ static int input_vcd_read_toc (vcd_input
  
    return 0;
  }
@@ -37,7 +37,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
  
    struct ioc_read_toc_entry te;
-@@ -387,7 +388,7 @@ static off_t vcd_plugin_read (input_plug
+@@ -388,7 +389,7 @@ static off_t vcd_plugin_read (input_plug
    memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
    return VCDSECTORSIZE;
  }
@@ -46,7 +46,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  static off_t vcd_plugin_read (input_plugin_t *this_gen, 
  				char *buf, off_t nlen) {
    vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
-@@ -525,7 +526,7 @@ static buf_element_t *vcd_plugin_read_bl
+@@ -526,7 +527,7 @@ static buf_element_t *vcd_plugin_read_bl
    memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
    return buf;
  }
@@ -55,7 +55,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, 
  					     fifo_buffer_t *fifo, off_t nlen) {
    
-@@ -683,7 +684,7 @@ static off_t vcd_plugin_seek (input_plug
+@@ -684,7 +685,7 @@ static off_t vcd_plugin_seek (input_plug
  
    return offset ; /* FIXME */
  }
@@ -64,7 +64,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  static off_t vcd_plugin_seek (input_plugin_t *this_gen, 
  				off_t offset, int origin) {
  
-@@ -757,7 +758,7 @@ static off_t vcd_plugin_get_length (inpu
+@@ -758,7 +759,7 @@ static off_t vcd_plugin_get_length (inpu
  
    return (off_t) 0;
  }
@@ -73,25 +73,14 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
    vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
    off_t len ;
-@@ -885,7 +886,11 @@ static input_plugin_t *open_plugin (inpu
+@@ -886,6 +887,10 @@ static input_plugin_t *open_plugin (inpu
    this->cur_min   = this->cls->tocent[this->cur_track].cdte_addr.msf.minute;
    this->cur_sec   = this->cls->tocent[this->cur_track].cdte_addr.msf.second;
    this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame;
--#elif defined (__FreeBSD__)
 +#elif defined(__NetBSD__)
 +  this->cur_min   = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.minute;
 +  this->cur_sec   = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.second;
 +  this->cur_frame = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.frame;
-+#elif defined (__FreeBSD)
+ #elif defined (__FreeBSD__)
    {
      int bsize = 2352;
-     if (ioctl (this->fd, CDRIOCSETBLOCKSIZE, &bsize) == -1) {
-@@ -960,7 +965,7 @@ static int vcd_class_eject_media (input_
-   
-   return 1;
- }
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
- static int vcd_class_eject_media (input_class_t *this_gen) {
-   vcd_input_class_t *this = (vcd_input_class_t *) this_gen;
-   int          fd;
diff --git a/graphics/xine-lib/patches/patch-ag b/graphics/xine-lib/patches/patch-ag
index e1918b205ef..8eeb0b15211 100644
--- a/graphics/xine-lib/patches/patch-ag
+++ b/graphics/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-ag,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- configure.orig	Sat Apr  5 20:28:23 2003
+--- configure.orig	2003-04-09 02:17:18.000000000 +1000
 +++ configure
-@@ -13777,7 +13777,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = 
+@@ -13808,7 +13808,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -13957,7 +13957,7 @@ echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&
+@@ -13988,7 +13988,7 @@ echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&
  fi
  if test $ac_cv_header_GL_gl_h = yes; then
     ac_have_opengl="yes"
@@ -20,3 +20,12 @@ $NetBSD: patch-ag,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
  	       echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then
+@@ -19238,7 +19238,7 @@ fi
+         echo "$as_me:$LINENO: checking for gnome-vfs-2.0" >&5
+ echo $ECHO_N "checking for gnome-vfs-2.0... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "gnome-vfs-2.0" ; then
++        if false ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
diff --git a/graphics/xine-lib/patches/patch-ah b/graphics/xine-lib/patches/patch-ah
index f233db312bf..840d3fc526a 100644
--- a/graphics/xine-lib/patches/patch-ah
+++ b/graphics/xine-lib/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-ah,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- src/xine-engine/video_out.c.orig	2003-04-06 07:51:45.000000000 +1000
+--- src/xine-engine/video_out.c.orig	2003-04-06 10:23:10.000000000 +1000
 +++ src/xine-engine/video_out.c
-@@ -1437,7 +1437,9 @@ xine_video_port_t *vo_new_port (xine_t *
+@@ -1443,7 +1443,9 @@ xine_video_port_t *vo_new_port (xine_t *
      this->grab_only            = 0;
      
      pthread_attr_init(&pth_attrs);
-+#ifdef PTHREAD_SCOPE_SYSTEM
++#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
      
diff --git a/graphics/xine-lib/patches/patch-ai b/graphics/xine-lib/patches/patch-ai
index 9938bbef039..942576b8c6b 100644
--- a/graphics/xine-lib/patches/patch-ai
+++ b/graphics/xine-lib/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.1.1.1 2003/04/06 11:06:02 rh Exp $
+$NetBSD: patch-ai,v 1.2 2003/04/11 09:19:54 rh Exp $
 
---- src/xine-engine/audio_out.c.orig	2003-03-12 08:20:32.000000000 +1000
+--- src/xine-engine/audio_out.c.orig	2003-04-06 10:23:10.000000000 +1000
 +++ src/xine-engine/audio_out.c
-@@ -1669,7 +1669,9 @@ xine_audio_port_t *ao_new_port (xine_t *
+@@ -1671,7 +1671,9 @@ xine_audio_port_t *ao_new_port (xine_t *
      this->audio_loop_running = 1;  
      
      pthread_attr_init(&pth_attrs);
-+#ifdef PTHREAD_SCOPE_SYSTEM
++#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif