update to 1.1.12

changes:
-security fix (unchecked array index, CVE-2008-1686)
-a few bug fixes (including the 1.1.11.1 regressions)
-new version of the pulseaudio output plugin
-open-source upport for RealAudio "cook"

11 files changed, 267 insertions, 249 deletions

diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 98ad3575c4b..8ac6ca2e146 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.48 2008/04/12 22:43:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.49 2008/04/15 19:25:28 drochner Exp $
 #
 
 # used by audio/xine-arts/Makefile
 # used by audio/xine-esound/Makefile
 
-DISTNAME=		xine-lib-1.1.11.1
-XINE_PKGNAME=		xine-lib-1.1.11.1
+DISTNAME=		xine-lib-1.1.12
+XINE_PKGNAME=		xine-lib-1.1.12
 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.11.1
+XINE_LIB_VER=		1.1.12
 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 67dc60cadc6..0fd81109d0b 100644
--- a/multimedia/xine-lib/PLIST.DragonFly
+++ b/multimedia/xine-lib/PLIST.DragonFly
@@ -1,3 +1,3 @@
-@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
+@comment $NetBSD: PLIST.DragonFly,v 1.4 2008/04/15 19:25:28 drochner Exp $
+lib/xine/plugins/1.21/xineplug_ao_out_oss.so
+lib/xine/plugins/1.21/xineplug_ao_out_oss.a
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
index 3b08ae7ced6..7f48b44631b 100644
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ b/multimedia/xine-lib/PLIST.FreeBSD
@@ -1,29 +1,29 @@
-@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
+@comment $NetBSD: PLIST.FreeBSD,v 1.5 2008/04/15 19:25:28 drochner Exp $
+lib/xine/plugins/1.21/vidix/cyberblade_vid.a
+lib/xine/plugins/1.21/vidix/cyberblade_vid.so
+lib/xine/plugins/1.21/vidix/mach64_vid.a
+lib/xine/plugins/1.21/vidix/mach64_vid.so
+lib/xine/plugins/1.21/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.21/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.21/vidix/mga_vid.a
+lib/xine/plugins/1.21/vidix/mga_vid.so
+lib/xine/plugins/1.21/vidix/nvidia_vid.a
+lib/xine/plugins/1.21/vidix/nvidia_vid.so
+lib/xine/plugins/1.21/vidix/pm2_vid.a
+lib/xine/plugins/1.21/vidix/pm2_vid.so
+lib/xine/plugins/1.21/vidix/pm3_vid.a
+lib/xine/plugins/1.21/vidix/pm3_vid.so
+lib/xine/plugins/1.21/vidix/radeon_vid.a
+lib/xine/plugins/1.21/vidix/radeon_vid.so
+lib/xine/plugins/1.21/vidix/rage128_vid.a
+lib/xine/plugins/1.21/vidix/rage128_vid.so
+lib/xine/plugins/1.21/vidix/savage_vid.a
+lib/xine/plugins/1.21/vidix/savage_vid.so
+lib/xine/plugins/1.21/vidix/sis_vid.a
+lib/xine/plugins/1.21/vidix/sis_vid.so
+lib/xine/plugins/1.21/vidix/unichrome_vid.a
+lib/xine/plugins/1.21/vidix/unichrome_vid.so
+lib/xine/plugins/1.21/xineplug_ao_out_oss.a
+lib/xine/plugins/1.21/xineplug_ao_out_oss.so
+lib/xine/plugins/1.21/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.21/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index 5ae85e195a8..5c07c553d20 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,35 +1,35 @@
-@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
+@comment $NetBSD: PLIST.Linux,v 1.10 2008/04/15 19:25:28 drochner Exp $
+lib/xine/plugins/1.21/vidix/cyberblade_vid.a
+lib/xine/plugins/1.21/vidix/cyberblade_vid.so
+lib/xine/plugins/1.21/vidix/mach64_vid.a
+lib/xine/plugins/1.21/vidix/mach64_vid.so
+lib/xine/plugins/1.21/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.21/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.21/vidix/mga_vid.a
+lib/xine/plugins/1.21/vidix/mga_vid.so
+lib/xine/plugins/1.21/vidix/pm2_vid.a
+lib/xine/plugins/1.21/vidix/pm2_vid.so
+lib/xine/plugins/1.21/vidix/pm3_vid.a
+lib/xine/plugins/1.21/vidix/pm3_vid.so
+lib/xine/plugins/1.21/vidix/radeon_vid.a
+lib/xine/plugins/1.21/vidix/radeon_vid.so
+lib/xine/plugins/1.21/vidix/rage128_vid.a
+lib/xine/plugins/1.21/vidix/rage128_vid.so
+lib/xine/plugins/1.21/vidix/sis_vid.a
+lib/xine/plugins/1.21/vidix/sis_vid.so
+lib/xine/plugins/1.21/xineplug_ao_out_oss.a
+lib/xine/plugins/1.21/xineplug_ao_out_oss.so
+lib/xine/plugins/1.21/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/1.21/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/1.21/xineplug_decode_dxr3_video.a
+lib/xine/plugins/1.21/xineplug_decode_dxr3_video.so
+lib/xine/plugins/1.21/xineplug_inp_pvr.a
+lib/xine/plugins/1.21/xineplug_inp_pvr.so
+lib/xine/plugins/1.21/xineplug_inp_v4l.a
+lib/xine/plugins/1.21/xineplug_inp_v4l.so
+lib/xine/plugins/1.21/xineplug_vo_out_dxr3.a
+lib/xine/plugins/1.21/xineplug_vo_out_dxr3.so
+lib/xine/plugins/1.21/xineplug_vo_out_fb.a
+lib/xine/plugins/1.21/xineplug_vo_out_fb.so
+lib/xine/plugins/1.21/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.21/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index 16950181000..e55ef2696cb 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,5 @@
-@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
+@comment $NetBSD: PLIST.NetBSD,v 1.9 2008/04/15 19:25:28 drochner Exp $
+lib/xine/plugins/1.21/xineplug_ao_out_oss.a
+lib/xine/plugins/1.21/xineplug_ao_out_oss.so
+lib/xine/plugins/1.21/xineplug_ao_out_sun.a
+lib/xine/plugins/1.21/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.SunOS b/multimedia/xine-lib/PLIST.SunOS
index 00783f1cb4d..43a7455df2d 100644
--- a/multimedia/xine-lib/PLIST.SunOS
+++ b/multimedia/xine-lib/PLIST.SunOS
@@ -1,3 +1,3 @@
-@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
+@comment $NetBSD: PLIST.SunOS,v 1.5 2008/04/15 19:25:28 drochner Exp $
+lib/xine/plugins/1.21/xineplug_ao_out_sun.a
+lib/xine/plugins/1.21/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index f579d6d5b35..8fbf691807b 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST.common,v 1.24 2008/04/12 22:43:08 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.25 2008/04/15 19:25:28 drochner Exp $
 bin/xine-config
+bin/xine-list-1.1
 include/xine.h
 include/xine/alphablend.h
 include/xine/array.h
@@ -40,162 +41,165 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
 lib/pkgconfig/libxine.pc
-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
-${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a
-${PLIST.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
-${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.a
-${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.so
+lib/xine/plugins/1.21/mime.types
+lib/xine/plugins/1.21/post/xineplug_post_audio_filters.a
+lib/xine/plugins/1.21/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.21/post/xineplug_post_goom.a
+lib/xine/plugins/1.21/post/xineplug_post_goom.so
+lib/xine/plugins/1.21/post/xineplug_post_mosaico.a
+lib/xine/plugins/1.21/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.21/post/xineplug_post_planar.a
+lib/xine/plugins/1.21/post/xineplug_post_planar.so
+lib/xine/plugins/1.21/post/xineplug_post_switch.a
+lib/xine/plugins/1.21/post/xineplug_post_switch.so
+${PLIST.xv}lib/xine/plugins/1.21/post/xineplug_post_tvtime.a
+${PLIST.xv}lib/xine/plugins/1.21/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.21/post/xineplug_post_visualizations.a
+lib/xine/plugins/1.21/post/xineplug_post_visualizations.so
+lib/xine/plugins/1.21/xineplug_ao_out_file.a
+lib/xine/plugins/1.21/xineplug_ao_out_file.so
+lib/xine/plugins/1.21/xineplug_ao_out_none.a
+lib/xine/plugins/1.21/xineplug_ao_out_none.so
+lib/xine/plugins/1.21/xineplug_decode_a52.a
+lib/xine/plugins/1.21/xineplug_decode_a52.so
+lib/xine/plugins/1.21/xineplug_decode_bitplane.a
+lib/xine/plugins/1.21/xineplug_decode_bitplane.so
+lib/xine/plugins/1.21/xineplug_decode_dts.a
+lib/xine/plugins/1.21/xineplug_decode_dts.so
+lib/xine/plugins/1.21/xineplug_decode_dvaudio.a
+lib/xine/plugins/1.21/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.21/xineplug_decode_faad.a
+lib/xine/plugins/1.21/xineplug_decode_faad.so
+lib/xine/plugins/1.21/xineplug_decode_ff.a
+lib/xine/plugins/1.21/xineplug_decode_ff.so
+lib/xine/plugins/1.21/xineplug_decode_gsm610.a
+lib/xine/plugins/1.21/xineplug_decode_gsm610.so
+@comment lib/xine/plugins/1.21/xineplug_decode_image.a
+@comment lib/xine/plugins/1.21/xineplug_decode_image.so
+lib/xine/plugins/1.21/xineplug_decode_lpcm.a
+lib/xine/plugins/1.21/xineplug_decode_lpcm.so
+lib/xine/plugins/1.21/xineplug_decode_mad.a
+lib/xine/plugins/1.21/xineplug_decode_mad.so
+lib/xine/plugins/1.21/xineplug_decode_mpc.a
+lib/xine/plugins/1.21/xineplug_decode_mpc.so
+lib/xine/plugins/1.21/xineplug_decode_mpeg2.a
+lib/xine/plugins/1.21/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.21/xineplug_decode_nsf.a
+lib/xine/plugins/1.21/xineplug_decode_nsf.so
+lib/xine/plugins/1.21/xineplug_decode_real.a
+lib/xine/plugins/1.21/xineplug_decode_real.so
+lib/xine/plugins/1.21/xineplug_decode_rgb.a
+lib/xine/plugins/1.21/xineplug_decode_rgb.so
+lib/xine/plugins/1.21/xineplug_decode_speex.a
+lib/xine/plugins/1.21/xineplug_decode_speex.so
+lib/xine/plugins/1.21/xineplug_decode_spu.a
+lib/xine/plugins/1.21/xineplug_decode_spu.so
+lib/xine/plugins/1.21/xineplug_decode_spucc.a
+lib/xine/plugins/1.21/xineplug_decode_spucc.so
+lib/xine/plugins/1.21/xineplug_decode_spucmml.a
+lib/xine/plugins/1.21/xineplug_decode_spucmml.so
+lib/xine/plugins/1.21/xineplug_decode_spudvb.a
+lib/xine/plugins/1.21/xineplug_decode_spudvb.so
+lib/xine/plugins/1.21/xineplug_decode_sputext.a
+lib/xine/plugins/1.21/xineplug_decode_sputext.so
+lib/xine/plugins/1.21/xineplug_decode_theora.a
+lib/xine/plugins/1.21/xineplug_decode_theora.so
+lib/xine/plugins/1.21/xineplug_decode_vorbis.a
+lib/xine/plugins/1.21/xineplug_decode_vorbis.so
+lib/xine/plugins/1.21/xineplug_decode_yuv.a
+lib/xine/plugins/1.21/xineplug_decode_yuv.so
+lib/xine/plugins/1.21/xineplug_dmx_asf.a
+lib/xine/plugins/1.21/xineplug_dmx_asf.so
+lib/xine/plugins/1.21/xineplug_dmx_audio.a
+lib/xine/plugins/1.21/xineplug_dmx_audio.so
+lib/xine/plugins/1.21/xineplug_dmx_avi.a
+lib/xine/plugins/1.21/xineplug_dmx_avi.so
+lib/xine/plugins/1.21/xineplug_dmx_fli.a
+lib/xine/plugins/1.21/xineplug_dmx_fli.so
+lib/xine/plugins/1.21/xineplug_dmx_flv.a
+lib/xine/plugins/1.21/xineplug_dmx_flv.so
+lib/xine/plugins/1.21/xineplug_dmx_games.a
+lib/xine/plugins/1.21/xineplug_dmx_games.so
+lib/xine/plugins/1.21/xineplug_dmx_iff.a
+lib/xine/plugins/1.21/xineplug_dmx_iff.so
+@comment lib/xine/plugins/1.21/xineplug_dmx_image.a
+@comment lib/xine/plugins/1.21/xineplug_dmx_image.so
+lib/xine/plugins/1.21/xineplug_dmx_matroska.a
+lib/xine/plugins/1.21/xineplug_dmx_matroska.so
+lib/xine/plugins/1.21/xineplug_dmx_mng.a
+lib/xine/plugins/1.21/xineplug_dmx_mng.so
+lib/xine/plugins/1.21/xineplug_dmx_mpeg.a
+lib/xine/plugins/1.21/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/1.21/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.21/xineplug_dmx_nsv.a
+lib/xine/plugins/1.21/xineplug_dmx_nsv.so
+lib/xine/plugins/1.21/xineplug_dmx_ogg.a
+lib/xine/plugins/1.21/xineplug_dmx_ogg.so
+lib/xine/plugins/1.21/xineplug_dmx_pva.a
+lib/xine/plugins/1.21/xineplug_dmx_pva.so
+lib/xine/plugins/1.21/xineplug_dmx_qt.a
+lib/xine/plugins/1.21/xineplug_dmx_qt.so
+lib/xine/plugins/1.21/xineplug_dmx_rawdv.a
+lib/xine/plugins/1.21/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.21/xineplug_dmx_real.a
+lib/xine/plugins/1.21/xineplug_dmx_real.so
+lib/xine/plugins/1.21/xineplug_dmx_slave.a
+lib/xine/plugins/1.21/xineplug_dmx_slave.so
+lib/xine/plugins/1.21/xineplug_dmx_sputext.a
+lib/xine/plugins/1.21/xineplug_dmx_sputext.so
+lib/xine/plugins/1.21/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/1.21/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.21/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/1.21/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.21/xineplug_inp_cdda.a
+lib/xine/plugins/1.21/xineplug_inp_cdda.so
+lib/xine/plugins/1.21/xineplug_inp_dvb.a
+lib/xine/plugins/1.21/xineplug_inp_dvb.so
+lib/xine/plugins/1.21/xineplug_inp_dvd.a
+lib/xine/plugins/1.21/xineplug_inp_dvd.so
+lib/xine/plugins/1.21/xineplug_inp_file.a
+lib/xine/plugins/1.21/xineplug_inp_file.so
+lib/xine/plugins/1.21/xineplug_inp_http.a
+lib/xine/plugins/1.21/xineplug_inp_http.so
+lib/xine/plugins/1.21/xineplug_inp_mms.a
+lib/xine/plugins/1.21/xineplug_inp_mms.so
+lib/xine/plugins/1.21/xineplug_inp_net.a
+lib/xine/plugins/1.21/xineplug_inp_net.so
+lib/xine/plugins/1.21/xineplug_inp_pnm.a
+lib/xine/plugins/1.21/xineplug_inp_pnm.so
+lib/xine/plugins/1.21/xineplug_inp_rtp.a
+lib/xine/plugins/1.21/xineplug_inp_rtp.so
+lib/xine/plugins/1.21/xineplug_inp_rtsp.a
+lib/xine/plugins/1.21/xineplug_inp_rtsp.so
+lib/xine/plugins/1.21/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/1.21/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.21/xineplug_inp_vcd.a
+lib/xine/plugins/1.21/xineplug_inp_vcd.so
+lib/xine/plugins/1.21/xineplug_inp_vcdo.a
+lib/xine/plugins/1.21/xineplug_inp_vcdo.so
+@comment lib/xine/plugins/1.21/xineplug_vo_out_aa.a
+@comment lib/xine/plugins/1.21/xineplug_vo_out_aa.so
+lib/xine/plugins/1.21/xineplug_vo_out_none.a
+lib/xine/plugins/1.21/xineplug_vo_out_none.so
+@comment lib/xine/plugins/1.21/xineplug_vo_out_opengl.a
+@comment lib/xine/plugins/1.21/xineplug_vo_out_opengl.so
+lib/xine/plugins/1.21/xineplug_vo_out_raw.a
+lib/xine/plugins/1.21/xineplug_vo_out_raw.so
+@comment lib/xine/plugins/1.21/xineplug_vo_out_sdl.a
+@comment lib/xine/plugins/1.21/xineplug_vo_out_sdl.so
+lib/xine/plugins/1.21/xineplug_vo_out_xshm.a
+lib/xine/plugins/1.21/xineplug_vo_out_xshm.so
+${PLIST.xv}lib/xine/plugins/1.21/xineplug_vo_out_xv.a
+${PLIST.xv}lib/xine/plugins/1.21/xineplug_vo_out_xv.so
 man/man1/xine-config.1
+man/man1/xine-list-1.1.1
 man/man5/xine.5
 share/aclocal/xine.m4
 share/doc/xine-lib/COPYING
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
index 9715223d0d7..9442f473d9d 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.9 2008/04/10 11:48:58 drochner Exp $
+@comment $NetBSD: PLIST.common_end,v 1.10 2008/04/15 19:25:28 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/1.20/vidix
-@dirrm lib/xine/plugins/1.20/vidix
-@dirrm lib/xine/plugins/1.20/post
-@dirrm lib/xine/plugins/1.20
+@exec ${MKDIR} %D/lib/xine/plugins/1.21/vidix
+@dirrm lib/xine/plugins/1.21/vidix
+@dirrm lib/xine/plugins/1.21/post
+@dirrm lib/xine/plugins/1.21
 @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 cbc7850afa0..a80da6e1977 100644
--- a/multimedia/xine-lib/PLIST.i386
+++ b/multimedia/xine-lib/PLIST.i386
@@ -1,5 +1,5 @@
-@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
+@comment $NetBSD: PLIST.i386,v 1.7 2008/04/15 19:25:28 drochner Exp $
+lib/xine/plugins/1.21/xineplug_decode_qt.a
+lib/xine/plugins/1.21/xineplug_decode_qt.so
+lib/xine/plugins/1.21/xineplug_decode_w32dll.a
+lib/xine/plugins/1.21/xineplug_decode_w32dll.so
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index a116bd99a98..a7967e4aae7 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2008/04/10 11:48:58 drochner Exp $
+$NetBSD: distinfo,v 1.54 2008/04/15 19:25:28 drochner Exp $
 
-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 (xine-lib-1.1.12.tar.bz2) = a27872a4292e2ce6c35018a1cbbf7a88eecda8cd
+RMD160 (xine-lib-1.1.12.tar.bz2) = 305c1b3787a4191083b9793281ce3f3043d65fcb
+Size (xine-lib-1.1.12.tar.bz2) = 7431443 bytes
 SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
 SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
@@ -19,6 +19,7 @@ SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-av) = acbb2ffbaf72b4744538d996be95321e8eb23fd9
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
+SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48
 SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100
 SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b
 SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
new file mode 100644
index 00000000000..84cbd865a59
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.7 2008/04/15 19:25:28 drochner Exp $
+
+--- src/libxineadec/Makefile.in.orig	2008-04-15 19:30:36.000000000 +0200
++++ src/libxineadec/Makefile.in
+@@ -482,7 +482,7 @@ xineplug_decode_lpcm_la_SOURCES = xine_l
+ xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c
+-xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
++xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS) $(LTLIBINTL)
+ xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS)
+ xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c
+ xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)