summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2005-05-02 11:29:35 +0000
committerdrochner <drochner@pkgsrc.org>2005-05-02 11:29:35 +0000
commit5000f4fab007db7792d63b0406d3f397eb9f67b7 (patch)
treebf9470439acab660d87b7e1712df0e45ef8edd4b /multimedia
parent27eeb36dd41cf9fe2a62608a8cb315065320d8e9 (diff)
downloadpkgsrc-5000f4fab007db7792d63b0406d3f397eb9f67b7.tar.gz
update to 1.0.1
changes: -Big XvMC quality / correctness / cpu-usage fix -added support for WMA Voice codec -support for Windows Media Audio Lossless -bugfixes -security fixes (were already patched in pkgsrc) also add a patch to correct the path for win32 codecs, needed if xine-lib in embedded into other applications (as totem)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine-lib/Makefile12
-rw-r--r--multimedia/xine-lib/Makefile.common6
-rw-r--r--multimedia/xine-lib/PLIST.Linux74
-rw-r--r--multimedia/xine-lib/PLIST.NetBSD10
-rw-r--r--multimedia/xine-lib/PLIST.common323
-rw-r--r--multimedia/xine-lib/PLIST.common_end10
-rw-r--r--multimedia/xine-lib/distinfo21
-rw-r--r--multimedia/xine-lib/patches/patch-ag28
-rw-r--r--multimedia/xine-lib/patches/patch-aj21
-rw-r--r--multimedia/xine-lib/patches/patch-ak21
-rw-r--r--multimedia/xine-lib/patches/patch-ao24
-rw-r--r--multimedia/xine-lib/patches/patch-aq16
-rw-r--r--multimedia/xine-lib/patches/patch-be12
-rw-r--r--multimedia/xine-lib/patches/patch-bf13
-rw-r--r--multimedia/xine-lib/patches/patch-ca19
-rw-r--r--multimedia/xine-lib/patches/patch-cb13
16 files changed, 300 insertions, 323 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 1784035b40c..1ed799c7e30 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/04/26 12:48:34 tron Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/02 11:29:35 drochner Exp $
.include "Makefile.common"
-PKGREVISION= 2
-
.if ${MACHINE_ARCH} == "i386"
DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs
PLIST_SUBST+= I386=""
@@ -13,7 +11,8 @@ PLIST_SUBST+= I386="@comment "
BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
-SUBST_CLASSES+= oss
+SUBST_CLASSES+= oss w32path
+
SUBST_STAGE.oss= post-patch
SUBST_FILES.oss= src/audio_out/audio_oss_out.c
SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
@@ -22,6 +21,11 @@ SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g"
.endif
SUBST_MESSAGE.oss= "Fixing hardcoded audio device."
+SUBST_STAGE.w32path= post-patch
+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"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index ba0d9dde981..c3a0d15782a 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.18 2005/04/18 13:23:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/02 11:29:35 drochner Exp $
#
-DISTNAME= xine-lib-1.0
-XINE_PKGNAME= xine-lib-1.0
+DISTNAME= xine-lib-1.0.1
+XINE_PKGNAME= xine-lib-1.0.1
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index 5b18b0b5375..f89b27f6917 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,37 +1,37 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2004/05/29 02:14:27 reed Exp $
-lib/xine/plugins/1.0.0/vidix/cyberblade_vid.a
-lib/xine/plugins/1.0.0/vidix/cyberblade_vid.so
-lib/xine/plugins/1.0.0/vidix/mach64_vid.a
-lib/xine/plugins/1.0.0/vidix/mach64_vid.so
-lib/xine/plugins/1.0.0/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.0.0/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.0.0/vidix/mga_vid.a
-lib/xine/plugins/1.0.0/vidix/mga_vid.so
-lib/xine/plugins/1.0.0/vidix/pm2_vid.a
-lib/xine/plugins/1.0.0/vidix/pm2_vid.so
-lib/xine/plugins/1.0.0/vidix/pm3_vid.a
-lib/xine/plugins/1.0.0/vidix/pm3_vid.so
-lib/xine/plugins/1.0.0/vidix/radeon_vid.a
-lib/xine/plugins/1.0.0/vidix/radeon_vid.so
-lib/xine/plugins/1.0.0/vidix/rage128_vid.a
-lib/xine/plugins/1.0.0/vidix/rage128_vid.so
-lib/xine/plugins/1.0.0/vidix/sis_vid.a
-lib/xine/plugins/1.0.0/vidix/sis_vid.so
-lib/xine/plugins/1.0.0/xineplug_ao_out_alsa.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_alsa.so
-lib/xine/plugins/1.0.0/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.0/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/1.0.0/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/1.0.0/xineplug_decode_dxr3_video.a
-lib/xine/plugins/1.0.0/xineplug_decode_dxr3_video.so
-lib/xine/plugins/1.0.0/xineplug_inp_pvr.a
-lib/xine/plugins/1.0.0/xineplug_inp_pvr.so
-lib/xine/plugins/1.0.0/xineplug_inp_v4l.a
-lib/xine/plugins/1.0.0/xineplug_inp_v4l.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_dxr3.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_dxr3.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_fb.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_fb.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.Linux,v 1.2 2005/05/02 11:29:35 drochner Exp $
+lib/xine/plugins/1.0.1/vidix/cyberblade_vid.a
+lib/xine/plugins/1.0.1/vidix/cyberblade_vid.so
+lib/xine/plugins/1.0.1/vidix/mach64_vid.a
+lib/xine/plugins/1.0.1/vidix/mach64_vid.so
+lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.a
+lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.so
+lib/xine/plugins/1.0.1/vidix/mga_vid.a
+lib/xine/plugins/1.0.1/vidix/mga_vid.so
+lib/xine/plugins/1.0.1/vidix/pm2_vid.a
+lib/xine/plugins/1.0.1/vidix/pm2_vid.so
+lib/xine/plugins/1.0.1/vidix/pm3_vid.a
+lib/xine/plugins/1.0.1/vidix/pm3_vid.so
+lib/xine/plugins/1.0.1/vidix/radeon_vid.a
+lib/xine/plugins/1.0.1/vidix/radeon_vid.so
+lib/xine/plugins/1.0.1/vidix/rage128_vid.a
+lib/xine/plugins/1.0.1/vidix/rage128_vid.so
+lib/xine/plugins/1.0.1/vidix/sis_vid.a
+lib/xine/plugins/1.0.1/vidix/sis_vid.so
+lib/xine/plugins/1.0.1/xineplug_ao_out_alsa.a
+lib/xine/plugins/1.0.1/xineplug_ao_out_alsa.so
+lib/xine/plugins/1.0.1/xineplug_ao_out_oss.a
+lib/xine/plugins/1.0.1/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.1/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/1.0.1/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/1.0.1/xineplug_decode_dxr3_video.a
+lib/xine/plugins/1.0.1/xineplug_decode_dxr3_video.so
+lib/xine/plugins/1.0.1/xineplug_inp_pvr.a
+lib/xine/plugins/1.0.1/xineplug_inp_pvr.so
+lib/xine/plugins/1.0.1/xineplug_inp_v4l.a
+lib/xine/plugins/1.0.1/xineplug_inp_v4l.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_dxr3.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_dxr3.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_fb.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_fb.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index 86dfec72b28..8479616d52d 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/09/09 07:50:53 xtraeme Exp $
-lib/xine/plugins/1.0.0/xineplug_ao_out_sun.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_sun.so
-${HAVE_XV}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
+@comment $NetBSD: PLIST.NetBSD,v 1.3 2005/05/02 11:29:35 drochner Exp $
+lib/xine/plugins/1.0.1/xineplug_ao_out_sun.a
+lib/xine/plugins/1.0.1/xineplug_ao_out_sun.so
+${HAVE_XV}lib/xine/plugins/1.0.1/xineplug_vo_out_xv.a
+${HAVE_XV}lib/xine/plugins/1.0.1/xineplug_vo_out_xv.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index cbf5e0e324f..ce56c6e6480 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2005/03/30 10:23:45 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2005/05/02 11:29:35 drochner Exp $
bin/xine-config
include/xine.h
include/xine/attributes.h
@@ -34,167 +34,171 @@ include/xine/xmllexer.h
include/xine/xmlparser.h
lib/libxine.la
lib/pkgconfig/libxine.pc
-lib/xine/plugins/1.0.0/post/xineplug_post_audio_filters.a
-lib/xine/plugins/1.0.0/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.0.0/post/xineplug_post_goom.a
-lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
-lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.a
-lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.0.0/post/xineplug_post_planar.a
-lib/xine/plugins/1.0.0/post/xineplug_post_planar.so
-lib/xine/plugins/1.0.0/post/xineplug_post_switch.a
-lib/xine/plugins/1.0.0/post/xineplug_post_switch.so
-lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.a
-lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
-lib/xine/plugins/1.0.0/xineplug_ao_out_file.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_file.so
-lib/xine/plugins/1.0.0/xineplug_ao_out_none.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_none.so
-lib/xine/plugins/1.0.0/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.0/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.0/xineplug_decode_a52.a
-lib/xine/plugins/1.0.0/xineplug_decode_a52.so
-lib/xine/plugins/1.0.0/xineplug_decode_bitplane.a
-lib/xine/plugins/1.0.0/xineplug_decode_bitplane.so
-lib/xine/plugins/1.0.0/xineplug_decode_dts.a
-lib/xine/plugins/1.0.0/xineplug_decode_dts.so
-lib/xine/plugins/1.0.0/xineplug_decode_dvaudio.a
-lib/xine/plugins/1.0.0/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.0.0/xineplug_decode_faad.a
-lib/xine/plugins/1.0.0/xineplug_decode_faad.so
-lib/xine/plugins/1.0.0/xineplug_decode_ff.a
-lib/xine/plugins/1.0.0/xineplug_decode_ff.so
-lib/xine/plugins/1.0.0/xineplug_decode_gsm610.a
-lib/xine/plugins/1.0.0/xineplug_decode_gsm610.so
-lib/xine/plugins/1.0.0/xineplug_decode_image.a
-lib/xine/plugins/1.0.0/xineplug_decode_image.so
-lib/xine/plugins/1.0.0/xineplug_decode_lpcm.a
-lib/xine/plugins/1.0.0/xineplug_decode_lpcm.so
-lib/xine/plugins/1.0.0/xineplug_decode_mad.a
-lib/xine/plugins/1.0.0/xineplug_decode_mad.so
-lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.a
-lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.0.0/xineplug_decode_nsf.a
-lib/xine/plugins/1.0.0/xineplug_decode_nsf.so
-${I386}lib/xine/plugins/1.0.0/xineplug_decode_qt.a
-${I386}lib/xine/plugins/1.0.0/xineplug_decode_qt.so
-lib/xine/plugins/1.0.0/xineplug_decode_real.a
-lib/xine/plugins/1.0.0/xineplug_decode_real.so
-lib/xine/plugins/1.0.0/xineplug_decode_real_audio.a
-lib/xine/plugins/1.0.0/xineplug_decode_real_audio.so
-lib/xine/plugins/1.0.0/xineplug_decode_rgb.a
-lib/xine/plugins/1.0.0/xineplug_decode_rgb.so
-lib/xine/plugins/1.0.0/xineplug_decode_speex.a
-lib/xine/plugins/1.0.0/xineplug_decode_speex.so
-lib/xine/plugins/1.0.0/xineplug_decode_spu.a
-lib/xine/plugins/1.0.0/xineplug_decode_spu.so
-lib/xine/plugins/1.0.0/xineplug_decode_spucc.a
-lib/xine/plugins/1.0.0/xineplug_decode_spucc.so
-lib/xine/plugins/1.0.0/xineplug_decode_spucmml.a
-lib/xine/plugins/1.0.0/xineplug_decode_spucmml.so
-lib/xine/plugins/1.0.0/xineplug_decode_spudvb.a
-lib/xine/plugins/1.0.0/xineplug_decode_spudvb.so
-lib/xine/plugins/1.0.0/xineplug_decode_sputext.a
-lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
-lib/xine/plugins/1.0.0/xineplug_decode_vorbis.a
-lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so
-${I386}lib/xine/plugins/1.0.0/xineplug_decode_w32dll.a
-${I386}lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so
-lib/xine/plugins/1.0.0/xineplug_decode_yuv.a
-lib/xine/plugins/1.0.0/xineplug_decode_yuv.so
-lib/xine/plugins/1.0.0/xineplug_dmx_asf.a
-lib/xine/plugins/1.0.0/xineplug_dmx_asf.so
-lib/xine/plugins/1.0.0/xineplug_dmx_audio.a
-lib/xine/plugins/1.0.0/xineplug_dmx_audio.so
-lib/xine/plugins/1.0.0/xineplug_dmx_avi.a
-lib/xine/plugins/1.0.0/xineplug_dmx_avi.so
-lib/xine/plugins/1.0.0/xineplug_dmx_fli.a
-lib/xine/plugins/1.0.0/xineplug_dmx_fli.so
-lib/xine/plugins/1.0.0/xineplug_dmx_flv.a
-lib/xine/plugins/1.0.0/xineplug_dmx_flv.so
-lib/xine/plugins/1.0.0/xineplug_dmx_games.a
-lib/xine/plugins/1.0.0/xineplug_dmx_games.so
-lib/xine/plugins/1.0.0/xineplug_dmx_iff.a
-lib/xine/plugins/1.0.0/xineplug_dmx_iff.so
-lib/xine/plugins/1.0.0/xineplug_dmx_image.a
-lib/xine/plugins/1.0.0/xineplug_dmx_image.so
-lib/xine/plugins/1.0.0/xineplug_dmx_matroska.a
-lib/xine/plugins/1.0.0/xineplug_dmx_matroska.so
-lib/xine/plugins/1.0.0/xineplug_dmx_mng.a
-lib/xine/plugins/1.0.0/xineplug_dmx_mng.so
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.a
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.0.0/xineplug_dmx_nsv.a
-lib/xine/plugins/1.0.0/xineplug_dmx_nsv.so
-lib/xine/plugins/1.0.0/xineplug_dmx_ogg.a
-lib/xine/plugins/1.0.0/xineplug_dmx_ogg.so
-lib/xine/plugins/1.0.0/xineplug_dmx_pva.a
-lib/xine/plugins/1.0.0/xineplug_dmx_pva.so
-lib/xine/plugins/1.0.0/xineplug_dmx_qt.a
-lib/xine/plugins/1.0.0/xineplug_dmx_qt.so
-lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.a
-lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.0.0/xineplug_dmx_real.a
-lib/xine/plugins/1.0.0/xineplug_dmx_real.so
-lib/xine/plugins/1.0.0/xineplug_dmx_slave.a
-lib/xine/plugins/1.0.0/xineplug_dmx_slave.so
-lib/xine/plugins/1.0.0/xineplug_dmx_sputext.a
-lib/xine/plugins/1.0.0/xineplug_dmx_sputext.so
-lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.0.0/xineplug_flac.a
-lib/xine/plugins/1.0.0/xineplug_flac.so
-lib/xine/plugins/1.0.0/xineplug_inp_cdda.a
-lib/xine/plugins/1.0.0/xineplug_inp_cdda.so
-lib/xine/plugins/1.0.0/xineplug_inp_dvb.a
-lib/xine/plugins/1.0.0/xineplug_inp_dvb.so
-lib/xine/plugins/1.0.0/xineplug_inp_dvd.a
-lib/xine/plugins/1.0.0/xineplug_inp_dvd.so
-lib/xine/plugins/1.0.0/xineplug_inp_file.a
-lib/xine/plugins/1.0.0/xineplug_inp_file.so
-lib/xine/plugins/1.0.0/xineplug_inp_http.a
-lib/xine/plugins/1.0.0/xineplug_inp_http.so
-lib/xine/plugins/1.0.0/xineplug_inp_mms.a
-lib/xine/plugins/1.0.0/xineplug_inp_mms.so
-lib/xine/plugins/1.0.0/xineplug_inp_net.a
-lib/xine/plugins/1.0.0/xineplug_inp_net.so
-lib/xine/plugins/1.0.0/xineplug_inp_pnm.a
-lib/xine/plugins/1.0.0/xineplug_inp_pnm.so
-lib/xine/plugins/1.0.0/xineplug_inp_rtp.a
-lib/xine/plugins/1.0.0/xineplug_inp_rtp.so
-lib/xine/plugins/1.0.0/xineplug_inp_rtsp.a
-lib/xine/plugins/1.0.0/xineplug_inp_rtsp.so
-lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.0.0/xineplug_inp_vcd.a
-lib/xine/plugins/1.0.0/xineplug_inp_vcd.so
-lib/xine/plugins/1.0.0/xineplug_inp_vcdo.a
-lib/xine/plugins/1.0.0/xineplug_inp_vcdo.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_aa.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_none.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_none.so
-${OPENGL_PLUGIN}lib/xine/plugins/1.0.0/xineplug_vo_out_opengl.a
-${OPENGL_PLUGIN}lib/xine/plugins/1.0.0/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.a
-lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
+lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.a
+lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.0.1/post/xineplug_post_goom.a
+lib/xine/plugins/1.0.1/post/xineplug_post_goom.so
+lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.a
+lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.0.1/post/xineplug_post_planar.a
+lib/xine/plugins/1.0.1/post/xineplug_post_planar.so
+lib/xine/plugins/1.0.1/post/xineplug_post_switch.a
+lib/xine/plugins/1.0.1/post/xineplug_post_switch.so
+lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.a
+${HAVE_XV}lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.a
+lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.so
+lib/xine/plugins/1.0.1/xineplug_ao_out_file.a
+lib/xine/plugins/1.0.1/xineplug_ao_out_file.so
+lib/xine/plugins/1.0.1/xineplug_ao_out_none.a
+lib/xine/plugins/1.0.1/xineplug_ao_out_none.so
+lib/xine/plugins/1.0.1/xineplug_ao_out_oss.a
+lib/xine/plugins/1.0.1/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.1/xineplug_decode_a52.a
+lib/xine/plugins/1.0.1/xineplug_decode_a52.so
+lib/xine/plugins/1.0.1/xineplug_decode_bitplane.a
+lib/xine/plugins/1.0.1/xineplug_decode_bitplane.so
+lib/xine/plugins/1.0.1/xineplug_decode_dts.a
+lib/xine/plugins/1.0.1/xineplug_decode_dts.so
+lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.a
+lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.0.1/xineplug_decode_faad.a
+lib/xine/plugins/1.0.1/xineplug_decode_faad.so
+lib/xine/plugins/1.0.1/xineplug_decode_ff.a
+lib/xine/plugins/1.0.1/xineplug_decode_ff.so
+lib/xine/plugins/1.0.1/xineplug_decode_gsm610.a
+lib/xine/plugins/1.0.1/xineplug_decode_gsm610.so
+lib/xine/plugins/1.0.1/xineplug_decode_image.a
+lib/xine/plugins/1.0.1/xineplug_decode_image.so
+lib/xine/plugins/1.0.1/xineplug_decode_lpcm.a
+lib/xine/plugins/1.0.1/xineplug_decode_lpcm.so
+lib/xine/plugins/1.0.1/xineplug_decode_mad.a
+lib/xine/plugins/1.0.1/xineplug_decode_mad.so
+lib/xine/plugins/1.0.1/xineplug_decode_mpc.a
+lib/xine/plugins/1.0.1/xineplug_decode_mpc.so
+lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.a
+lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.0.1/xineplug_decode_nsf.a
+lib/xine/plugins/1.0.1/xineplug_decode_nsf.so
+${I386}lib/xine/plugins/1.0.1/xineplug_decode_qt.a
+${I386}lib/xine/plugins/1.0.1/xineplug_decode_qt.so
+lib/xine/plugins/1.0.1/xineplug_decode_real.a
+lib/xine/plugins/1.0.1/xineplug_decode_real.so
+lib/xine/plugins/1.0.1/xineplug_decode_real_audio.a
+lib/xine/plugins/1.0.1/xineplug_decode_real_audio.so
+lib/xine/plugins/1.0.1/xineplug_decode_rgb.a
+lib/xine/plugins/1.0.1/xineplug_decode_rgb.so
+lib/xine/plugins/1.0.1/xineplug_decode_speex.a
+lib/xine/plugins/1.0.1/xineplug_decode_speex.so
+lib/xine/plugins/1.0.1/xineplug_decode_spu.a
+lib/xine/plugins/1.0.1/xineplug_decode_spu.so
+lib/xine/plugins/1.0.1/xineplug_decode_spucc.a
+lib/xine/plugins/1.0.1/xineplug_decode_spucc.so
+lib/xine/plugins/1.0.1/xineplug_decode_spucmml.a
+lib/xine/plugins/1.0.1/xineplug_decode_spucmml.so
+lib/xine/plugins/1.0.1/xineplug_decode_spudvb.a
+lib/xine/plugins/1.0.1/xineplug_decode_spudvb.so
+lib/xine/plugins/1.0.1/xineplug_decode_sputext.a
+lib/xine/plugins/1.0.1/xineplug_decode_sputext.so
+lib/xine/plugins/1.0.1/xineplug_decode_vorbis.a
+lib/xine/plugins/1.0.1/xineplug_decode_vorbis.so
+${I386}lib/xine/plugins/1.0.1/xineplug_decode_w32dll.a
+${I386}lib/xine/plugins/1.0.1/xineplug_decode_w32dll.so
+lib/xine/plugins/1.0.1/xineplug_decode_yuv.a
+lib/xine/plugins/1.0.1/xineplug_decode_yuv.so
+lib/xine/plugins/1.0.1/xineplug_dmx_asf.a
+lib/xine/plugins/1.0.1/xineplug_dmx_asf.so
+lib/xine/plugins/1.0.1/xineplug_dmx_audio.a
+lib/xine/plugins/1.0.1/xineplug_dmx_audio.so
+lib/xine/plugins/1.0.1/xineplug_dmx_avi.a
+lib/xine/plugins/1.0.1/xineplug_dmx_avi.so
+lib/xine/plugins/1.0.1/xineplug_dmx_fli.a
+lib/xine/plugins/1.0.1/xineplug_dmx_fli.so
+lib/xine/plugins/1.0.1/xineplug_dmx_flv.a
+lib/xine/plugins/1.0.1/xineplug_dmx_flv.so
+lib/xine/plugins/1.0.1/xineplug_dmx_games.a
+lib/xine/plugins/1.0.1/xineplug_dmx_games.so
+lib/xine/plugins/1.0.1/xineplug_dmx_iff.a
+lib/xine/plugins/1.0.1/xineplug_dmx_iff.so
+lib/xine/plugins/1.0.1/xineplug_dmx_image.a
+lib/xine/plugins/1.0.1/xineplug_dmx_image.so
+lib/xine/plugins/1.0.1/xineplug_dmx_matroska.a
+lib/xine/plugins/1.0.1/xineplug_dmx_matroska.so
+lib/xine/plugins/1.0.1/xineplug_dmx_mng.a
+lib/xine/plugins/1.0.1/xineplug_dmx_mng.so
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.a
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.0.1/xineplug_dmx_nsv.a
+lib/xine/plugins/1.0.1/xineplug_dmx_nsv.so
+lib/xine/plugins/1.0.1/xineplug_dmx_ogg.a
+lib/xine/plugins/1.0.1/xineplug_dmx_ogg.so
+lib/xine/plugins/1.0.1/xineplug_dmx_pva.a
+lib/xine/plugins/1.0.1/xineplug_dmx_pva.so
+lib/xine/plugins/1.0.1/xineplug_dmx_qt.a
+lib/xine/plugins/1.0.1/xineplug_dmx_qt.so
+lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.a
+lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.0.1/xineplug_dmx_real.a
+lib/xine/plugins/1.0.1/xineplug_dmx_real.so
+lib/xine/plugins/1.0.1/xineplug_dmx_slave.a
+lib/xine/plugins/1.0.1/xineplug_dmx_slave.so
+lib/xine/plugins/1.0.1/xineplug_dmx_sputext.a
+lib/xine/plugins/1.0.1/xineplug_dmx_sputext.so
+lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.0.1/xineplug_flac.a
+lib/xine/plugins/1.0.1/xineplug_flac.so
+lib/xine/plugins/1.0.1/xineplug_inp_cdda.a
+lib/xine/plugins/1.0.1/xineplug_inp_cdda.so
+lib/xine/plugins/1.0.1/xineplug_inp_dvb.a
+lib/xine/plugins/1.0.1/xineplug_inp_dvb.so
+lib/xine/plugins/1.0.1/xineplug_inp_dvd.a
+lib/xine/plugins/1.0.1/xineplug_inp_dvd.so
+lib/xine/plugins/1.0.1/xineplug_inp_file.a
+lib/xine/plugins/1.0.1/xineplug_inp_file.so
+lib/xine/plugins/1.0.1/xineplug_inp_http.a
+lib/xine/plugins/1.0.1/xineplug_inp_http.so
+lib/xine/plugins/1.0.1/xineplug_inp_mms.a
+lib/xine/plugins/1.0.1/xineplug_inp_mms.so
+lib/xine/plugins/1.0.1/xineplug_inp_net.a
+lib/xine/plugins/1.0.1/xineplug_inp_net.so
+lib/xine/plugins/1.0.1/xineplug_inp_pnm.a
+lib/xine/plugins/1.0.1/xineplug_inp_pnm.so
+lib/xine/plugins/1.0.1/xineplug_inp_rtp.a
+lib/xine/plugins/1.0.1/xineplug_inp_rtp.so
+lib/xine/plugins/1.0.1/xineplug_inp_rtsp.a
+lib/xine/plugins/1.0.1/xineplug_inp_rtsp.so
+lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.0.1/xineplug_inp_vcd.a
+lib/xine/plugins/1.0.1/xineplug_inp_vcd.so
+lib/xine/plugins/1.0.1/xineplug_inp_vcdo.a
+lib/xine/plugins/1.0.1/xineplug_inp_vcdo.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_aa.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_aa.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_none.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_none.so
+${OPENGL_PLUGIN}lib/xine/plugins/1.0.1/xineplug_vo_out_opengl.a
+${OPENGL_PLUGIN}lib/xine/plugins/1.0.1/xineplug_vo_out_opengl.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_sdl.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_sdl.so
+lib/xine/plugins/1.0.1/xineplug_vo_out_xshm.a
+lib/xine/plugins/1.0.1/xineplug_vo_out_xshm.so
man/man1/xine-config.1
share/aclocal/xine.m4
share/doc/xine/README
+share/doc/xine/README.MINGWCROSS
+share/doc/xine/README.WIN32
share/doc/xine/README.dvb
share/doc/xine/README.dxr3
share/doc/xine/README.freebsd
@@ -214,6 +218,7 @@ share/doc/xine/hackersguide/post_frame.png
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxine1.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libxine1.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxine1.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libxine1.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libxine1.mo
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
index 997972db85b..3710d598581 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.1 2004/12/23 03:05:53 xtraeme Exp $
+@comment $NetBSD: PLIST.common_end,v 1.2 2005/05/02 11:29:35 drochner 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/1.0.0/vidix
-@dirrm lib/xine/plugins/1.0.0/vidix
-@dirrm lib/xine/plugins/1.0.0/post
-@dirrm lib/xine/plugins/1.0.0
+@exec ${MKDIR} %D/lib/xine/plugins/1.0.1/vidix
+@dirrm lib/xine/plugins/1.0.1/vidix
+@dirrm lib/xine/plugins/1.0.1/post
+@dirrm lib/xine/plugins/1.0.1
@dirrm lib/xine/plugins
@dirrm lib/xine
@dirrm include/xine
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 1c966abe6ff..81e96442197 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,22 +1,20 @@
-$NetBSD: distinfo,v 1.17 2005/04/26 12:48:35 tron Exp $
+$NetBSD: distinfo,v 1.18 2005/05/02 11:29:35 drochner Exp $
-SHA1 (xine-lib-1.0.tar.gz) = dd02fb31c68ae68e2283d02e16bb8e80fcced9fd
-RMD160 (xine-lib-1.0.tar.gz) = ad84871d50d51552ba8913c0744e4a2b2b21f124
-Size (xine-lib-1.0.tar.gz) = 7384258 bytes
+SHA1 (xine-lib-1.0.1.tar.gz) = 9973c4674a433baccd81988df0746d9e2d111df8
+RMD160 (xine-lib-1.0.1.tar.gz) = 1e4de9b222a914b516d6cfa08695a9ccad3f3db8
+Size (xine-lib-1.0.1.tar.gz) = 7774954 bytes
SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519
SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
-SHA1 (patch-ag) = 7be1e3d83e3757cf955523245be2deb4cea12998
+SHA1 (patch-ag) = 536e98365a149624083b23cc65af8d4c2320b8d8
SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
-SHA1 (patch-aj) = e9a26ede23d53d83c2799076770e49562a4fc1ea
-SHA1 (patch-ak) = 1dfd2c3d86904ef4869dde4f4309564ac6c9323c
SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
-SHA1 (patch-ao) = 1247ba7ef23f2b28b2c0a177208c912e2fc259a0
+SHA1 (patch-ao) = 425257d43fb0f2c42590401ad17d829b03a28773
SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
-SHA1 (patch-aq) = f4e37c33cd4653542b53bd8b4c2c7bf2620cbb0e
+SHA1 (patch-aq) = 18d1f40634e76e0d05c1dd431142618fe98cf7ce
SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e
@@ -24,6 +22,7 @@ SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b
SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
-SHA1 (patch-be) = de3f7fe1f595ef5696379b183b661197745971a2
-SHA1 (patch-bf) = ea84b3c64dbec8f0559127f9fa28e4afa3e5dc14
+SHA1 (patch-be) = 8e755cd956c6c1987e57497f25354de7796345e0
SHA1 (patch-bg) = c905cbac881a8f623bb0f465194673dcdaf373c0
+SHA1 (patch-ca) = 07696bef0623fcef8dcffe70ba81587f2f147343
+SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 904b1aa64c0..5402da145e4 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
+$NetBSD: patch-ag,v 1.8 2005/05/02 11:29:35 drochner Exp $
---- configure.ac.orig 2004-12-25 18:40:24.000000000 +0100
+--- configure.ac.orig 2005-04-26 10:09:18.000000000 +0200
+++ configure.ac
-@@ -400,6 +400,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+@@ -402,6 +402,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
AC_SUBST(NET_LIBS)
@@ -12,15 +12,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
dnl ---------------------------------------------
dnl socklen_t
-@@ -514,6 +517,7 @@ if test x"$no_x" != "xyes"; then
- AC_FIND_LIBXV
-
- fi
-+AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
-
-
- host_or_hostalias="$host"
-@@ -576,7 +580,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
+@@ -573,7 +576,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
@@ -29,7 +21,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
ac_have_xxmc="yes",
[ac_have_xxmc="no"
-@@ -605,7 +609,7 @@ if test x$ac_have_xxmc = "xyes"; then
+@@ -603,7 +606,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
@@ -38,7 +30,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
ac_have_xxmc="yes",
[ac_have_xxmc="no"
-@@ -659,7 +663,7 @@ saved_libs="$LIBS"
+@@ -657,7 +660,7 @@ saved_libs="$LIBS"
XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
AC_MSG_CHECKING(whether to enable the xvmc plugin)
AC_MSG_RESULT()
@@ -47,7 +39,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
ac_have_xvmc="yes",
[ac_have_xvmc="no"
-@@ -699,8 +703,7 @@ dnl Checks for Xinerama extension
+@@ -697,8 +700,7 @@ dnl Checks for Xinerama extension
dnl ---------------------------------------------
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
@@ -57,7 +49,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv 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")
-@@ -1073,9 +1076,19 @@ dnl ------------------------------------
+@@ -1078,9 +1080,19 @@ dnl ------------------------------------
dnl OSS style audio interface
dnl ---------------------------------------------
@@ -77,7 +69,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
#ifdef __NetBSD__
#include <soundcard.h>
#else
-@@ -1088,7 +1101,7 @@ AC_TRY_COMPILE([
+@@ -1093,7 +1105,7 @@ AC_TRY_COMPILE([
])
AC_MSG_RESULT($have_ossaudio)
AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
@@ -86,7 +78,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
dnl ---------------------------------------------
dnl Alsa support
-@@ -1129,9 +1142,10 @@ dnl ------------------------------------
+@@ -1134,9 +1146,10 @@ dnl ------------------------------------
dnl gnome-vfs support
dnl ---------------------------------------------
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index 62b62d561f5..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2005/04/26 12:48:35 tron Exp $
-
---- src/input/mms.c 2005/01/18 23:25:34 1.55
-+++ src/input/mms.c 2005/04/21 19:02:43 1.56
-@@ -583,9 +583,13 @@
- lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
- stream_id, type, encrypted);
-
-- this->stream_types[stream_id] = type;
-- this->stream_ids[this->num_stream_ids] = stream_id;
-- this->num_stream_ids++;
-+ if (this->num_stream_ids < ASF_MAX_NUM_STREAMS && stream_id < ASF_MAX_NUM_STREAMS) {
-+ this->stream_types[stream_id] = type;
-+ this->stream_ids[this->num_stream_ids] = stream_id;
-+ this->num_stream_ids++;
-+ } else {
-+ lprintf ("too many streams, skipping\n");
-+ }
-
- }
- break;
diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak
deleted file mode 100644
index b5d02e71fae..00000000000
--- a/multimedia/xine-lib/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2005/04/26 12:48:35 tron Exp $
-
---- src/input/librtsp/rtsp.c 2004/07/25 17:13:54 1.18
-+++ src/input/librtsp/rtsp.c 2005/04/16 07:10:51 1.19
-@@ -218,6 +218,7 @@
- unsigned int answer_seq;
- char **answer_ptr=s->answers;
- int code;
-+ int ans_count = 0;
-
- answer=rtsp_get(s);
- if (!answer)
-@@ -268,7 +269,7 @@
- }
- *answer_ptr=answer;
- answer_ptr++;
-- } while (strlen(answer)!=0);
-+ } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-
- s->cseq++;
-
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index b7dc54e47e2..620994d6a49 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,17 +1,8 @@
-$NetBSD: patch-ao,v 1.6 2005/01/06 17:04:42 drochner Exp $
+$NetBSD: patch-ao,v 1.7 2005/05/02 11:29:35 drochner Exp $
---- src/libw32dll/wine/Makefile.in.orig 2004-12-25 23:36:16.000000000 +0100
+--- src/libw32dll/wine/Makefile.in.orig 2005-04-26 10:16:53.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
-@@ -421,6 +421,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
+@@ -364,6 +364,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
W32DLL_DEP = @W32DLL_DEP@
W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
@@ -19,3 +10,12 @@ $NetBSD: patch-ao,v 1.6 2005/01/06 17:04:42 drochner Exp $
WIN32_FALSE = @WIN32_FALSE@
WIN32_TRUE = @WIN32_TRUE@
XGETTEXT = @XGETTEXT@
+@@ -527,7 +528,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-aq b/multimedia/xine-lib/patches/patch-aq
index d595c64a35b..783f5b8079e 100644
--- a/multimedia/xine-lib/patches/patch-aq
+++ b/multimedia/xine-lib/patches/patch-aq
@@ -1,21 +1,21 @@
-$NetBSD: patch-aq,v 1.3 2005/01/06 17:04:42 drochner Exp $
+$NetBSD: patch-aq,v 1.4 2005/05/02 11:29:35 drochner Exp $
---- src/dxr3/Makefile.in.orig 2004-12-25 23:35:02.000000000 +0100
+--- src/dxr3/Makefile.in.orig 2005-04-26 10:15:28.000000000 +0200
+++ src/dxr3/Makefile.in
-@@ -548,6 +548,7 @@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS
+@@ -457,6 +457,7 @@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS
@HAVE_X11_TRUE@link_x_libs = $(X_LIBS) -lXext
@HAVE_LIBFAME_TRUE@link_fame = $(LIBFAME_LIBS)
@HAVE_LIBRTE_TRUE@link_rte = -lrte
+@HAVE_XINERAMA_TRUE@link_xinerama = -lXinerama
+
lib_LTLIBRARIES = $(dxr3_modules)
- xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
- xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
-@@ -566,7 +567,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
- dxr3_scr.c \
+
+@@ -480,7 +481,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
video_out_dxr3.c
+
-xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB)
xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
+
noinst_HEADERS = \
- em8300.h \
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
index d76496dfd7e..7da007fce6c 100644
--- a/multimedia/xine-lib/patches/patch-be
+++ b/multimedia/xine-lib/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.2 2005/01/06 17:04:42 drochner Exp $
+$NetBSD: patch-be,v 1.3 2005/05/02 11:29:35 drochner Exp $
---- src/audio_out/Makefile.in.orig 2004-12-25 23:34:57.000000000 +0100
+--- src/audio_out/Makefile.in.orig 2005-04-26 10:15:23.000000000 +0200
+++ src/audio_out/Makefile.in
-@@ -437,6 +437,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
+@@ -306,6 +306,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@
OPENGL_CFLAGS = @OPENGL_CFLAGS@
OPENGL_LIBS = @OPENGL_LIBS@
@@ -10,12 +10,12 @@ $NetBSD: patch-be,v 1.2 2005/01/06 17:04:42 drochner Exp $
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -623,7 +624,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
- xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
+@@ -509,7 +510,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-bf b/multimedia/xine-lib/patches/patch-bf
deleted file mode 100644
index a31541f19ec..00000000000
--- a/multimedia/xine-lib/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2005/03/28 08:12:48 jmmv Exp $
-
---- m4/xv.m4.orig 2004-12-13 22:35:21.000000000 +0100
-+++ m4/xv.m4
-@@ -43,8 +43,6 @@ AC_DEFUN([AC_TEST_LIBXV],
- ,
- [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
-
-- AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
--
- dnl -----------------------------------------------
- dnl xine_check use Xv functions API.
- dnl -----------------------------------------------
diff --git a/multimedia/xine-lib/patches/patch-ca b/multimedia/xine-lib/patches/patch-ca
new file mode 100644
index 00000000000..d0896b013ff
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ca
@@ -0,0 +1,19 @@
+$NetBSD: patch-ca,v 1.1 2005/05/02 11:29:35 drochner Exp $
+
+--- aclocal.m4.orig 2005-04-30 22:09:14.000000000 +0200
++++ aclocal.m4
+@@ -7869,14 +7869,6 @@ if test x"$external_ffmpeg" != "xno"; th
+ CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
+ LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
+
+- dnl drop the cache
+- for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
+- "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; }
+- done
+-
+ dnl look for headers
+ AC_CHECK_HEADER(avcodec.h, , continue)
+ AC_CHECK_HEADER(postprocess.h, , continue)
diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb
new file mode 100644
index 00000000000..b5ef2e1f58b
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2005/05/02 11:29:35 drochner Exp $
+
+--- src/libw32dll/wine/module.c.orig 2005-04-30 23:33:18.000000000 +0200
++++ src/libw32dll/wine/module.c
+@@ -362,7 +362,7 @@ static WIN_BOOL MODULE_FreeLibrary( WINE
+ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
+ {
+ WINE_MODREF *wm = 0;
+- char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 };
++ char* listpath[] = { "", "", "@W32PATH@", 0 };
+ char path[512];
+ char checked[2000];
+ int i = -1;