Update to 1rc3a. Summary of changes since rc0a:

- Fixed some bugs which caused xine to segfault under certain conditions, and a long-standing issue that would make xine hang with the NPTL implementation in Linux kernel 2.6. - Stabilized core engine and much improved subtitles. - Built-in VCD navigation, XvMC support and better handling of funny filenames. - A security hole regarding the "#save" MRL option has been closed. - Added a feature: append "#save:filename" to an MRL to save the stream during playback. - Lots of bugfixes.
author: jmmv <jmmv> 2004-03-11 17:26:02 +0000
committer: jmmv <jmmv> 2004-03-11 17:26:02 +0000
commit: e95d59afca3638817ffed443bb7be137738622b6 (patch)
tree: 8c205d8e6b68666d6eaeefcd466e6ef6bb6a797e /multimedia
parent: 5f1cf90ceccd9e0cccace2f207ba9d08dbd60a2c (diff)
download: pkgsrc-e95d59afca3638817ffed443bb7be137738622b6.tar.gz
17 files changed, 161 insertions, 391 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index c9fd5722902..5f69efc70c3 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/02/27 13:54:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/11 17:26:02 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		3
-
 .if ${MACHINE_ARCH} == "i386"
 DEPENDS+=       	win32-codecs>=011227:../../multimedia/win32-codecs
 PLIST_SRC=		${PKGDIR}/PLIST.i386
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index bf6ac2f041d..ac567b6a2a0 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.5 2004/02/27 13:54:49 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/03/11 17:26:02 jmmv Exp $
 #
 
-DISTNAME=		xine-lib-1-rc0a
-PKGNAME=		xine-lib-1rc0a
+DISTNAME=		xine-lib-1-rc3a
+PKGNAME=		xine-lib-1rc3a
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/multimedia/xine-lib/PLIST b/multimedia/xine-lib/PLIST
index 6ae89ed0798..ae031e2ebb4 100644
--- a/multimedia/xine-lib/PLIST
+++ b/multimedia/xine-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -9,6 +9,7 @@ include/xine/buffer.h
 include/xine/compat.h
 include/xine/configfile.h
 include/xine/demux.h
+include/xine/info_helper.h
 include/xine/input_plugin.h
 include/xine/io_helper.h
 include/xine/metronom.h
@@ -23,7 +24,6 @@ include/xine/video_out.h
 include/xine/video_overlay.h
 include/xine/vo_scale.h
 include/xine/xine_buffer.h
-include/xine/xine_check.h
 include/xine/xine_internal.h
 include/xine/xine_plugin.h
 include/xine/xineintl.h
@@ -33,8 +33,8 @@ include/xine/xmlparser.h
 lib/libxine.a
 lib/libxine.la
 lib/libxine.so
-lib/libxine.so.7
-lib/libxine.so.7.0
+lib/libxine.so.9
+lib/libxine.so.9.1
 lib/pkgconfig/libxine.pc
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.a
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
@@ -116,8 +116,6 @@ 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_spuogm.a
-lib/xine/plugins/1.0.0/xineplug_decode_spuogm.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_svq1.a
@@ -200,6 +198,8 @@ 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
@@ -218,19 +218,18 @@ share/doc/xine/README
 share/doc/xine/README.config_en
 share/doc/xine/README.dvb
 share/doc/xine/README.dxr3
-share/doc/xine/README.dxr3_pl
 share/doc/xine/README.freebsd
 share/doc/xine/README.irix
-share/doc/xine/README.mrl
 share/doc/xine/README.network_dvd
 share/doc/xine/README.opengl
-share/doc/xine/README.plugins
 share/doc/xine/README.solaris
 share/doc/xine/README.syncfb
-share/doc/xine/README.tvmode
-share/doc/xine/dataflow.dia
 share/doc/xine/faq/faq.html
 share/doc/xine/faq/faq.txt
+share/doc/xine/hackersguide/architecture.png
+share/doc/xine/hackersguide/hackersguide.html
+share/doc/xine/hackersguide/library.png
+share/doc/xine/hackersguide/overlays.png
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo
@@ -243,37 +242,47 @@ share/xine/libxine1/fonts/cc-16.xinefont.gz
 share/xine/libxine1/fonts/cc-20.xinefont.gz
 share/xine/libxine1/fonts/cc-24.xinefont.gz
 share/xine/libxine1/fonts/cc-32.xinefont.gz
+share/xine/libxine1/fonts/cc-48.xinefont.gz
+share/xine/libxine1/fonts/cc-64.xinefont.gz
 share/xine/libxine1/fonts/cci-16.xinefont.gz
 share/xine/libxine1/fonts/cci-20.xinefont.gz
 share/xine/libxine1/fonts/cci-24.xinefont.gz
 share/xine/libxine1/fonts/cci-32.xinefont.gz
+share/xine/libxine1/fonts/cci-48.xinefont.gz
+share/xine/libxine1/fonts/cci-64.xinefont.gz
 share/xine/libxine1/fonts/cetus-16.xinefont.gz
 share/xine/libxine1/fonts/cetus-20.xinefont.gz
 share/xine/libxine1/fonts/cetus-24.xinefont.gz
 share/xine/libxine1/fonts/cetus-32.xinefont.gz
+share/xine/libxine1/fonts/cetus-48.xinefont.gz
+share/xine/libxine1/fonts/cetus-64.xinefont.gz
 share/xine/libxine1/fonts/mono-16.xinefont.gz
 share/xine/libxine1/fonts/mono-20.xinefont.gz
 share/xine/libxine1/fonts/mono-24.xinefont.gz
 share/xine/libxine1/fonts/mono-32.xinefont.gz
+share/xine/libxine1/fonts/mono-48.xinefont.gz
+share/xine/libxine1/fonts/mono-64.xinefont.gz
 share/xine/libxine1/fonts/sans-16.xinefont.gz
 share/xine/libxine1/fonts/sans-20.xinefont.gz
 share/xine/libxine1/fonts/sans-24.xinefont.gz
 share/xine/libxine1/fonts/sans-32.xinefont.gz
-share/xine/libxine1/fonts/sanshu-16.xinefont.gz
-share/xine/libxine1/fonts/sanshu-20.xinefont.gz
-share/xine/libxine1/fonts/sanshu-24.xinefont.gz
-share/xine/libxine1/fonts/sanshu-32.xinefont.gz
+share/xine/libxine1/fonts/sans-48.xinefont.gz
+share/xine/libxine1/fonts/sans-64.xinefont.gz
 share/xine/libxine1/fonts/serif-16.xinefont.gz
 share/xine/libxine1/fonts/serif-20.xinefont.gz
 share/xine/libxine1/fonts/serif-24.xinefont.gz
 share/xine/libxine1/fonts/serif-32.xinefont.gz
+share/xine/libxine1/fonts/serif-48.xinefont.gz
+share/xine/libxine1/fonts/serif-64.xinefont.gz
 @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
-@dirrm lib/xine/plugins/1.0.0/post
+@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
 @dirrm lib/xine/plugins
 @dirrm lib/xine
diff --git a/multimedia/xine-lib/buildlink2.mk b/multimedia/xine-lib/buildlink2.mk
index 4c2336709c3..8754a037635 100644
--- a/multimedia/xine-lib/buildlink2.mk
+++ b/multimedia/xine-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/02/19 17:54:07 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/11 17:26:02 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xine-lib.
 #
@@ -7,7 +7,7 @@
 XINE_LIB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xine-lib
-BUILDLINK_DEPENDS.xine-lib?=		xine-lib>=1rc0anb2
+BUILDLINK_DEPENDS.xine-lib?=		xine-lib>=1rc3a
 BUILDLINK_PKGSRCDIR.xine-lib?=		../../multimedia/xine-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xine-lib=xine-lib
@@ -15,89 +15,6 @@ BUILDLINK_PREFIX.xine-lib_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.xine-lib+=	include/xine.h
 BUILDLINK_FILES.xine-lib+=	include/xine/*.h
 BUILDLINK_FILES.xine-lib+=	lib/libxine.*
-BUILDLINK_FILES.xine-lib+=	lib/pkgconfig/libxine.pc
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/post/xineplug_post_goom.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/post/xineplug_post_invert.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/post/xineplug_post_switch.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_ao_out_esd.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_ao_out_sun.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_a52.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_adpcm.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_cinepak.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_cyuv.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_dts.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_faad.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_ff.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_fli.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_gsm610.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_logpcm.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_lpcm.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_mad.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_msrle.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_msvc.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_nsf.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_qt.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_qtrle.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_real.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_real_audio.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_rgb.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_spu.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_spucc.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_sputext.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_svq1.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_vorbis.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_w32dll.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_wc3video.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_yuv.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_asf.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_audio.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_avi.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_fli.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_games.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_mng.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_ogg.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_pva.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_qt.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_real.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_sputext.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_flac.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_cdda.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_dvb.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_dvd.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_file.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_http.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_mms.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_net.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_pnm.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_rtp.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_rtsp.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_inp_vcd.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_aa.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_none.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.*
-BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_xv.*
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/SDL/buildlink2.mk"
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index e9b413a6197..b06fb5f06a4 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 17:26:02 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxine-lib}
 BUILDLINK_PACKAGES+=	xine-lib
 
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc0anb2
+BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3a
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 
 .include "../../audio/flac/buildlink3.mk"
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 990cef7dc99..9894cb79798 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,23 +1,20 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
-SHA1 (xine-lib-1-rc0a.tar.gz) = ee41ba602179a9f02208a15e3dff36a1dfa00fac
-Size (xine-lib-1-rc0a.tar.gz) = 4211552 bytes
-SHA1 (patch-aa) = 692e3266d6250899daee1cf1c5e6733f8576a5f4
-SHA1 (patch-ab) = 4da2e4cdcb0f0f5273eae4caa196c06e3ae6064b
-SHA1 (patch-ac) = df25d862f84de5221d722f9415a201986dc5d952
+SHA1 (xine-lib-1-rc3a.tar.gz) = 6ccf01f697693e31f78a51acf2f20d6d24e25586
+Size (xine-lib-1-rc3a.tar.gz) = 6121483 bytes
+SHA1 (patch-aa) = b8493cabd3f9d9eb57d414265ea1eac4db71fa08
+SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
+SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
 SHA1 (patch-ad) = ed65116acfa1f32a0508338a11567589bc2b4123
 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
 SHA1 (patch-af) = 0d2860c863c4121288289b88d46433a94dde120b
-SHA1 (patch-ag) = 132a8db657ce0bc3ac9e74560aae9054996fa57e
+SHA1 (patch-ag) = ebfc011fdef1831caa0f6a7e10a2c77fc2b420fb
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
-SHA1 (patch-aj) = 54cf69b028d46327d46b5cc2a0ec457bd4a59b67
-SHA1 (patch-ak) = 5e791e17755e0b7515d81f80790d529992e827d6
 SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99
 SHA1 (patch-am) = 0441dcd9faf0c0e7f07c8d0fc7a61fcce435af76
-SHA1 (patch-an) = 4877ff4f905c2b62c37c0d4bbb51510d8a043344
-SHA1 (patch-ao) = 53de6febfed214e9e43d53e3e5b83af1fcb19b20
-SHA1 (patch-ap) = 7bb70f8d5cee7787e831649cb746d21000a357fc
+SHA1 (patch-ao) = d4cbdf5da7c912b4306681032d6d964b84760909
+SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
 SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded
-SHA1 (patch-ar) = 3ca0dd7be3e94d3c302299efc706af27f8faf1c1
-SHA1 (patch-as) = 3f0825d62844e5dba66c97ddac515653d07e85d8
+SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
+SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
diff --git a/multimedia/xine-lib/patches/patch-aa b/multimedia/xine-lib/patches/patch-aa
index d2968fc099f..5fd1e44f5c9 100644
--- a/multimedia/xine-lib/patches/patch-aa
+++ b/multimedia/xine-lib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/xine-engine/video_decoder.c.orig	2003-04-06 10:23:10.000000000 +1000
+--- src/xine-engine/video_decoder.c.orig	2003-12-08 11:36:27.000000000 +0100
 +++ src/xine-engine/video_decoder.c
-@@ -33,6 +33,10 @@
+@@ -41,6 +41,10 @@
  #include "xineutils.h"
  #include <sched.h>
  
@@ -10,29 +10,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
 +#define SCHED_OTHER 0
 +#endif
 +
- /*
- #define LOG
- */
-@@ -393,7 +397,9 @@ void *video_decoder_loop (void *stream_g
- void video_decoder_init (xine_stream_t *stream) {
-   
-   pthread_attr_t       pth_attrs;
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-   struct sched_param   pth_params;
-+#endif
-   int		       err, num_buffers;
+ static void update_spu_decoder (xine_stream_t *stream, int type) {
  
-   /* The fifo size is based on dvd playback where buffers are filled
-@@ -416,10 +422,12 @@ void video_decoder_init (xine_stream_t *
-   stream->spu_track_map_entries = 0;
- 
-   pthread_attr_init(&pth_attrs);
+   int streamtype = (type>>16) & 0xFF;
+@@ -390,7 +394,9 @@ void _x_video_decoder_init (xine_stream_
+   } else {
+      
+     pthread_attr_t       pth_attrs;
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-   pthread_attr_getschedparam(&pth_attrs, &pth_params);
-   pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-   pthread_attr_setschedparam(&pth_attrs, &pth_params);
-   pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
+     struct sched_param   pth_params;
 +#endif
+     int		       err, num_buffers;
+     /* The fifo size is based on dvd playback where buffers are filled
+      * with 2k of data. With 500 buffers and a typical video data rate
+@@ -411,10 +417,12 @@ void _x_video_decoder_init (xine_stream_
+     stream->spu_track_map_entries = 0;
    
-   if ((err = pthread_create (&stream->video_thread,
- 			     &pth_attrs, video_decoder_loop, stream)) != 0) {
+     pthread_attr_init(&pth_attrs);
++#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
+     pthread_attr_getschedparam(&pth_attrs, &pth_params);
+     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
+     pthread_attr_setschedparam(&pth_attrs, &pth_params);
+     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
++#endif
+     
+     if ((err = pthread_create (&stream->video_thread,
+                                &pth_attrs, video_decoder_loop, stream)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ab b/multimedia/xine-lib/patches/patch-ab
index fd61cc23a73..4b5187aede9 100644
--- a/multimedia/xine-lib/patches/patch-ab
+++ b/multimedia/xine-lib/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/xine-engine/audio_decoder.c.orig	2003-04-06 10:23:10.000000000 +1000
+--- src/xine-engine/audio_decoder.c.orig	2003-12-12 20:30:51.000000000 +0100
 +++ src/xine-engine/audio_decoder.c
-@@ -353,7 +353,9 @@ void *audio_decoder_loop (void *stream_g
- void audio_decoder_init (xine_stream_t *stream) {
+@@ -338,7 +338,9 @@ static void *audio_decoder_loop (void *s
+ void _x_audio_decoder_init (xine_stream_t *stream) {
  
    pthread_attr_t       pth_attrs;
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
@@ -12,16 +12,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
    int                  err;
  
    if (stream->audio_out == NULL) {
-@@ -379,10 +381,12 @@ void audio_decoder_init (xine_stream_t *
-   */
+@@ -364,10 +366,12 @@ void _x_audio_decoder_init (xine_stream_
+      */
  
-   pthread_attr_init(&pth_attrs);
+     pthread_attr_init(&pth_attrs);
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-   pthread_attr_getschedparam(&pth_attrs, &pth_params);
-   pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-   pthread_attr_setschedparam(&pth_attrs, &pth_params);
-   pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
+     pthread_attr_getschedparam(&pth_attrs, &pth_params);
+     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
+     pthread_attr_setschedparam(&pth_attrs, &pth_params);
+     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
    
-   if ((err = pthread_create (&stream->audio_thread,
- 			     &pth_attrs, audio_decoder_loop, stream)) != 0) {
+     if ((err = pthread_create (&stream->audio_thread,
+                                &pth_attrs, audio_decoder_loop, stream)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ac b/multimedia/xine-lib/patches/patch-ac
index d4d834b69a3..9f0459159f1 100644
--- a/multimedia/xine-lib/patches/patch-ac
+++ b/multimedia/xine-lib/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/audio_out/audio_sun_out.c.orig	2003-07-13 19:29:04.000000000 +0000
-+++ src/audio_out/audio_sun_out.c	2003-10-02 09:51:34.000000000 +0000
+--- src/audio_out/audio_sun_out.c.orig	2003-12-14 23:13:22.000000000 +0100
++++ src/audio_out/audio_sun_out.c
 @@ -41,6 +41,11 @@
  #ifdef	__svr4__
  #include <stropts.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
  #include "xine_internal.h"
  #include "xineutils.h"
-@@ -89,7 +94,9 @@
+@@ -89,7 +94,9 @@ typedef struct sun_driver_s {
    uint32_t       num_channels;
    int		 bytes_per_frame;
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
    enum {
        RTSC_UNKNOWN = 0,
-@@ -113,12 +120,14 @@
+@@ -113,12 +120,14 @@ typedef struct sun_driver_s {
    unsigned	 buf_len;
  #endif
  
@@ -39,15 +39,15 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  } sun_driver_t;
  
  
-@@ -128,6 +137,7 @@
+@@ -128,6 +137,7 @@ typedef struct sun_driver_s {
   */
- static int realtime_samplecounter_available(char *dev)
+ static int realtime_samplecounter_available(xine_t *xine, char *dev)
  {
 +#ifndef __NetBSD__
    int fd = -1;
    audio_info_t info;
    int rtsc_ok = RTSC_DISABLED;
-@@ -246,6 +256,9 @@
+@@ -246,6 +256,9 @@ error:
    }
  
    return rtsc_ok;
@@ -57,7 +57,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  }
  
  
-@@ -431,7 +444,9 @@
+@@ -429,7 +442,9 @@ static int ao_sun_open(ao_driver_t *this
    
    this->mode			= mode;
    this->input_sample_rate	= rate;
@@ -67,7 +67,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
    /*
     * open audio device
-@@ -463,6 +478,9 @@
+@@ -461,6 +476,9 @@ static int ao_sun_open(ao_driver_t *this
        info.play.sample_rate = this->input_sample_rate;
        info.play.eof = 0;
        info.play.samples = 0;
@@ -77,7 +77,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
        this->convert_u8_s8 = 0;
  
-@@ -524,7 +542,9 @@
+@@ -522,7 +540,9 @@ static int ao_sun_open(ao_driver_t *this
        return 0;
    }
  
@@ -87,7 +87,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
    this->output_sample_rate = info.play.sample_rate;
    this->num_channels = info.play.channels;
-@@ -566,6 +586,7 @@
+@@ -563,6 +583,7 @@ static int ao_sun_delay(ao_driver_t *thi
    sun_driver_t *this = (sun_driver_t *) this_gen;
    audio_info_t info;
  
@@ -95,7 +95,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
    if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
        (this->frames_in_buffer == 0 || info.play.samples > 0)) {
  
-@@ -611,6 +632,10 @@
+@@ -609,6 +630,10 @@ static int ao_sun_delay(ao_driver_t *thi
      }
  #endif
    }
@@ -106,7 +106,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
    return NOT_REAL_TIME;
  }
  
-@@ -719,7 +744,9 @@
+@@ -717,7 +742,9 @@ static int ao_sun_write(ao_driver_t *thi
    if (num_written > 0) {
      int buffered_samples;
  
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 8fafd4c0bd7..aa144571835 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,47 +1,33 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- configure.orig	2003-08-02 13:50:43.000000000 +0000
-+++ configure	2003-10-06 04:36:21.000000000 +0000
-@@ -467,7 +467,7 @@
+--- configure.orig	2003-12-28 16:25:26.000000000 +0100
++++ configure
+@@ -463,7 +463,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO RANLIB ac_ct_RANLIB LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBA52_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE HAVE_NVTV_TRUE HAVE_NVTV_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE XVID_CFLAGS XVID_LIBS HAVE_XVID_TRUE HAVE_XVID_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE ANSI_FLAGS PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO RANLIB ac_ct_RANLIB LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBA52_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE HAVE_NVTV_TRUE HAVE_NVTV_FALSE NET_LIBS WINE_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE XVID_CFLAGS XVID_LIBS HAVE_XVID_TRUE HAVE_XVID_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE ANSI_FLAGS PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XVMC_TRUE HAVE_XVMC_FALSE HAVE_XVMC_STATIC_TRUE HAVE_XVMC_STATIC_FALSE XVMC_LIB HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS FIG2DEV LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS WINE_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XVMC_TRUE HAVE_XVMC_FALSE HAVE_XVMC_STATIC_TRUE HAVE_XVMC_STATIC_FALSE XVMC_LIB HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS FIG2DEV LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -2874,12 +2874,12 @@
+@@ -2980,6 +2980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    (exit $ac_status); }; }; then
    for ac_declaration in \
-    ''\
+    '' \
 +   '#include <stdlib.h>' \
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
-    'extern "C" void exit (int);' \
--   'void exit (int);' \
--   '#include <stdlib.h>'
-+   'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -3671,12 +3671,12 @@
+@@ -3844,6 +3845,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    (exit $ac_status); }; }; then
    for ac_declaration in \
-    ''\
+    '' \
 +   '#include <stdlib.h>' \
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
-    'extern "C" void exit (int);' \
--   'void exit (int);' \
--   '#include <stdlib.h>'
-+   'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -14158,6 +14158,66 @@
+@@ -26427,6 +26429,64 @@ fi
  
  
  
@@ -60,7 +46,6 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +#ifdef __cplusplus
 +extern "C"
@@ -104,20 +89,19 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
 +  WINE_LIBS="-li386 $WINE_LIBS"
 +fi
 +
-+
- 
  echo "$as_me:$LINENO: checking for gzsetparams in -lz" >&5
  echo $ECHO_N "checking for gzsetparams in -lz... $ECHO_C" >&6
-@@ -14398,7 +14458,7 @@
+ if test "${ac_cv_lib_z_gzsetparams+set}" = set; then
+@@ -26727,7 +26787,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS $LIBS"
 +LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -14578,7 +14638,7 @@
+ _ACEOF
+@@ -26923,7 +26983,7 @@ echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&
  fi
  if test $ac_cv_header_GL_gl_h = yes; then
     ac_have_opengl="yes"
@@ -126,7 +110,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  	       echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then
-@@ -15265,7 +15325,6 @@
+@@ -27805,7 +27865,6 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
  echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
  if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
@@ -134,122 +118,26 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XINERAMA 1
-@@ -18624,7 +18683,7 @@
-     XVID_LIBS="-L$xvid_prefix/lib"
-   fi
+@@ -33140,6 +33199,7 @@ fi
  
--  XVID_LIBS="$XVID_LIBS -lxvidcore"
-+  XVID_LIBS="$XVID_LIBS -lxvidcore -lm"
  
-   echo "$as_me:$LINENO: checking for XviD" >&5
- echo $ECHO_N "checking for XviD... $ECHO_C" >&6
-@@ -20505,102 +20564,7 @@
- fi
  
++if false; then
+   succeeded=no
  
--
--  succeeded=no
--
--  if test -z "$PKG_CONFIG"; then
--    # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
--if test -n "$PKG_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  fi
--
--  if test "$PKG_CONFIG" = "no" ; then
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for gnome-vfs-2.0" >&5
--echo $ECHO_N "checking for gnome-vfs-2.0... $ECHO_C" >&6
--
--        if $PKG_CONFIG --exists "gnome-vfs-2.0" ; then
--            echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--            succeeded=yes
--
--            echo "$as_me:$LINENO: checking GNOME_VFS_CFLAGS" >&5
--echo $ECHO_N "checking GNOME_VFS_CFLAGS... $ECHO_C" >&6
--            GNOME_VFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0"`
--            echo "$as_me:$LINENO: result: $GNOME_VFS_CFLAGS" >&5
--echo "${ECHO_T}$GNOME_VFS_CFLAGS" >&6
--
--            echo "$as_me:$LINENO: checking GNOME_VFS_LIBS" >&5
--echo $ECHO_N "checking GNOME_VFS_LIBS... $ECHO_C" >&6
--            GNOME_VFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0"`
--            echo "$as_me:$LINENO: result: $GNOME_VFS_LIBS" >&5
--echo "${ECHO_T}$GNOME_VFS_LIBS" >&6
--        else
--            GNOME_VFS_CFLAGS=""
--            GNOME_VFS_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
--            ## do set a variable so people can do so.
--            GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0"`
--
--        fi
--
--
--
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     no_gnome_vfs=no
--  else
--     no_gnome_vfs=yes
--  fi
--
+   if test -z "$PKG_CONFIG"; then
+@@ -33234,6 +33294,8 @@ echo "${ECHO_T}$GNOME_VFS_LIBS" >&6
+   else
+      no_gnome_vfs=yes
+   fi
++fi
 +no_gnome_vfs=yes
  
  
- if test x"$no_gnome_vfs" != "xyes"; then
-@@ -24379,6 +24343,7 @@
- s,@HAVE_NVTV_TRUE@,$HAVE_NVTV_TRUE,;t t
- s,@HAVE_NVTV_FALSE@,$HAVE_NVTV_FALSE,;t t
+ 
+@@ -40710,6 +40772,7 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ s,@HAVE_X11_TRUE@,$HAVE_X11_TRUE,;t t
+ s,@HAVE_X11_FALSE@,$HAVE_X11_FALSE,;t t
  s,@NET_LIBS@,$NET_LIBS,;t t
 +s,@WINE_LIBS@,$WINE_LIBS,;t t
  s,@HAVE_ZLIB_TRUE@,$HAVE_ZLIB_TRUE,;t t
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index f23f24733a2..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
-
---- include/xine.h.in.orig	2003-07-13 19:29:04.000000000 +0000
-+++ include/xine.h.in
-@@ -1677,7 +1677,7 @@ void        xine_osd_get_palette   (xine
- 
- typedef enum {
- 	XINE_TVSYSTEM_PAL    = 0,
--	XINE_TVSYSTEM_NTSC   = 1,
-+	XINE_TVSYSTEM_NTSC   = 1
- } xine_tvsystem;
- 
- /* connect to nvtvd server and save current TV and X settings */
diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak
deleted file mode 100644
index b4430cab241..00000000000
--- a/multimedia/xine-lib/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
-
---- include/xine.h.orig	2003-08-02 13:51:35.000000000 +0000
-+++ include/xine.h
-@@ -1677,7 +1677,7 @@ void        xine_osd_get_palette   (xine
- 
- typedef enum {
- 	XINE_TVSYSTEM_PAL    = 0,
--	XINE_TVSYSTEM_NTSC   = 1,
-+	XINE_TVSYSTEM_NTSC   = 1
- } xine_tvsystem;
- 
- /* connect to nvtvd server and save current TV and X settings */
diff --git a/multimedia/xine-lib/patches/patch-an b/multimedia/xine-lib/patches/patch-an
deleted file mode 100644
index 1fce67130cb..00000000000
--- a/multimedia/xine-lib/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
-
---- src/libw32dll/wine/Makefile.am.orig	2003-07-20 22:08:20.000000000 +0000
-+++ src/libw32dll/wine/Makefile.am	2003-10-02 12:53:55.000000000 +0000
-@@ -34,7 +34,7 @@
- 	vfl.c \
- 	win32.c 
- 
--libwine_la_LIBADD = stubs.lo wrapper.lo
-+libwine_la_LIBADD = stubs.lo wrapper.lo ${WINE_LIBS}
- 
- noinst_HEADERS = \
- 	avifmt.h \
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index 1d56562cb8e..06e77cfd234 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ao,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2003-08-02 13:50:27.000000000 +0000
-+++ src/libw32dll/wine/Makefile.in	2003-10-02 12:54:19.000000000 +0000
-@@ -194,6 +194,7 @@
+--- src/libw32dll/wine/Makefile.in.orig	2003-12-28 16:25:04.000000000 +0100
++++ src/libw32dll/wine/Makefile.in
+@@ -219,6 +219,7 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
  VORBIS_LIBS = @VORBIS_LIBS@
  W32DLL_DEP = @W32DLL_DEP@
  W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
@@ -10,12 +10,12 @@ $NetBSD: patch-ao,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  XINE_ACFLAGS = @XINE_ACFLAGS@
  XINE_BIN_AGE = @XINE_BIN_AGE@
  XINE_BUILD_CC = @XINE_BUILD_CC@
-@@ -258,7 +259,7 @@
- 	win32.c 
+@@ -329,7 +330,7 @@ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
  
- 
--libwine_la_LIBADD = stubs.lo wrapper.lo
-+libwine_la_LIBADD = stubs.lo wrapper.lo ${WINE_LIBS}
- 
- noinst_HEADERS = \
- 	avifmt.h \
+ 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-ap b/multimedia/xine-lib/patches/patch-ap
index d85db11f960..fb47a5fd0ab 100644
--- a/multimedia/xine-lib/patches/patch-ap
+++ b/multimedia/xine-lib/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ap,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/dxr3/Makefile.am.orig	2003-07-13 19:29:04.000000000 +0000
-+++ src/dxr3/Makefile.am	2003-10-05 09:04:21.000000000 +0000
-@@ -18,6 +18,9 @@
+--- src/dxr3/Makefile.am.orig	2003-09-13 16:21:09.000000000 +0200
++++ src/dxr3/Makefile.am
+@@ -18,6 +18,9 @@ endif
  if HAVE_LIBRTE
  link_rte = -lrte
  endif
@@ -12,8 +12,8 @@ $NetBSD: patch-ap,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
  lib_LTLIBRARIES = $(dxr3_modules) 
  
-@@ -42,7 +45,7 @@
- 	dxr3_spu_encoder.c \
+@@ -43,7 +46,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
+ 	dxr3_scr.c \
  	video_out_dxr3.c 
  
 -xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
diff --git a/multimedia/xine-lib/patches/patch-ar b/multimedia/xine-lib/patches/patch-ar
index 98d12dcaa61..2a06db104e9 100644
--- a/multimedia/xine-lib/patches/patch-ar
+++ b/multimedia/xine-lib/patches/patch-ar
@@ -1,13 +1,13 @@
-$NetBSD: patch-ar,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ar,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/video_out/video_out_aa.c.orig	2003-07-13 19:29:04.000000000 +0000
-+++ src/video_out/video_out_aa.c	2003-10-06 07:16:39.000000000 +0000
-@@ -109,6 +109,8 @@
-   frame = (aa_frame_t *) malloc (sizeof (aa_frame_t));
-   memset (frame, 0, sizeof (aa_frame_t));
+--- src/video_out/video_out_aa.c.orig	2003-12-14 23:13:25.000000000 +0100
++++ src/video_out/video_out_aa.c
+@@ -113,6 +113,8 @@ static vo_frame_t *aa_alloc_frame(vo_dri
+   if (!frame)
+     return NULL;
  
 +  pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 +
-   frame->vo_frame.copy = NULL;
+   frame->vo_frame.proc_slice = NULL;
+   frame->vo_frame.proc_frame = NULL;
    frame->vo_frame.field = aa_frame_field;
-   frame->vo_frame.dispose = aa_dispose_frame;
diff --git a/multimedia/xine-lib/patches/patch-as b/multimedia/xine-lib/patches/patch-as
index b7eed19f46b..034689a6808 100644
--- a/multimedia/xine-lib/patches/patch-as
+++ b/multimedia/xine-lib/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-as,v 1.2 2004/03/11 17:26:02 jmmv Exp $
 
---- src/video_out/video_out_none.c.orig	2003-07-13 19:29:04.000000000 +0000
-+++ src/video_out/video_out_none.c	2003-10-06 07:16:41.000000000 +0000
-@@ -95,6 +95,8 @@
-     abort();
-   }
-   
+--- src/video_out/video_out_none.c.orig	2003-12-14 23:13:25.000000000 +0100
++++ src/video_out/video_out_none.c
+@@ -65,6 +65,8 @@ typedef struct {
+ 
+ 
+ static void free_framedata(none_frame_t* frame) {
 +  pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 +
-   frame->vo_frame.base[0] = NULL;
-   frame->vo_frame.base[1] = NULL;
-   frame->vo_frame.base[2] = NULL;
+   if(frame->vo_frame.base[0]) {
+     free(frame->vo_frame.base[0]);
+     frame->vo_frame.base[0] = NULL;
author	jmmv <jmmv>	2004-03-11 17:26:02 +0000
committer	jmmv <jmmv>	2004-03-11 17:26:02 +0000
commit	e95d59afca3638817ffed443bb7be137738622b6 (patch)
tree	8c205d8e6b68666d6eaeefcd466e6ef6bb6a797e /multimedia
parent	5f1cf90ceccd9e0cccace2f207ba9d08dbd60a2c (diff)
download	pkgsrc-e95d59afca3638817ffed443bb7be137738622b6.tar.gz