update to 1.1.11.1

changes:
* Security fixes:
  - Array Indexing Vulnerability in sdpplin_parse(). (CVE-2008-0073)
  - integer overflow, possibly leading to buffer overflow, CVE-2008-1482
* Reworked the plugin directory naming so that external plugins don't have
  to be rebuilt for every release
* Made the version parsing much more reliable; it wasn't properly coping
  with four-part version numbers
* Fixed an off-by-one in the FLAC security fix patch. This breakage was
  causing failure to play some files
* Support 16-bit big-endian DTS audio
* Improved frame snapshot API. (ABI extension.)
* Re-add support for # (stream parameter separator) in raw filenames
* Fixed long delay when closing stream on dual core systems

pkgsrc note: CVE-2008-0073 was already fixed by patch

17 files changed, 268 insertions, 406 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 3aabc9e8953..d301532bf4d 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2008/03/19 16:09:35 drochner Exp $
+# $NetBSD: Makefile,v 1.57 2008/04/10 11:48:58 drochner Exp $
 
 .include "Makefile.common"
 
 COMMENT=		Multimedia player library
-PKGREVISION=		2
 
 BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index ec3afaad5bd..02af9d18c5e 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.46 2008/02/11 13:58:41 gdt Exp $
+# $NetBSD: Makefile.common,v 1.47 2008/04/10 11:48:58 drochner Exp $
 #
 
 # used by audio/xine-arts/Makefile
 # used by audio/xine-esound/Makefile
 
-DISTNAME=		xine-lib-1.1.10.1
-XINE_PKGNAME=		xine-lib-1.1.10.1
+DISTNAME=		xine-lib-1.1.11.1
+XINE_PKGNAME=		xine-lib-1.1.11.1
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -14,7 +14,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xinehq.de/
 
-XINE_LIB_VER=		1.1.10
+XINE_LIB_VER=		1.1.11.1
 PLIST_SUBST+=		XINE_LIB_VER=${XINE_LIB_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
diff --git a/multimedia/xine-lib/PLIST.DragonFly b/multimedia/xine-lib/PLIST.DragonFly
index 02b7dc8de88..67dc60cadc6 100644
--- a/multimedia/xine-lib/PLIST.DragonFly
+++ b/multimedia/xine-lib/PLIST.DragonFly
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.2 2006/01/13 08:42:30 martti Exp $
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.a
+@comment $NetBSD: PLIST.DragonFly,v 1.3 2008/04/10 11:48:58 drochner Exp $
+lib/xine/plugins/1.20/xineplug_ao_out_oss.so
+lib/xine/plugins/1.20/xineplug_ao_out_oss.a
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
index 23b6fbc4420..3b08ae7ced6 100644
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ b/multimedia/xine-lib/PLIST.FreeBSD
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.3 2006/01/13 08:42:30 martti Exp $
-lib/xine/plugins/${XINE_LIB_VER}/vidix/cyberblade_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/cyberblade_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mach64_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mach64_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_crtc2_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_crtc2_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/nvidia_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/nvidia_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm2_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm2_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm3_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm3_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/radeon_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/radeon_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/rage128_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/rage128_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/savage_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/savage_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/sis_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/sis_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/unichrome_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/unichrome_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_vidix.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.FreeBSD,v 1.4 2008/04/10 11:48:58 drochner Exp $
+lib/xine/plugins/1.20/vidix/cyberblade_vid.a
+lib/xine/plugins/1.20/vidix/cyberblade_vid.so
+lib/xine/plugins/1.20/vidix/mach64_vid.a
+lib/xine/plugins/1.20/vidix/mach64_vid.so
+lib/xine/plugins/1.20/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.20/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.20/vidix/mga_vid.a
+lib/xine/plugins/1.20/vidix/mga_vid.so
+lib/xine/plugins/1.20/vidix/nvidia_vid.a
+lib/xine/plugins/1.20/vidix/nvidia_vid.so
+lib/xine/plugins/1.20/vidix/pm2_vid.a
+lib/xine/plugins/1.20/vidix/pm2_vid.so
+lib/xine/plugins/1.20/vidix/pm3_vid.a
+lib/xine/plugins/1.20/vidix/pm3_vid.so
+lib/xine/plugins/1.20/vidix/radeon_vid.a
+lib/xine/plugins/1.20/vidix/radeon_vid.so
+lib/xine/plugins/1.20/vidix/rage128_vid.a
+lib/xine/plugins/1.20/vidix/rage128_vid.so
+lib/xine/plugins/1.20/vidix/savage_vid.a
+lib/xine/plugins/1.20/vidix/savage_vid.so
+lib/xine/plugins/1.20/vidix/sis_vid.a
+lib/xine/plugins/1.20/vidix/sis_vid.so
+lib/xine/plugins/1.20/vidix/unichrome_vid.a
+lib/xine/plugins/1.20/vidix/unichrome_vid.so
+lib/xine/plugins/1.20/xineplug_ao_out_oss.a
+lib/xine/plugins/1.20/xineplug_ao_out_oss.so
+lib/xine/plugins/1.20/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.20/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index 8c54e8c0884..5ae85e195a8 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST.Linux,v 1.8 2006/01/13 08:42:30 martti Exp $
-lib/xine/plugins/${XINE_LIB_VER}/vidix/cyberblade_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/cyberblade_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mach64_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mach64_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_crtc2_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_crtc2_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/mga_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm2_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm2_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm3_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/pm3_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/radeon_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/radeon_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/rage128_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/rage128_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/vidix/sis_vid.a
-lib/xine/plugins/${XINE_LIB_VER}/vidix/sis_vid.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dxr3_video.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dxr3_video.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_pvr.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_pvr.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_v4l.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_v4l.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_dxr3.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_dxr3.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_fb.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_fb.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_vidix.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.Linux,v 1.9 2008/04/10 11:48:58 drochner Exp $
+lib/xine/plugins/1.20/vidix/cyberblade_vid.a
+lib/xine/plugins/1.20/vidix/cyberblade_vid.so
+lib/xine/plugins/1.20/vidix/mach64_vid.a
+lib/xine/plugins/1.20/vidix/mach64_vid.so
+lib/xine/plugins/1.20/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.20/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.20/vidix/mga_vid.a
+lib/xine/plugins/1.20/vidix/mga_vid.so
+lib/xine/plugins/1.20/vidix/pm2_vid.a
+lib/xine/plugins/1.20/vidix/pm2_vid.so
+lib/xine/plugins/1.20/vidix/pm3_vid.a
+lib/xine/plugins/1.20/vidix/pm3_vid.so
+lib/xine/plugins/1.20/vidix/radeon_vid.a
+lib/xine/plugins/1.20/vidix/radeon_vid.so
+lib/xine/plugins/1.20/vidix/rage128_vid.a
+lib/xine/plugins/1.20/vidix/rage128_vid.so
+lib/xine/plugins/1.20/vidix/sis_vid.a
+lib/xine/plugins/1.20/vidix/sis_vid.so
+lib/xine/plugins/1.20/xineplug_ao_out_oss.a
+lib/xine/plugins/1.20/xineplug_ao_out_oss.so
+lib/xine/plugins/1.20/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/1.20/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/1.20/xineplug_decode_dxr3_video.a
+lib/xine/plugins/1.20/xineplug_decode_dxr3_video.so
+lib/xine/plugins/1.20/xineplug_inp_pvr.a
+lib/xine/plugins/1.20/xineplug_inp_pvr.so
+lib/xine/plugins/1.20/xineplug_inp_v4l.a
+lib/xine/plugins/1.20/xineplug_inp_v4l.so
+lib/xine/plugins/1.20/xineplug_vo_out_dxr3.a
+lib/xine/plugins/1.20/xineplug_vo_out_dxr3.so
+lib/xine/plugins/1.20/xineplug_vo_out_fb.a
+lib/xine/plugins/1.20/xineplug_vo_out_fb.so
+lib/xine/plugins/1.20/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.20/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index 4e3399ae0ba..16950181000 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.7 2006/01/13 08:42:30 martti Exp $
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_oss.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_sun.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_sun.so
+@comment $NetBSD: PLIST.NetBSD,v 1.8 2008/04/10 11:48:58 drochner Exp $
+lib/xine/plugins/1.20/xineplug_ao_out_oss.a
+lib/xine/plugins/1.20/xineplug_ao_out_oss.so
+lib/xine/plugins/1.20/xineplug_ao_out_sun.a
+lib/xine/plugins/1.20/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.SunOS b/multimedia/xine-lib/PLIST.SunOS
index 498eab9e188..00783f1cb4d 100644
--- a/multimedia/xine-lib/PLIST.SunOS
+++ b/multimedia/xine-lib/PLIST.SunOS
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.SunOS,v 1.3 2006/01/13 08:42:30 martti Exp $
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_sun.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_sun.so
+@comment $NetBSD: PLIST.SunOS,v 1.4 2008/04/10 11:48:58 drochner Exp $
+lib/xine/plugins/1.20/xineplug_ao_out_sun.a
+lib/xine/plugins/1.20/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index b863664b876..4f1d7566f2d 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.22 2008/02/11 13:29:10 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.23 2008/04/10 11:48:58 drochner Exp $
 bin/xine-config
 include/xine.h
 include/xine/alphablend.h
@@ -40,164 +40,168 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
 lib/pkgconfig/libxine.pc
-lib/xine/plugins/${XINE_LIB_VER}/mime.types
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_audio_filters.a
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_audio_filters.so
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_goom.a
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_goom.so
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_mosaico.a
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_mosaico.so
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_planar.a
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_planar.so
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_switch.a
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_switch.so
-${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_tvtime.so
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_visualizations.a
-lib/xine/plugins/${XINE_LIB_VER}/post/xineplug_post_visualizations.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_file.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_file.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_none.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_ao_out_none.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_a52.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_a52.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_bitplane.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_bitplane.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dts.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dts.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dvaudio.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_dvaudio.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_faad.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_faad.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_ff.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_ff.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_gsm610.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_gsm610.so
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.a
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_lpcm.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_lpcm.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mad.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mad.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mpc.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mpc.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mpeg2.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mpeg2.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_nsf.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_nsf.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_real.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_real.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_rgb.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_rgb.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_speex.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_speex.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spu.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spu.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spucc.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spucc.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spucmml.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spucmml.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spudvb.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spudvb.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_sputext.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_sputext.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_theora.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_theora.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_vorbis.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_vorbis.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_yuv.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_yuv.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_asf.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_asf.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_audio.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_audio.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_avi.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_avi.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_fli.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_fli.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_flv.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_flv.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_games.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_games.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_iff.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_iff.so
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.a
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_matroska.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_matroska.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mng.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mng.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_nsv.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_nsv.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_ogg.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_ogg.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_pva.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_pva.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_qt.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_qt.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_rawdv.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_rawdv.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_real.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_real.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_slave.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_slave.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_sputext.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_sputext.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_cdda.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_cdda.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_dvb.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_dvb.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_dvd.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_dvd.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_file.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_file.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_http.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_http.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_mms.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_mms.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_net.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_net.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_pnm.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_pnm.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_rtp.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_rtp.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_rtsp.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_rtsp.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcd.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcd.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcdo.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcdo.so
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.a
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_none.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_none.so
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.a
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.so
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.a
-@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xshm.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xshm.so
-${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xv.so
+lib/xine/plugins/1.20/mime.types
+lib/xine/plugins/1.20/post/xineplug_post_audio_filters.a
+lib/xine/plugins/1.20/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.20/post/xineplug_post_goom.a
+lib/xine/plugins/1.20/post/xineplug_post_goom.so
+lib/xine/plugins/1.20/post/xineplug_post_mosaico.a
+lib/xine/plugins/1.20/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.20/post/xineplug_post_planar.a
+lib/xine/plugins/1.20/post/xineplug_post_planar.so
+lib/xine/plugins/1.20/post/xineplug_post_switch.a
+lib/xine/plugins/1.20/post/xineplug_post_switch.so
+${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a
+${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.20/post/xineplug_post_visualizations.a
+lib/xine/plugins/1.20/post/xineplug_post_visualizations.so
+lib/xine/plugins/1.20/xineplug_ao_out_file.a
+lib/xine/plugins/1.20/xineplug_ao_out_file.so
+lib/xine/plugins/1.20/xineplug_ao_out_none.a
+lib/xine/plugins/1.20/xineplug_ao_out_none.so
+lib/xine/plugins/1.20/xineplug_decode_a52.a
+lib/xine/plugins/1.20/xineplug_decode_a52.so
+lib/xine/plugins/1.20/xineplug_decode_bitplane.a
+lib/xine/plugins/1.20/xineplug_decode_bitplane.so
+lib/xine/plugins/1.20/xineplug_decode_dts.a
+lib/xine/plugins/1.20/xineplug_decode_dts.so
+lib/xine/plugins/1.20/xineplug_decode_dvaudio.a
+lib/xine/plugins/1.20/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.20/xineplug_decode_faad.a
+lib/xine/plugins/1.20/xineplug_decode_faad.so
+lib/xine/plugins/1.20/xineplug_decode_ff.a
+lib/xine/plugins/1.20/xineplug_decode_ff.so
+lib/xine/plugins/1.20/xineplug_decode_gsm610.a
+lib/xine/plugins/1.20/xineplug_decode_gsm610.so
+@comment lib/xine/plugins/1.20/xineplug_decode_image.a
+@comment lib/xine/plugins/1.20/xineplug_decode_image.so
+lib/xine/plugins/1.20/xineplug_decode_lpcm.a
+lib/xine/plugins/1.20/xineplug_decode_lpcm.so
+lib/xine/plugins/1.20/xineplug_decode_mad.a
+lib/xine/plugins/1.20/xineplug_decode_mad.so
+lib/xine/plugins/1.20/xineplug_decode_mpc.a
+lib/xine/plugins/1.20/xineplug_decode_mpc.so
+lib/xine/plugins/1.20/xineplug_decode_mpeg2.a
+lib/xine/plugins/1.20/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.20/xineplug_decode_nsf.a
+lib/xine/plugins/1.20/xineplug_decode_nsf.so
+lib/xine/plugins/1.20/xineplug_decode_real.a
+lib/xine/plugins/1.20/xineplug_decode_real.so
+lib/xine/plugins/1.20/xineplug_decode_rgb.a
+lib/xine/plugins/1.20/xineplug_decode_rgb.so
+lib/xine/plugins/1.20/xineplug_decode_speex.a
+lib/xine/plugins/1.20/xineplug_decode_speex.so
+lib/xine/plugins/1.20/xineplug_decode_spu.a
+lib/xine/plugins/1.20/xineplug_decode_spu.so
+lib/xine/plugins/1.20/xineplug_decode_spucc.a
+lib/xine/plugins/1.20/xineplug_decode_spucc.so
+lib/xine/plugins/1.20/xineplug_decode_spucmml.a
+lib/xine/plugins/1.20/xineplug_decode_spucmml.so
+lib/xine/plugins/1.20/xineplug_decode_spudvb.a
+lib/xine/plugins/1.20/xineplug_decode_spudvb.so
+lib/xine/plugins/1.20/xineplug_decode_sputext.a
+lib/xine/plugins/1.20/xineplug_decode_sputext.so
+lib/xine/plugins/1.20/xineplug_decode_theora.a
+lib/xine/plugins/1.20/xineplug_decode_theora.so
+lib/xine/plugins/1.20/xineplug_decode_vorbis.a
+lib/xine/plugins/1.20/xineplug_decode_vorbis.so
+lib/xine/plugins/1.20/xineplug_decode_yuv.a
+lib/xine/plugins/1.20/xineplug_decode_yuv.so
+lib/xine/plugins/1.20/xineplug_dmx_asf.a
+lib/xine/plugins/1.20/xineplug_dmx_asf.so
+lib/xine/plugins/1.20/xineplug_dmx_audio.a
+lib/xine/plugins/1.20/xineplug_dmx_audio.so
+lib/xine/plugins/1.20/xineplug_dmx_avi.a
+lib/xine/plugins/1.20/xineplug_dmx_avi.so
+lib/xine/plugins/1.20/xineplug_dmx_fli.a
+lib/xine/plugins/1.20/xineplug_dmx_fli.so
+lib/xine/plugins/1.20/xineplug_dmx_flv.a
+lib/xine/plugins/1.20/xineplug_dmx_flv.so
+lib/xine/plugins/1.20/xineplug_dmx_games.a
+lib/xine/plugins/1.20/xineplug_dmx_games.so
+lib/xine/plugins/1.20/xineplug_dmx_iff.a
+lib/xine/plugins/1.20/xineplug_dmx_iff.so
+@comment lib/xine/plugins/1.20/xineplug_dmx_image.a
+@comment lib/xine/plugins/1.20/xineplug_dmx_image.so
+lib/xine/plugins/1.20/xineplug_dmx_matroska.a
+lib/xine/plugins/1.20/xineplug_dmx_matroska.so
+lib/xine/plugins/1.20/xineplug_dmx_mng.a
+lib/xine/plugins/1.20/xineplug_dmx_mng.so
+lib/xine/plugins/1.20/xineplug_dmx_mpeg.a
+lib/xine/plugins/1.20/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/1.20/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.20/xineplug_dmx_nsv.a
+lib/xine/plugins/1.20/xineplug_dmx_nsv.so
+lib/xine/plugins/1.20/xineplug_dmx_ogg.a
+lib/xine/plugins/1.20/xineplug_dmx_ogg.so
+lib/xine/plugins/1.20/xineplug_dmx_pva.a
+lib/xine/plugins/1.20/xineplug_dmx_pva.so
+lib/xine/plugins/1.20/xineplug_dmx_qt.a
+lib/xine/plugins/1.20/xineplug_dmx_qt.so
+lib/xine/plugins/1.20/xineplug_dmx_rawdv.a
+lib/xine/plugins/1.20/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.20/xineplug_dmx_real.a
+lib/xine/plugins/1.20/xineplug_dmx_real.so
+lib/xine/plugins/1.20/xineplug_dmx_slave.a
+lib/xine/plugins/1.20/xineplug_dmx_slave.so
+lib/xine/plugins/1.20/xineplug_dmx_sputext.a
+lib/xine/plugins/1.20/xineplug_dmx_sputext.so
+lib/xine/plugins/1.20/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/1.20/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.20/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/1.20/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.20/xineplug_inp_cdda.a
+lib/xine/plugins/1.20/xineplug_inp_cdda.so
+lib/xine/plugins/1.20/xineplug_inp_dvb.a
+lib/xine/plugins/1.20/xineplug_inp_dvb.so
+lib/xine/plugins/1.20/xineplug_inp_dvd.a
+lib/xine/plugins/1.20/xineplug_inp_dvd.so
+lib/xine/plugins/1.20/xineplug_inp_file.a
+lib/xine/plugins/1.20/xineplug_inp_file.so
+lib/xine/plugins/1.20/xineplug_inp_http.a
+lib/xine/plugins/1.20/xineplug_inp_http.so
+lib/xine/plugins/1.20/xineplug_inp_mms.a
+lib/xine/plugins/1.20/xineplug_inp_mms.so
+lib/xine/plugins/1.20/xineplug_inp_net.a
+lib/xine/plugins/1.20/xineplug_inp_net.so
+lib/xine/plugins/1.20/xineplug_inp_pnm.a
+lib/xine/plugins/1.20/xineplug_inp_pnm.so
+lib/xine/plugins/1.20/xineplug_inp_rtp.a
+lib/xine/plugins/1.20/xineplug_inp_rtp.so
+lib/xine/plugins/1.20/xineplug_inp_rtsp.a
+lib/xine/plugins/1.20/xineplug_inp_rtsp.so
+lib/xine/plugins/1.20/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/1.20/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.20/xineplug_inp_vcd.a
+lib/xine/plugins/1.20/xineplug_inp_vcd.so
+lib/xine/plugins/1.20/xineplug_inp_vcdo.a
+lib/xine/plugins/1.20/xineplug_inp_vcdo.so
+@comment lib/xine/plugins/1.20/xineplug_vo_out_aa.a
+@comment lib/xine/plugins/1.20/xineplug_vo_out_aa.so
+lib/xine/plugins/1.20/xineplug_vo_out_none.a
+lib/xine/plugins/1.20/xineplug_vo_out_none.so
+@comment lib/xine/plugins/1.20/xineplug_vo_out_opengl.a
+@comment lib/xine/plugins/1.20/xineplug_vo_out_opengl.so
+@comment lib/xine/plugins/1.20/xineplug_vo_out_sdl.a
+@comment lib/xine/plugins/1.20/xineplug_vo_out_sdl.so
+lib/xine/plugins/1.20/xineplug_vo_out_xshm.a
+lib/xine/plugins/1.20/xineplug_vo_out_xshm.so
+${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.a
+${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.so
 man/man1/xine-config.1
 man/man5/xine.5
 share/aclocal/xine.m4
+share/doc/xine-lib/COPYING
+share/doc/xine-lib/CREDITS
+share/doc/xine-lib/ChangeLog
+share/doc/xine-lib/NEWS
 share/doc/xine-lib/README
 share/doc/xine-lib/README.MINGWCROSS
 share/doc/xine-lib/README.WIN32
@@ -210,6 +214,7 @@ share/doc/xine-lib/README.opengl
 share/doc/xine-lib/README.solaris
 share/doc/xine-lib/README.syncfb
 share/doc/xine-lib/README_xxmc.html
+share/doc/xine-lib/TODO
 share/doc/xine-lib/faq.html
 share/doc/xine-lib/faq.txt
 share/doc/xine-lib/hackersguide/architecture.png
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
index 9e9396596c0..9715223d0d7 100644
--- a/multimedia/xine-lib/PLIST.common_end
+++ b/multimedia/xine-lib/PLIST.common_end
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST.common_end,v 1.8 2007/02/07 20:04:00 drochner Exp $
+@comment $NetBSD: PLIST.common_end,v 1.9 2008/04/10 11:48:58 drochner Exp $
 @dirrm share/xine/libxine1/fonts
 @dirrm share/xine/libxine1
 @dirrm share/xine
 @dirrm share/doc/xine-lib/hackersguide
 @dirrm share/doc/xine-lib
-@exec ${MKDIR} %D/lib/xine/plugins/${XINE_LIB_VER}/vidix
-@dirrm lib/xine/plugins/${XINE_LIB_VER}/vidix
-@dirrm lib/xine/plugins/${XINE_LIB_VER}/post
-@dirrm lib/xine/plugins/${XINE_LIB_VER}
+@exec ${MKDIR} %D/lib/xine/plugins/1.20/vidix
+@dirrm lib/xine/plugins/1.20/vidix
+@dirrm lib/xine/plugins/1.20/post
+@dirrm lib/xine/plugins/1.20
 @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 3e4a50da95d..cbc7850afa0 100644
--- a/multimedia/xine-lib/PLIST.i386
+++ b/multimedia/xine-lib/PLIST.i386
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.i386,v 1.5 2006/01/13 08:42:30 martti Exp $
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_qt.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_qt.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_w32dll.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_w32dll.so
+@comment $NetBSD: PLIST.i386,v 1.6 2008/04/10 11:48:58 drochner Exp $
+lib/xine/plugins/1.20/xineplug_decode_qt.a
+lib/xine/plugins/1.20/xineplug_decode_qt.so
+lib/xine/plugins/1.20/xineplug_decode_w32dll.a
+lib/xine/plugins/1.20/xineplug_decode_w32dll.so
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 127e7ef5007..a116bd99a98 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2008/03/19 16:09:35 drochner Exp $
+$NetBSD: distinfo,v 1.53 2008/04/10 11:48:58 drochner Exp $
 
-SHA1 (xine-lib-1.1.10.1.tar.bz2) = d77747206d19b48fd11a1dc36f3ac5ad3526c415
-RMD160 (xine-lib-1.1.10.1.tar.bz2) = 4b2b67c85dad8e35dfa9352c39d2bb6cd1ecb4b1
-Size (xine-lib-1.1.10.1.tar.bz2) = 7437511 bytes
+SHA1 (xine-lib-1.1.11.1.tar.bz2) = 77de8ff38c942376bd3a84d291d6b7d0060ebfeb
+RMD160 (xine-lib-1.1.11.1.tar.bz2) = 563b6a1aa3ad55073825df832919008c0ba24610
+Size (xine-lib-1.1.11.1.tar.bz2) = 7409526 bytes
 SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
 SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
@@ -13,13 +13,12 @@ SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe
 SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e
-SHA1 (patch-ao) = c4524c88bb4ce61b13e354d22aa0f7445ff0aa37
+SHA1 (patch-ao) = 0fa0c3969e2c3fd83e36db028d84bb7b8668c133
 SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100
 SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
-SHA1 (patch-av) = 40e9a44a506a0006b6761e8367c65239bd4856ee
+SHA1 (patch-av) = acbb2ffbaf72b4744538d996be95321e8eb23fd9
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
-SHA1 (patch-bd) = 2f0f39512d185377cca1ebaf4e891d518a1c14d0
 SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100
 SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b
 SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
@@ -28,7 +27,4 @@ SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d
 SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
-SHA1 (patch-ee) = 49efc9d722f2141e88106d87414586ab80e4f5a9
 SHA1 (patch-fa) = a69fe09588596bfc3d74fad29e5a1aeeeead4dfd
-SHA1 (patch-ga) = 296bb0f539f1a257df9f64331e8d62a8178f4077
-SHA1 (patch-gb) = 090436cd93c4b8f5fd6e4c1d313e69f9d49bd6c3
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index b9412cef312..c56cfbf0c4f 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.14 2007/11/22 20:20:21 drochner Exp $
+$NetBSD: patch-ao,v 1.15 2008/04/10 11:48:58 drochner Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2007-08-27 20:28:09.000000000 +0200
+--- src/libw32dll/wine/Makefile.in.orig	2008-03-19 14:15:55.000000000 +0100
 +++ src/libw32dll/wine/Makefile.in
-@@ -62,7 +62,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -58,7 +58,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
  CONFIG_HEADER = $(top_builddir)/include/configure.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -11,11 +11,11 @@ $NetBSD: patch-ao,v 1.14 2007/11/22 20:20:21 drochner Exp $
  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
-@@ -442,6 +442,7 @@ WAND_LIBS = @WAND_LIBS@
+@@ -293,6 +293,7 @@ WAND_LIBS = @WAND_LIBS@
  WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
  WAVPACK_LIBS = @WAVPACK_LIBS@
  WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
 +WINE_LIBS = @WINE_LIBS@
- WIN32_FALSE = @WIN32_FALSE@
- WIN32_TRUE = @WIN32_TRUE@
  XCBSHM_CFLAGS = @XCBSHM_CFLAGS@
+ XCBSHM_LIBS = @XCBSHM_LIBS@
+ XCBXV_CFLAGS = @XCBXV_CFLAGS@
diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av
index d81d69d6598..c9c49fb2308 100644
--- a/multimedia/xine-lib/patches/patch-av
+++ b/multimedia/xine-lib/patches/patch-av
@@ -1,10 +1,10 @@
-$NetBSD: patch-av,v 1.6 2007/11/22 20:20:22 drochner Exp $
+$NetBSD: patch-av,v 1.7 2008/04/10 11:48:58 drochner Exp $
 
---- src/libspudvb/Makefile.in.orig	2007-08-27 20:28:07.000000000 +0200
+--- src/libspudvb/Makefile.in.orig	2008-03-19 14:15:53.000000000 +0100
 +++ src/libspudvb/Makefile.in
-@@ -389,7 +389,7 @@ MSGMERGE = @MSGMERGE@
- MUSEPACK_FALSE = @MUSEPACK_FALSE@
- MUSEPACK_TRUE = @MUSEPACK_TRUE@
+@@ -240,7 +240,7 @@ MNG_LIBS = @MNG_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGMERGE = @MSGMERGE@
  NET_LIBS = @NET_LIBS@
 -NOUNDEF = @NOUNDEF@
 +#NOUNDEF = @NOUNDEF@
diff --git a/multimedia/xine-lib/patches/patch-bd b/multimedia/xine-lib/patches/patch-bd
deleted file mode 100644
index 376b32f508c..00000000000
--- a/multimedia/xine-lib/patches/patch-bd
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2006/12/08 09:24:26 abs Exp $
-
---- src/audio_out/audio_oss_out.c.orig	2006-07-16 17:18:09.000000000 +0100
-+++ src/audio_out/audio_oss_out.c
-@@ -419,6 +419,7 @@ static int ao_oss_delay(ao_driver_t *thi
-     }
-     this->last_getoptr = info.bytes;
-     break;
-+#ifndef __NetBSD__
-   case OSS_SYNC_GETODELAY:
-     if (ioctl (this->audio_fd, SNDCTL_DSP_GETODELAY, &bytes_left)) {
-       perror ("audio_oss_out: DSP_GETODELAY ioctl():");
-@@ -429,6 +430,7 @@ static int ao_oss_delay(ao_driver_t *thi
-     lprintf ("%d bytes left\n", bytes_left);
- 
-     break;
-+#endif
-   }
- 
-   return bytes_left / this->bytes_per_frame;
-@@ -835,10 +837,13 @@ static ao_driver_t *open_plugin (audio_d
-      * check if SNDCTL_DSP_GETODELAY works. if so, using it is preferred.
-      */
- 
-+#ifndef __NetBSD__
-     if (ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &info) != -1) {
-       xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETODELAY\n");
-       this->sync_method = OSS_SYNC_GETODELAY;
--    } else if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) {
-+    }
-+#endif
-+    if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) {
-       xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETOPTR\n");
-       this->sync_method = OSS_SYNC_GETOPTR;
-     } else {
diff --git a/multimedia/xine-lib/patches/patch-ee b/multimedia/xine-lib/patches/patch-ee
deleted file mode 100644
index a603e120775..00000000000
--- a/multimedia/xine-lib/patches/patch-ee
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ee,v 1.3 2007/02/07 20:04:00 drochner Exp $
-
---- src/xine-engine/xine.c.orig	2007-02-07 19:58:49.000000000 +0100
-+++ src/xine-engine/xine.c
-@@ -1544,6 +1544,9 @@ void xine_init (xine_t *this) {
-   /* probe for optimized memcpy or config setting */
-   xine_probe_fast_memcpy (this);
- 
-+  /* plugin loading might call log functions */
-+  pthread_mutex_init(&this->log_lock, NULL);
-+
-   /*
-    * plugins
-    */
-@@ -1622,7 +1625,6 @@ void xine_init (xine_t *this) {
-    * locks
-    */
-   pthread_mutex_init (&this->streams_lock, NULL);
--  pthread_mutex_init (&this->log_lock, NULL);
-   
-   /*
-    * start metronom clock
diff --git a/multimedia/xine-lib/patches/patch-ga b/multimedia/xine-lib/patches/patch-ga
deleted file mode 100644
index 2f777bff1d5..00000000000
--- a/multimedia/xine-lib/patches/patch-ga
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ga,v 1.3 2008/03/19 16:09:35 drochner Exp $
-
---- src/input/libreal/sdpplin.c.orig	2008-03-19 16:33:16.000000000 +0100
-+++ src/input/libreal/sdpplin.c
-@@ -143,7 +143,14 @@ static sdpplin_stream_t *sdpplin_parse_s
-     handled=0;
-     
-     if(filter(*data,"a=control:streamid=",&buf)) {
--      desc->stream_id=atoi(buf);
-+      /* This way negative values are mapped to unfeasibly high
-+       * values, and will be discarded afterward
-+       */
-+      unsigned long tmp = strtoul(buf, NULL, 10);
-+      if ( tmp > UINT16_MAX )
-+	lprintf("stream id out of bound: %lu\n", tmp);
-+      else
-+	desc->stream_id=tmp;
-       handled=1;
-       *data=nl(*data);
-     }
-@@ -199,7 +206,7 @@ static sdpplin_stream_t *sdpplin_parse_s
-     if(filter(*data,"a=OpaqueData:buffer;",&buf)) {
-       decoded = b64_decode(buf, decoded, &(desc->mlti_data_size));
-       if ( decoded != NULL ) {
--	desc->mlti_data = malloc(sizeof(char)*desc->mlti_data_size);
-+	desc->mlti_data = calloc(desc->mlti_data_size, sizeof(char));
- 	memcpy(desc->mlti_data, decoded, desc->mlti_data_size);
- 	handled=1;
- 	*data=nl(*data);
-@@ -252,7 +259,10 @@ sdpplin_t *sdpplin_parse(char *data) {
-       }
-       stream=sdpplin_parse_stream(&data);
-       lprintf("got data for stream id %u\n", stream->stream_id);
--      desc->stream[stream->stream_id]=stream;
-+      if ( stream->stream_id >= desc->stream_count )
-+	lprintf("stream id %u is greater than stream count %u\n", stream->stream_id, desc->stream_count);
-+      else
-+	desc->stream[stream->stream_id]=stream;
-       continue;
-     }
- 
-@@ -293,8 +303,15 @@ sdpplin_t *sdpplin_parse(char *data) {
-     }
-     
-     if(filter(data,"a=StreamCount:integer;",&buf)) {
--      desc->stream_count=atoi(buf);
--      desc->stream = malloc(sizeof(sdpplin_stream_t*)*desc->stream_count);
-+      /* This way negative values are mapped to unfeasibly high
-+       * values, and will be discarded afterward
-+       */
-+      unsigned long tmp = strtoul(buf, NULL, 10);
-+      if ( tmp > UINT16_MAX )
-+	lprintf("stream count out of bound: %lu\n", tmp);
-+      else
-+	desc->stream_count = tmp;
-+      desc->stream = calloc(desc->stream_count, sizeof(sdpplin_stream_t*));
-       handled=1;
-       data=nl(data);
-     }
diff --git a/multimedia/xine-lib/patches/patch-gb b/multimedia/xine-lib/patches/patch-gb
deleted file mode 100644
index f5c0baef010..00000000000
--- a/multimedia/xine-lib/patches/patch-gb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-gb,v 1.3 2008/03/19 16:09:35 drochner Exp $
-
---- src/input/libreal/sdpplin.h.orig	2008-01-23 06:11:52.000000000 +0100
-+++ src/input/libreal/sdpplin.h
-@@ -37,7 +37,7 @@ typedef struct {
-   char *id;
-   char *bandwidth;
- 
--  int stream_id;
-+  uint16_t stream_id;
-   char *range;
-   char *length;
-   char *rtpmap;
-@@ -81,7 +81,7 @@ typedef struct {
- 
-   int flags;
-   int is_real_data_type;
--  int stream_count;
-+  uint16_t stream_count;
-   char *title;
-   char *author;
-   char *copyright;