From 8b7c16d5d7fb8fcf3cc1e0bafc3e48ab790639e7 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Thu, 13 Oct 2005 10:48:01 +0000
Subject: Update to 1.0.3a.  Man... I hate this package in its actual form...
 it's completely unmaintenable.

Changes:
* fixed format string vulnerability in audio CD input plugin
* some build system fixes for Windows
---
 multimedia/xine-lib/Makefile         |  18 +-
 multimedia/xine-lib/Makefile.common  |   7 +-
 multimedia/xine-lib/PLIST.FreeBSD    |  58 +++----
 multimedia/xine-lib/PLIST.Linux      |  70 ++++----
 multimedia/xine-lib/PLIST.NetBSD     |  10 +-
 multimedia/xine-lib/PLIST.SunOS      |   6 +-
 multimedia/xine-lib/PLIST.common     | 314 +++++++++++++++++------------------
 multimedia/xine-lib/PLIST.common_end |  10 +-
 multimedia/xine-lib/PLIST.i386       |  10 +-
 multimedia/xine-lib/buildlink3.mk    |   4 +-
 multimedia/xine-lib/distinfo         |  25 ++-
 multimedia/xine-lib/patches/patch-aa |  14 +-
 multimedia/xine-lib/patches/patch-ab |  12 +-
 multimedia/xine-lib/patches/patch-ag |  34 ++--
 multimedia/xine-lib/patches/patch-ai |  10 +-
 multimedia/xine-lib/patches/patch-aj |  41 -----
 multimedia/xine-lib/patches/patch-ao |  30 ++--
 multimedia/xine-lib/patches/patch-au |  12 --
 multimedia/xine-lib/patches/patch-be |  16 +-
 multimedia/xine-lib/patches/patch-bi |  28 ++--
 multimedia/xine-lib/patches/patch-ce |  22 +++
 21 files changed, 353 insertions(+), 398 deletions(-)
 delete mode 100644 multimedia/xine-lib/patches/patch-aj
 delete mode 100644 multimedia/xine-lib/patches/patch-au
 create mode 100644 multimedia/xine-lib/patches/patch-ce

(limited to 'multimedia/xine-lib')

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index af323648531..0a2b1d53590 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/09/20 12:49:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.26 2005/10/13 10:48:01 jmmv Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		1
 COMMENT=		Multimedia player library
 
 BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
@@ -22,25 +21,12 @@ SUBST_FILES.w32path=	src/libw32dll/wine/module.c
 SUBST_SED.w32path=	-e "s,@W32PATH@,${PREFIX}/lib/win32,"
 SUBST_MESSAGE.w32path=	"Fixing win32 dll path."
 
-# This needs to come before checking the values, otherwise the builtin.mk
-# files are not doing its work.
-.include "../../graphics/Mesa/buildlink3.mk"
-
-USE_BUILTIN.MesaLib?=	no
-USE_BUILTIN.glu?=	no
-
-.if !empty(USE_BUILTIN.MesaLib:M[Yy][Ee][Ss]) && \
-    !empty(USE_BUILTIN.glu:M[Yy][Ee][Ss])
-PLIST_SUBST+=		OPENGL_PLUGIN=
-.else
-PLIST_SUBST+=		OPENGL_PLUGIN='@comment '
-.endif
-
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 73168c71d66..aaacea066ea 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.27 2005/09/20 12:49:30 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/10/13 10:48:01 jmmv Exp $
 #
 
-DISTNAME=		xine-lib-1.0.2
-XINE_PKGNAME=		xine-lib-1.0.2
+DISTNAME=		xine-lib-1.0.3a
+XINE_PKGNAME=		xine-lib-1.0.3a
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -21,6 +21,7 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
 USE_TOOLS+=		autoconf gmake pkg-config
+WRKSRC=			${WRKDIR}/xine-lib-1.0.3
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
index d8a943468e8..2684c3f75af 100644
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ b/multimedia/xine-lib/PLIST.FreeBSD
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2005/05/26 22:47:22 reed Exp $
-lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/nvidia_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/nvidia_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/savage_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/savage_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/unichrome_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/unichrome_vid.so
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2005/10/13 10:48:01 jmmv Exp $
+lib/xine/plugins/1.0.3/vidix/cyberblade_vid.a
+lib/xine/plugins/1.0.3/vidix/cyberblade_vid.so
+lib/xine/plugins/1.0.3/vidix/mach64_vid.a
+lib/xine/plugins/1.0.3/vidix/mach64_vid.so
+lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.0.3/vidix/mga_vid.a
+lib/xine/plugins/1.0.3/vidix/mga_vid.so
+lib/xine/plugins/1.0.3/vidix/nvidia_vid.a
+lib/xine/plugins/1.0.3/vidix/nvidia_vid.so
+lib/xine/plugins/1.0.3/vidix/pm2_vid.a
+lib/xine/plugins/1.0.3/vidix/pm2_vid.so
+lib/xine/plugins/1.0.3/vidix/pm3_vid.a
+lib/xine/plugins/1.0.3/vidix/pm3_vid.so
+lib/xine/plugins/1.0.3/vidix/radeon_vid.a
+lib/xine/plugins/1.0.3/vidix/radeon_vid.so
+lib/xine/plugins/1.0.3/vidix/rage128_vid.a
+lib/xine/plugins/1.0.3/vidix/rage128_vid.so
+lib/xine/plugins/1.0.3/vidix/savage_vid.a
+lib/xine/plugins/1.0.3/vidix/savage_vid.so
+lib/xine/plugins/1.0.3/vidix/sis_vid.a
+lib/xine/plugins/1.0.3/vidix/sis_vid.so
+lib/xine/plugins/1.0.3/vidix/unichrome_vid.a
+lib/xine/plugins/1.0.3/vidix/unichrome_vid.so
+lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index 346e75ed7f7..a1b431a2e1e 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST.Linux,v 1.6 2005/06/17 20:30:55 reed Exp $
-lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.so
-lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.a
-lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.so
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_video.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_video.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_pvr.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_pvr.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_v4l.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_v4l.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_dxr3.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_dxr3.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_fb.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_fb.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.Linux,v 1.7 2005/10/13 10:48:01 jmmv Exp $
+lib/xine/plugins/1.0.3/vidix/cyberblade_vid.a
+lib/xine/plugins/1.0.3/vidix/cyberblade_vid.so
+lib/xine/plugins/1.0.3/vidix/mach64_vid.a
+lib/xine/plugins/1.0.3/vidix/mach64_vid.so
+lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.0.3/vidix/mga_vid.a
+lib/xine/plugins/1.0.3/vidix/mga_vid.so
+lib/xine/plugins/1.0.3/vidix/pm2_vid.a
+lib/xine/plugins/1.0.3/vidix/pm2_vid.so
+lib/xine/plugins/1.0.3/vidix/pm3_vid.a
+lib/xine/plugins/1.0.3/vidix/pm3_vid.so
+lib/xine/plugins/1.0.3/vidix/radeon_vid.a
+lib/xine/plugins/1.0.3/vidix/radeon_vid.so
+lib/xine/plugins/1.0.3/vidix/rage128_vid.a
+lib/xine/plugins/1.0.3/vidix/rage128_vid.so
+lib/xine/plugins/1.0.3/vidix/sis_vid.a
+lib/xine/plugins/1.0.3/vidix/sis_vid.so
+lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.3/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/1.0.3/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/1.0.3/xineplug_decode_dxr3_video.a
+lib/xine/plugins/1.0.3/xineplug_decode_dxr3_video.so
+lib/xine/plugins/1.0.3/xineplug_inp_pvr.a
+lib/xine/plugins/1.0.3/xineplug_inp_pvr.so
+lib/xine/plugins/1.0.3/xineplug_inp_v4l.a
+lib/xine/plugins/1.0.3/xineplug_inp_v4l.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_dxr3.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_dxr3.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_fb.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_fb.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index daf227d1581..da8833210e2 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.5 2005/05/18 21:43:21 markd Exp $
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_oss.so
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.so
+@comment $NetBSD: PLIST.NetBSD,v 1.6 2005/10/13 10:48:01 jmmv Exp $
+lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.3/xineplug_ao_out_sun.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.SunOS b/multimedia/xine-lib/PLIST.SunOS
index 25b6ad7cf09..c58589db78c 100644
--- a/multimedia/xine-lib/PLIST.SunOS
+++ b/multimedia/xine-lib/PLIST.SunOS
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2005/05/18 21:43:21 markd Exp $
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.so
+@comment $NetBSD: PLIST.SunOS,v 1.2 2005/10/13 10:48:01 jmmv Exp $
+lib/xine/plugins/1.0.3/xineplug_ao_out_sun.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index 0e3de54dc85..76d47bf330c 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2005/07/29 16:09:11 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2005/10/13 10:48:01 jmmv Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -34,162 +34,162 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
 lib/pkgconfig/libxine.pc
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_audio_filters.a
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_audio_filters.so
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_goom.a
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_goom.so
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_mosaico.a
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_mosaico.so
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_planar.a
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_planar.so
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_switch.a
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_switch.so
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/${PKGVERSION}/post/xineplug_post_tvtime.so
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_visualizations.a
-lib/xine/plugins/${PKGVERSION}/post/xineplug_post_visualizations.so
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_file.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_file.so
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_none.a
-lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_none.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_a52.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_a52.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_bitplane.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_bitplane.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dts.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dts.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dvaudio.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_dvaudio.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_faad.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_faad.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_ff.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_ff.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_gsm610.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_gsm610.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_image.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_image.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_lpcm.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_lpcm.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_mad.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_mad.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpc.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpc.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpeg2.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_mpeg2.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_nsf.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_nsf.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_real.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_real.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_real_audio.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_real_audio.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_rgb.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_rgb.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_speex.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_speex.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spu.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spu.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucc.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucc.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucmml.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spucmml.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spudvb.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_spudvb.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_sputext.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_sputext.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_vorbis.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_vorbis.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_yuv.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_yuv.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_asf.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_asf.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_audio.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_audio.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_avi.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_avi.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_fli.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_fli.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_flv.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_flv.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_games.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_games.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_iff.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_iff.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_image.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_image.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_matroska.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_matroska.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mng.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mng.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_nsv.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_nsv.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_ogg.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_ogg.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_pva.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_pva.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_qt.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_qt.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_rawdv.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_rawdv.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_real.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_real.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_slave.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_slave.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_sputext.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_sputext.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/${PKGVERSION}/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/${PKGVERSION}/xineplug_flac.a
-lib/xine/plugins/${PKGVERSION}/xineplug_flac.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_cdda.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_cdda.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvb.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvb.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvd.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_dvd.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_file.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_file.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_http.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_http.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_mms.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_mms.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_net.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_net.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_pnm.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_pnm.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtp.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtp.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtsp.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_rtsp.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcd.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcd.so
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcdo.a
-lib/xine/plugins/${PKGVERSION}/xineplug_inp_vcdo.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_aa.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_aa.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_none.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_none.so
-${OPENGL_PLUGIN}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_opengl.a
-${OPENGL_PLUGIN}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_opengl.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_sdl.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_sdl.so
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xshm.a
-lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xshm.so
-${HAVE_XV}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xv.so
+lib/xine/plugins/1.0.3/post/xineplug_post_audio_filters.a
+lib/xine/plugins/1.0.3/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.0.3/post/xineplug_post_goom.a
+lib/xine/plugins/1.0.3/post/xineplug_post_goom.so
+lib/xine/plugins/1.0.3/post/xineplug_post_mosaico.a
+lib/xine/plugins/1.0.3/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.0.3/post/xineplug_post_planar.a
+lib/xine/plugins/1.0.3/post/xineplug_post_planar.so
+lib/xine/plugins/1.0.3/post/xineplug_post_switch.a
+lib/xine/plugins/1.0.3/post/xineplug_post_switch.so
+lib/xine/plugins/1.0.3/post/xineplug_post_tvtime.a
+${HAVE_XV}lib/xine/plugins/1.0.3/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.0.3/post/xineplug_post_visualizations.a
+lib/xine/plugins/1.0.3/post/xineplug_post_visualizations.so
+lib/xine/plugins/1.0.3/xineplug_ao_out_file.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_file.so
+lib/xine/plugins/1.0.3/xineplug_ao_out_none.a
+lib/xine/plugins/1.0.3/xineplug_ao_out_none.so
+lib/xine/plugins/1.0.3/xineplug_decode_a52.a
+lib/xine/plugins/1.0.3/xineplug_decode_a52.so
+lib/xine/plugins/1.0.3/xineplug_decode_bitplane.a
+lib/xine/plugins/1.0.3/xineplug_decode_bitplane.so
+lib/xine/plugins/1.0.3/xineplug_decode_dts.a
+lib/xine/plugins/1.0.3/xineplug_decode_dts.so
+lib/xine/plugins/1.0.3/xineplug_decode_dvaudio.a
+lib/xine/plugins/1.0.3/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.0.3/xineplug_decode_faad.a
+lib/xine/plugins/1.0.3/xineplug_decode_faad.so
+lib/xine/plugins/1.0.3/xineplug_decode_ff.a
+lib/xine/plugins/1.0.3/xineplug_decode_ff.so
+lib/xine/plugins/1.0.3/xineplug_decode_gsm610.a
+lib/xine/plugins/1.0.3/xineplug_decode_gsm610.so
+lib/xine/plugins/1.0.3/xineplug_decode_image.a
+lib/xine/plugins/1.0.3/xineplug_decode_image.so
+lib/xine/plugins/1.0.3/xineplug_decode_lpcm.a
+lib/xine/plugins/1.0.3/xineplug_decode_lpcm.so
+lib/xine/plugins/1.0.3/xineplug_decode_mad.a
+lib/xine/plugins/1.0.3/xineplug_decode_mad.so
+lib/xine/plugins/1.0.3/xineplug_decode_mpc.a
+lib/xine/plugins/1.0.3/xineplug_decode_mpc.so
+lib/xine/plugins/1.0.3/xineplug_decode_mpeg2.a
+lib/xine/plugins/1.0.3/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.0.3/xineplug_decode_nsf.a
+lib/xine/plugins/1.0.3/xineplug_decode_nsf.so
+lib/xine/plugins/1.0.3/xineplug_decode_real.a
+lib/xine/plugins/1.0.3/xineplug_decode_real.so
+lib/xine/plugins/1.0.3/xineplug_decode_real_audio.a
+lib/xine/plugins/1.0.3/xineplug_decode_real_audio.so
+lib/xine/plugins/1.0.3/xineplug_decode_rgb.a
+lib/xine/plugins/1.0.3/xineplug_decode_rgb.so
+lib/xine/plugins/1.0.3/xineplug_decode_speex.a
+lib/xine/plugins/1.0.3/xineplug_decode_speex.so
+lib/xine/plugins/1.0.3/xineplug_decode_spu.a
+lib/xine/plugins/1.0.3/xineplug_decode_spu.so
+lib/xine/plugins/1.0.3/xineplug_decode_spucc.a
+lib/xine/plugins/1.0.3/xineplug_decode_spucc.so
+lib/xine/plugins/1.0.3/xineplug_decode_spucmml.a
+lib/xine/plugins/1.0.3/xineplug_decode_spucmml.so
+lib/xine/plugins/1.0.3/xineplug_decode_spudvb.a
+lib/xine/plugins/1.0.3/xineplug_decode_spudvb.so
+lib/xine/plugins/1.0.3/xineplug_decode_sputext.a
+lib/xine/plugins/1.0.3/xineplug_decode_sputext.so
+lib/xine/plugins/1.0.3/xineplug_decode_vorbis.a
+lib/xine/plugins/1.0.3/xineplug_decode_vorbis.so
+lib/xine/plugins/1.0.3/xineplug_decode_yuv.a
+lib/xine/plugins/1.0.3/xineplug_decode_yuv.so
+lib/xine/plugins/1.0.3/xineplug_dmx_asf.a
+lib/xine/plugins/1.0.3/xineplug_dmx_asf.so
+lib/xine/plugins/1.0.3/xineplug_dmx_audio.a
+lib/xine/plugins/1.0.3/xineplug_dmx_audio.so
+lib/xine/plugins/1.0.3/xineplug_dmx_avi.a
+lib/xine/plugins/1.0.3/xineplug_dmx_avi.so
+lib/xine/plugins/1.0.3/xineplug_dmx_fli.a
+lib/xine/plugins/1.0.3/xineplug_dmx_fli.so
+lib/xine/plugins/1.0.3/xineplug_dmx_flv.a
+lib/xine/plugins/1.0.3/xineplug_dmx_flv.so
+lib/xine/plugins/1.0.3/xineplug_dmx_games.a
+lib/xine/plugins/1.0.3/xineplug_dmx_games.so
+lib/xine/plugins/1.0.3/xineplug_dmx_iff.a
+lib/xine/plugins/1.0.3/xineplug_dmx_iff.so
+lib/xine/plugins/1.0.3/xineplug_dmx_image.a
+lib/xine/plugins/1.0.3/xineplug_dmx_image.so
+lib/xine/plugins/1.0.3/xineplug_dmx_matroska.a
+lib/xine/plugins/1.0.3/xineplug_dmx_matroska.so
+lib/xine/plugins/1.0.3/xineplug_dmx_mng.a
+lib/xine/plugins/1.0.3/xineplug_dmx_mng.so
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg.a
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.0.3/xineplug_dmx_nsv.a
+lib/xine/plugins/1.0.3/xineplug_dmx_nsv.so
+lib/xine/plugins/1.0.3/xineplug_dmx_ogg.a
+lib/xine/plugins/1.0.3/xineplug_dmx_ogg.so
+lib/xine/plugins/1.0.3/xineplug_dmx_pva.a
+lib/xine/plugins/1.0.3/xineplug_dmx_pva.so
+lib/xine/plugins/1.0.3/xineplug_dmx_qt.a
+lib/xine/plugins/1.0.3/xineplug_dmx_qt.so
+lib/xine/plugins/1.0.3/xineplug_dmx_rawdv.a
+lib/xine/plugins/1.0.3/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.0.3/xineplug_dmx_real.a
+lib/xine/plugins/1.0.3/xineplug_dmx_real.so
+lib/xine/plugins/1.0.3/xineplug_dmx_slave.a
+lib/xine/plugins/1.0.3/xineplug_dmx_slave.so
+lib/xine/plugins/1.0.3/xineplug_dmx_sputext.a
+lib/xine/plugins/1.0.3/xineplug_dmx_sputext.so
+lib/xine/plugins/1.0.3/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/1.0.3/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.0.3/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/1.0.3/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.0.3/xineplug_flac.a
+lib/xine/plugins/1.0.3/xineplug_flac.so
+lib/xine/plugins/1.0.3/xineplug_inp_cdda.a
+lib/xine/plugins/1.0.3/xineplug_inp_cdda.so
+lib/xine/plugins/1.0.3/xineplug_inp_dvb.a
+lib/xine/plugins/1.0.3/xineplug_inp_dvb.so
+lib/xine/plugins/1.0.3/xineplug_inp_dvd.a
+lib/xine/plugins/1.0.3/xineplug_inp_dvd.so
+lib/xine/plugins/1.0.3/xineplug_inp_file.a
+lib/xine/plugins/1.0.3/xineplug_inp_file.so
+lib/xine/plugins/1.0.3/xineplug_inp_http.a
+lib/xine/plugins/1.0.3/xineplug_inp_http.so
+lib/xine/plugins/1.0.3/xineplug_inp_mms.a
+lib/xine/plugins/1.0.3/xineplug_inp_mms.so
+lib/xine/plugins/1.0.3/xineplug_inp_net.a
+lib/xine/plugins/1.0.3/xineplug_inp_net.so
+lib/xine/plugins/1.0.3/xineplug_inp_pnm.a
+lib/xine/plugins/1.0.3/xineplug_inp_pnm.so
+lib/xine/plugins/1.0.3/xineplug_inp_rtp.a
+lib/xine/plugins/1.0.3/xineplug_inp_rtp.so
+lib/xine/plugins/1.0.3/xineplug_inp_rtsp.a
+lib/xine/plugins/1.0.3/xineplug_inp_rtsp.so
+lib/xine/plugins/1.0.3/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/1.0.3/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.0.3/xineplug_inp_vcd.a
+lib/xine/plugins/1.0.3/xineplug_inp_vcd.so
+lib/xine/plugins/1.0.3/xineplug_inp_vcdo.a
+lib/xine/plugins/1.0.3/xineplug_inp_vcdo.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_aa.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_aa.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_none.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_none.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_opengl.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_opengl.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_sdl.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_sdl.so
+lib/xine/plugins/1.0.3/xineplug_vo_out_xshm.a
+lib/xine/plugins/1.0.3/xineplug_vo_out_xshm.so
+${HAVE_XV}lib/xine/plugins/1.0.3/xineplug_vo_out_xv.a
+${HAVE_XV}lib/xine/plugins/1.0.3/xineplug_vo_out_xv.so
 man/man1/xine-config.1
 man/man5/xine.5
 share/aclocal/xine.m4
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
index 4cbfef754fa..8ac479b135d 100644
--- a/multimedia/xine-lib/PLIST.common_end
+++ b/multimedia/xine-lib/PLIST.common_end
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2005/07/29 16:09:11 drochner Exp $
+@comment $NetBSD: PLIST.common_end,v 1.5 2005/10/13 10:48:01 jmmv Exp $
 @dirrm share/xine/libxine1/fonts
 @dirrm share/xine/libxine1
 @dirrm share/xine
 @dirrm share/doc/xine/hackersguide
 @dirrm share/doc/xine/faq
 @dirrm share/doc/xine
-@exec ${MKDIR} %D/lib/xine/plugins/${PKGVERSION}/vidix
-@dirrm lib/xine/plugins/${PKGVERSION}/vidix
-@dirrm lib/xine/plugins/${PKGVERSION}/post
-@dirrm lib/xine/plugins/${PKGVERSION}
+@exec ${MKDIR} %D/lib/xine/plugins/1.0.3/vidix
+@dirrm lib/xine/plugins/1.0.3/vidix
+@dirrm lib/xine/plugins/1.0.3/post
+@dirrm lib/xine/plugins/1.0.3
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm include/xine
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
index 6e37c67825e..e2bf591d1d5 100644
--- a/multimedia/xine-lib/PLIST.i386
+++ b/multimedia/xine-lib/PLIST.i386
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.i386,v 1.3 2005/05/10 00:16:42 reed Exp $
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_qt.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_qt.so
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_w32dll.a
-lib/xine/plugins/${PKGVERSION}/xineplug_decode_w32dll.so
+@comment $NetBSD: PLIST.i386,v 1.4 2005/10/13 10:48:01 jmmv Exp $
+lib/xine/plugins/1.0.3/xineplug_decode_qt.a
+lib/xine/plugins/1.0.3/xineplug_decode_qt.so
+lib/xine/plugins/1.0.3/xineplug_decode_w32dll.a
+lib/xine/plugins/1.0.3/xineplug_decode_w32dll.so
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 0a2bb004ace..dab8d21aaee 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/04/27 02:40:07 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/10/13 10:48:01 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xine-lib
 
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3c
-BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0nb2
+BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0.3a
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 .endif	# XINE_LIB_BUILDLINK3_MK
 
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index ef0ed91de0e..36f399ed97c 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,33 +1,32 @@
-$NetBSD: distinfo,v 1.23 2005/10/10 22:51:04 joerg Exp $
+$NetBSD: distinfo,v 1.24 2005/10/13 10:48:01 jmmv Exp $
 
-SHA1 (xine-lib-1.0.2.tar.gz) = fb2018b3c9405bab91c6530f60c954d4ce7ba9fe
-RMD160 (xine-lib-1.0.2.tar.gz) = 28c1d12ddde1699d1fb47453c3af5e2ffa07b9bb
-Size (xine-lib-1.0.2.tar.gz) = 7774805 bytes
-SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519
-SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
+SHA1 (xine-lib-1.0.3a.tar.gz) = 2efe9bc3d85659731e8c679d2c60901a6101f17b
+RMD160 (xine-lib-1.0.3a.tar.gz) = 335abfaa46c4592a22246f75c3a455cd87b7cdc4
+Size (xine-lib-1.0.3a.tar.gz) = 7295526 bytes
+SHA1 (patch-aa) = 8218d6415878fb99ebf533eb9d60c9ffebbed274
+SHA1 (patch-ab) = c83f1826eabbc53e868ea4a532efda7f7ac8a4b7
 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
 SHA1 (patch-af) = f190e1595e1644b844bdc3d9e19975c03e73bb55
-SHA1 (patch-ag) = 8134c2f55e98b857acdee942be4a61914788bc10
+SHA1 (patch-ag) = 934170c205eb6541935740e341900698c13b4982
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
-SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
-SHA1 (patch-aj) = a213d316b5e3e486fe4c7c474a449408972db6f0
+SHA1 (patch-ai) = f51423976056637f92366d9ccee6b97837ffc934
 SHA1 (patch-ak) = 34b41bf29efeb1d0fa29b22d419d7665e33d2cb2
 SHA1 (patch-al) = f78b16bb84b3748c01c50d258c24fccfb19910b4
 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
-SHA1 (patch-ao) = 04daec3b16d1a841235dfa9745b002bd8a3bc6a4
+SHA1 (patch-ao) = c5bbffceb34516951d2f19558bb6e082376ab195
 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
 SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
-SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e
 SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
 SHA1 (patch-ba) = c4a5fbe9d88d21a90fe01359ace7831f2a865c86
 SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
 SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
-SHA1 (patch-be) = 237e30de8362daff4fb2e6689a9b41f3260baa73
+SHA1 (patch-be) = 78dc9f32b5861fbe6195c26d56aefea6684610e9
 SHA1 (patch-bg) = c905cbac881a8f623bb0f465194673dcdaf373c0
 SHA1 (patch-bh) = ad36e3953ef1b91751ec6668af3135b449dade72
-SHA1 (patch-bi) = 5cec5978b248493384f7953a850b339298a3e1c0
+SHA1 (patch-bi) = 7433089dc41b6f1633b23edb56881d27d68e6ff8
 SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2
 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
+SHA1 (patch-ce) = 2e3abf3d88977d88c7fc8ffd3d2ead57969620d6
diff --git a/multimedia/xine-lib/patches/patch-aa b/multimedia/xine-lib/patches/patch-aa
index f44c17401d3..e347569f249 100644
--- a/multimedia/xine-lib/patches/patch-aa
+++ b/multimedia/xine-lib/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/13 10:48:01 jmmv Exp $
 
---- 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
+--- src/xine-engine/video_decoder.c.orig	2005-10-08 15:57:49.000000000 +0200
++++ src/xine-engine/video_decoder.c
 @@ -43,6 +43,10 @@
  
  #define SPU_SLEEP_INTERVAL (90000/2)
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
  
  static void update_spu_decoder (xine_stream_t *stream, int type) {
  
-@@ -443,7 +447,9 @@
+@@ -472,7 +476,9 @@ void _x_video_decoder_init (xine_stream_
    } else {
       
      pthread_attr_t       pth_attrs;
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft 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
-@@ -464,10 +470,12 @@
+@@ -496,10 +502,12 @@ void _x_video_decoder_init (xine_stream_
      stream->spu_track_map_entries = 0;
    
      pthread_attr_init(&pth_attrs);
@@ -33,6 +33,6 @@ $NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
      pthread_attr_setschedparam(&pth_attrs, &pth_params);
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
-     
+ 
+     stream->video_thread_created = 1;
      if ((err = pthread_create (&stream->video_thread,
-                                &pth_attrs, video_decoder_loop, stream)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ab b/multimedia/xine-lib/patches/patch-ab
index 4b5187aede9..0b5a82a218d 100644
--- a/multimedia/xine-lib/patches/patch-ab
+++ b/multimedia/xine-lib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/13 10:48:01 jmmv Exp $
 
---- src/xine-engine/audio_decoder.c.orig	2003-12-12 20:30:51.000000000 +0100
+--- src/xine-engine/audio_decoder.c.orig	2005-10-08 15:57:49.000000000 +0200
 +++ src/xine-engine/audio_decoder.c
-@@ -338,7 +338,9 @@ static void *audio_decoder_loop (void *s
+@@ -448,7 +448,9 @@ static void *audio_decoder_loop (void *s
  void _x_audio_decoder_init (xine_stream_t *stream) {
  
    pthread_attr_t       pth_attrs;
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
    int                  err;
  
    if (stream->audio_out == NULL) {
-@@ -364,10 +366,12 @@ void _x_audio_decoder_init (xine_stream_
+@@ -486,10 +488,12 @@ void _x_audio_decoder_init (xine_stream_
       */
  
      pthread_attr_init(&pth_attrs);
@@ -22,6 +22,6 @@ $NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
      pthread_attr_setschedparam(&pth_attrs, &pth_params);
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
-   
+  
+     stream->audio_thread_created = 1; 
      if ((err = pthread_create (&stream->audio_thread,
-                                &pth_attrs, audio_decoder_loop, stream)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 185568fa385..023b1134383 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
+$NetBSD: patch-ag,v 1.10 2005/10/13 10:48:01 jmmv Exp $
 
---- configure.ac.orig	2005-04-26 08:09:18.000000000 +0000
+--- configure.ac.orig	2005-10-08 16:08:37.000000000 +0200
 +++ configure.ac
-@@ -192,7 +192,7 @@ dnl threads and OS specific stuff
- dnl ---------------------------------------------
+@@ -200,7 +200,7 @@ AC_ARG_WITH(pthread-prefix, 
+   [pthread_prefix="no"])
  
  case "$host" in
 -  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     THREAD_LIBS="-L/usr/local/lib -pthread"
-     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
- 
-@@ -402,6 +402,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
++  *-*-freebsd* | -*-*-dragonfly*)
+     if test x"$pthread_prefix" = "xno"; then
+       pthread_prefix="/usr/local"
+     fi
+@@ -437,6 +437,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -573,7 +576,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
+@@ -630,7 +633,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
  AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
  AC_MSG_RESULT()
  dnl Check if vld "extended" XvMC is available
@@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
               	     ac_have_xxmc="yes",
  	             [ac_have_xxmc="no"
-@@ -603,7 +606,7 @@ if test x$ac_have_xxmc = "xyes"; then
+@@ -660,7 +663,7 @@ if test x$ac_have_xxmc = "xyes"; then
  fi
  dnl Try fallback to standard XvMC if vld failed
  if test x$ac_have_xxmc = "xno"; then
@@ -39,7 +39,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                 ac_have_xxmc="yes",
  	       [ac_have_xxmc="no"
-@@ -657,7 +660,7 @@ saved_libs="$LIBS"
+@@ -714,7 +717,7 @@ saved_libs="$LIBS"
  XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
  AC_MSG_CHECKING(whether to enable the xvmc plugin)
  AC_MSG_RESULT()
@@ -48,7 +48,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
               ac_have_xvmc="yes",
  	     [ac_have_xvmc="no"
-@@ -697,8 +700,7 @@ dnl Checks for Xinerama extension
+@@ -754,8 +757,7 @@ dnl Checks for Xinerama extension
  dnl ---------------------------------------------
  
  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
@@ -58,7 +58,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg 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")
-@@ -1078,9 +1080,19 @@ dnl ------------------------------------
+@@ -1194,9 +1196,19 @@ dnl ------------------------------------
  dnl OSS style audio interface
  dnl ---------------------------------------------
  
@@ -78,7 +78,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	    #ifdef __NetBSD__
  	    #include <soundcard.h>
  	    #else
-@@ -1093,7 +1105,7 @@ AC_TRY_COMPILE([
+@@ -1209,7 +1221,7 @@ AC_TRY_COMPILE([
  	])
  AC_MSG_RESULT($have_ossaudio)
  AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
@@ -87,7 +87,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  
  dnl ---------------------------------------------
  dnl Alsa support
-@@ -1134,9 +1146,10 @@ dnl ------------------------------------
+@@ -1250,9 +1262,10 @@ dnl ------------------------------------
  dnl gnome-vfs support
  dnl ---------------------------------------------
  
@@ -101,7 +101,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  AC_SUBST(GNOME_VFS_CFLAGS)
  AC_SUBST(GNOME_VFS_LIBS)
  if test x"$no_gnome_vfs" != "xyes"; then
-@@ -1452,7 +1465,7 @@ int has_timeout=sizeof(test.timeout);],
+@@ -1568,7 +1581,7 @@ int has_timeout=sizeof(test.timeout);],
       	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                        [Define 1 if you have MinGW CD-ROM support])
  	 ;;
diff --git a/multimedia/xine-lib/patches/patch-ai b/multimedia/xine-lib/patches/patch-ai
index acbbdaa4eb6..db3d237c58e 100644
--- a/multimedia/xine-lib/patches/patch-ai
+++ b/multimedia/xine-lib/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ai,v 1.2 2005/10/13 10:48:01 jmmv Exp $
 
---- src/xine-engine/audio_out.c.orig	2003-04-06 10:23:10.000000000 +1000
+--- src/xine-engine/audio_out.c.orig	2005-10-08 15:57:49.000000000 +0200
 +++ src/xine-engine/audio_out.c
-@@ -1671,7 +1671,9 @@ xine_audio_port_t *ao_new_port (xine_t *
+@@ -2103,7 +2103,9 @@ xine_audio_port_t *_x_ao_new_port (xine_
      this->audio_loop_running = 1;  
      
      pthread_attr_init(&pth_attrs);
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
-     
+ 
+     this->audio_thread_created = 1;
      if ((err = pthread_create (&this->audio_thread,
- 			       &pth_attrs, ao_loop, this)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index f57f69fb34a..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aj,v 1.7 2005/05/26 22:47:22 reed Exp $
-
---- src/input/input_cdda.c.orig	Sat May  7 11:23:26 2005
-+++ src/input/input_cdda.c	Sat May  7 12:01:28 2005
-@@ -32,6 +32,9 @@
- #include <unistd.h>
- 
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
- #include <dirent.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -684,18 +687,26 @@
-   unsigned char *data) {
- 
-   int fd = this_gen->fd;
-+#if !defined(__FreeBSD__) || (__FreeBSD_version < 501106)
-   struct ioc_read_audio cdda;
-+#endif
- 
-   while( num_frames ) {
-+#if !defined(__FreeBSD__) || (__FreeBSD_version < 501106)
-     cdda.address_format = CD_MSF_FORMAT;
-     cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND;
-     cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE;
-     cdda.address.msf.frame = frame % CD_FRAMES_PER_SECOND;
-     cdda.nframes = 1;
-     cdda.buffer = data;
-+#endif
- 
-+#if defined(__FreeBSD__) && (__FreeBSD_version >= 501106)
-+    if (pread(fd, data, CD_RAW_FRAME_SIZE, frame * CD_RAW_FRAME_SIZE) != CD_RAW_FRAME_SIZE) {
-+#else
-     /* read a frame */
-     if(ioctl(fd, CDIOCREADAUDIO, &cdda) < 0) {
-+#endif
-       perror("CDIOCREADAUDIO");
-       return -1;
-     }
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index bcced17ba61..49e4524ee15 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,21 +1,21 @@
-$NetBSD: patch-ao,v 1.8 2005/07/29 16:09:11 drochner Exp $
+$NetBSD: patch-ao,v 1.9 2005/10/13 10:48:01 jmmv Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2005-07-26 20:33:21.000000000 +0200
+--- src/libw32dll/wine/Makefile.in.orig	2005-10-09 13:28:12.000000000 +0200
 +++ src/libw32dll/wine/Makefile.in
-@@ -65,7 +65,7 @@ mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--libwine_la_LIBADD =
-+libwine_la_LIBADD = ${WINE_LIBS}
- am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
- 	ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \
- 	registry.lo vfl.lo win32.lo stubs.lo wrapper.lo
-@@ -423,6 +423,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
+@@ -238,6 +238,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
  W32DLL_DEP = @W32DLL_DEP@
  W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
  WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
 +WINE_LIBS = @WINE_LIBS@
- WIN32_FALSE = @WIN32_FALSE@
- WIN32_TRUE = @WIN32_TRUE@
- XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -355,7 +356,7 @@ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+ 
+ libwine_la_LDFLAGS =
+-libwine_la_LIBADD =
++libwine_la_LIBADD = ${WINE_LIBS}
+ am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo ldt_keeper.lo \
+ 	module.lo pe_image.lo pe_resource.lo resource.lo registry.lo \
+ 	vfl.lo win32.lo stubs.lo wrapper.lo
diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au
deleted file mode 100644
index 2f5889c901c..00000000000
--- a/multimedia/xine-lib/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.2 2004/05/12 16:37:07 drochner Exp $
-
---- src/xine-engine/xine.c.orig	2004-04-27 18:56:39.000000000 +0200
-+++ src/xine-engine/xine.c	2004-05-11 22:20:16.000000000 +0200
-@@ -238,6 +238,7 @@
-   pthread_mutex_init(&port_ticket->lock, NULL);
-   pthread_mutex_init(&port_ticket->revoke_lock, NULL);
-   pthread_cond_init(&port_ticket->issued, NULL);
-+  pthread_cond_init(&port_ticket->revoked, NULL);
-   
-   return port_ticket;
- }
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
index 2892ae2fa2d..1f1409861b8 100644
--- a/multimedia/xine-lib/patches/patch-be
+++ b/multimedia/xine-lib/patches/patch-be
@@ -1,21 +1,21 @@
-$NetBSD: patch-be,v 1.4 2005/07/29 16:09:11 drochner Exp $
+$NetBSD: patch-be,v 1.5 2005/10/13 10:48:01 jmmv Exp $
 
---- src/audio_out/Makefile.in.orig	2005-07-26 20:32:23.000000000 +0200
+--- src/audio_out/Makefile.in.orig	2005-10-09 13:28:00.000000000 +0200
 +++ src/audio_out/Makefile.in
-@@ -449,6 +449,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
+@@ -197,6 +197,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
  OGG_LIBS = @OGG_LIBS@
  OPENGL_CFLAGS = @OPENGL_CFLAGS@
  OPENGL_LIBS = @OPENGL_LIBS@
 +OSS_LIBS = @OSS_LIBS@
  PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -640,7 +641,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
- xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+@@ -337,7 +338,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
  xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ 
  xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
 -xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB)
 +xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS)
  xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ 
  xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
- xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
diff --git a/multimedia/xine-lib/patches/patch-bi b/multimedia/xine-lib/patches/patch-bi
index d375ffd6fdc..6a2323d9040 100644
--- a/multimedia/xine-lib/patches/patch-bi
+++ b/multimedia/xine-lib/patches/patch-bi
@@ -1,22 +1,22 @@
-$NetBSD: patch-bi,v 1.1 2005/09/20 12:11:37 dmcmahill Exp $
+$NetBSD: patch-bi,v 1.2 2005/10/13 10:48:01 jmmv Exp $
 
---- src/video_out/Makefile.in.orig	2005-07-26 14:33:37.000000000 -0400
+--- src/video_out/Makefile.in.orig	2005-10-09 13:28:16.000000000 +0200
 +++ src/video_out/Makefile.in
-@@ -139,7 +139,7 @@ xineplug_vo_out_opengl_la_OBJECTS =  \
- @HAVE_OPENGL_TRUE@@HAVE_X11_TRUE@	-rpath $(libdir)
- xineplug_vo_out_pgx32_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo
-+am_xineplug_vo_out_pgx32_la_OBJECTS = alphablend.lo video_out_pgx32.lo
- xineplug_vo_out_pgx32_la_OBJECTS =  \
- 	$(am_xineplug_vo_out_pgx32_la_OBJECTS)
- @HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@am_xineplug_vo_out_pgx32_la_rpath =  \
-@@ -775,7 +775,7 @@ xineplug_vo_out_syncfb_la_LDFLAGS = -avo
- xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
+@@ -370,7 +370,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha
  xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
  xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ 
 -xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c
 +xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c
  xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
  xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c $(X11OSD)
+ 
+@@ -479,7 +479,7 @@ am_xineplug_vo_out_opengl_la_OBJECTS = y
+ xineplug_vo_out_opengl_la_OBJECTS = \
+ 	$(am_xineplug_vo_out_opengl_la_OBJECTS)
+ xineplug_vo_out_pgx32_la_DEPENDENCIES =
+-am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo
++am_xineplug_vo_out_pgx32_la_OBJECTS = alphablend.lo video_out_pgx32.lo
+ xineplug_vo_out_pgx32_la_OBJECTS = \
+ 	$(am_xineplug_vo_out_pgx32_la_OBJECTS)
+ xineplug_vo_out_pgx64_la_DEPENDENCIES =
diff --git a/multimedia/xine-lib/patches/patch-ce b/multimedia/xine-lib/patches/patch-ce
new file mode 100644
index 00000000000..90526b57127
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ce
@@ -0,0 +1,22 @@
+$NetBSD: patch-ce,v 1.1 2005/10/13 10:48:01 jmmv Exp $
+
+--- aclocal.m4.orig	2005-10-09 13:27:36.000000000 +0200
++++ aclocal.m4
+@@ -7841,7 +7841,7 @@ if test x"$external_ffmpeg" != "xno"; th
+                  "ac_cv_lib_avcodec_pp_get_context" \
+                  "ac_cv_lib_postproc_pp_get_context" \
+                  "ac_cv_lib_avcodec_register_avcodec"; do
+-          $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
++          $as_unset $i || test \"\${$i+set}\" != set || { eval $i=; export $i; }
+         done
+ 
+         dnl look for headers
+@@ -7889,7 +7889,7 @@ configure option --with-external-ffmpeg.
+     else
+       dnl check specified flags
+       CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
+-      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
++      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}"
+       AC_LINK_IFELSE([#include <avcodec.h>
+ #include <postprocess.h>
+  
-- 
cgit v1.2.3