18 files changed, 165 insertions, 604 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 7cdc7ee0a2a4..77e0d335283d 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,23 +18,25 @@ COMMENT=	Libraries for xine multimedia player
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
-		a52.0:${PORTSDIR}/audio/liba52 \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		mad.2:${PORTSDIR}/audio/libmad \
 		speex.3:${PORTSDIR}/audio/speex \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
 		freetype.9:${PORTSDIR}/print/freetype2 \
-		fame-0.9.1:${PORTSDIR}/multimedia/libfame
+		fame-0.9.1:${PORTSDIR}/multimedia/libfame \
+		cdio.6:${PORTSDIR}/sysutils/libcdio \
+		modplug.0:${PORTSDIR}/audio/libmodplug \
+		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
+		Wand.8:${PORTSDIR}/graphics/ImageMagick
 
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=	15
 WANT_GNOME=	yes
-USE_GNOME=	lthack gnomehack gnometarget
+USE_GNOME=	gnomehack gnometarget
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_SDL=	sdl
@@ -48,7 +50,8 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCA
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6
 INSTALLS_SHLIB=	yes
 
-MAN1=		xine-config.1
+MAN1=	xine-config.1
+MAN5=	xine.5
 
 .include <bsd.port.pre.mk>
 
@@ -63,41 +66,48 @@ PLIST_SUB+=	WITH_LIBXV=""
 PLIST_SUB+=	WITH_LIBXV="@comment "
 .endif
 
-.if exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS)
+.if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 PLIST_SUB+=	WITH_ARTS=""
 .else
 PLIST_SUB+=	WITH_ARTS="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA)
+.if !defined(WITHOUT_LIBCACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA))
 BUILD_DEPENDS+=	caca-config:${PORTSDIR}/graphics/libcaca
 PLIST_SUB+=	WITH_LIBCACA=""
 .else
 PLIST_SUB+=	WITH_LIBCACA="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
+.if !defined(WITHOUT_ESOUND) && (${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND))
 USE_GNOME+=	esound
 PLIST_SUB+=	WITH_ESOUND=""
 .else
 PLIST_SUB+=	WITH_ESOUND="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mgnomevfs2} != ""
+.if !defined(WITHOUT_GNOMEVFS2) && (${HAVE_GNOME:Mgnomevfs2} != "" || defined(WITH_GNOMEVFS2))
 USE_GNOME+=	gnomevfs2
 PLIST_SUB+=	WITH_GNOMEVFS2=""
 .else
 PLIST_SUB+=	WITH_GNOMEVFS2="@comment "
 .endif
 
+.if !defined(WITHOUT_POLYPAUDIO) && (exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) || defined(WITH_POLYPAUDIO))
+LIB_DEPENDS+=	polyp-0.7.0:${PORTSDIR}/audio/polypaudio
+PLIST_SUB+=	WITH_POLYPAUDIO=""
+.else
+PLIST_SUB+=	WITH_POLYPAUDIO="@comment "
+.endif
+
 .if ${ARCH} == "i386"
 PLIST_SUB+=	WITH_VIDIX=""
 .else
 PLIST_SUB+=	WITH_VIDIX="@comment "
 .endif
 
-.if exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC)
+.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC))
 CONFIGURE_ARGS+=--with-xvmc-lib=XvMCNVIDIA
 LIB_DEPENDS+=	XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
 PLIST_SUB+=	WITH_XVMC=""
@@ -105,14 +115,14 @@ PLIST_SUB+=	WITH_XVMC=""
 PLIST_SUB+=	WITH_XVMC="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libtheora.so.1) || defined (WITH_LIBTHEORA)
+.if !defined(WITHOUT_LIBTHEORA) && (exists(${LOCALBASE}/lib/libtheora.so.1) || defined (WITH_LIBTHEORA))
 LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
 PLIST_SUB+=	WITH_LIBTHEORA=""
 .else
 PLIST_SUB+=	WITH_LIBTHEORA="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB)
+.if !defined(WITHOUT_SMB) && (exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB))
 LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	WITH_SMB=""
 .else
@@ -133,16 +143,36 @@ pre-everything::
 .else
 	@${ECHO_MSG} "===> WITH_LIBCACA (libcaca support, enabled)"
 .endif
+.if !(${HAVE_GNOME:Mgnomevfs2} != "") && !defined(WITH_GNOMEVFS2)
+	@${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support)"
+.else
+	@${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support, enabled)"
+.endif
 .if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND)
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support)"
 .else
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
 .endif
+.if !exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) && !defined(WITH_POLYPAUDIO)
+	@${ECHO_MSG} "===> WITH_POLYPAUDIO (polypaudio support)"
+.else
+	@${ECHO_MSG} "===> WITH_POLYPAUDIO (polypaudio support, enabled)"
+.endif
+.if !exists(${LOCALBASE}/lib/libsmbclient.so.0) && !defined (WITH_SMB)
+	@${ECHO_MSG} "===> WITH_SMB (SMB support)"
+.else
+	@${ECHO_MSG} "===> WITH_SMB (SMB support, enabled)"
+.endif
 .if !exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITH_LIBTHEORA)
 	@${ECHO_MSG} "===> WITH_LIBTHEORA (libtheora support)"
 .else
 	@${ECHO_MSG} "===> WITH_LIBTHEORA (libtheora support, enabled)"
 .endif
+.if !exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) && !defined(WITH_XVMC)
+	@${ECHO_MSG} "===> WITH_XVMC (XvMC support)"
+.else
+	@${ECHO_MSG} "===> WITH_XVMC (XvMC support, enabled)"
+.endif
 	@${ECHO_MSG} "===>"
 
 post-patch:
@@ -159,5 +189,6 @@ post-patch:
 		  s|-malign-jumps|-falign-jumps|g ; \
 		  s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
 .endif
+	${CP} ${LTMAIN} ${WRKSRC}/ltmain.sh
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index e66d75230f54..0a6299f785f4 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,2 +1,2 @@
-MD5 (xine-lib-1.0.1.tar.gz) = 9be804b337c6c3a2e202c5a7237cb0f8
-SIZE (xine-lib-1.0.1.tar.gz) = 7774954
+MD5 (xine-lib-1.1.0.tar.gz) = 3537cfd58d253b4be20a4975e7086e38
+SIZE (xine-lib-1.1.0.tar.gz) = 8036882
diff --git a/multimedia/libxine/files/patch-ltmain.sh b/multimedia/libxine/files/patch-ltmain.sh
deleted file mode 100644
index f9b3022f3c06..000000000000
--- a/multimedia/libxine/files/patch-ltmain.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- ltmain.sh.orig	Wed Jan 16 09:00:24 2002
-+++ ltmain.sh	Fri Jan 25 05:08:03 2002
-@@ -958,6 +958,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -4247,10 +4248,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/libxine/files/patch-src:input:libdvdnav:bswap.h b/multimedia/libxine/files/patch-src:input:libdvdnav:bswap.h
deleted file mode 100644
index 65a5e126ff9e..000000000000
--- a/multimedia/libxine/files/patch-src:input:libdvdnav:bswap.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/libdvdnav/bswap.h.orig	Wed Apr 30 06:55:46 2003
-+++ src/input/libdvdnav/bswap.h	Tue Jul  8 22:28:49 2003
-@@ -53,7 +53,7 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
--#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 500034
- #include <sys/endian.h>
- #define B2N_16(x) x = be16toh(x)
- #define B2N_32(x) x = be32toh(x)
diff --git a/multimedia/libxine/files/patch-src:input:libdvdnav:vm.c b/multimedia/libxine/files/patch-src:input:libdvdnav:vm.c
deleted file mode 100644
index 59a92de19884..000000000000
--- a/multimedia/libxine/files/patch-src:input:libdvdnav:vm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/libdvdnav/vm.c.orig	Sat Jan 11 23:43:55 2003
-+++ src/input/libdvdnav/vm.c	Sat Jan 11 23:45:47 2003
-@@ -48,6 +48,8 @@
- 
- #define STRICT
- 
-+#define off64_t off_t
-+#define lseek64 lseek
- 
- /* Local prototypes */
- 
diff --git a/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c b/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c
deleted file mode 100644
index bbaa4f2006ee..000000000000
--- a/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/vcd/xineplug_inp_vcd.c.orig	Thu Aug 12 19:04:34 2004
-+++ src/input/vcd/xineplug_inp_vcd.c	Mon Nov 15 00:50:44 2004
-@@ -923,7 +923,7 @@
- static const char *
- vcd_class_get_identifier (input_class_t *this_gen) {
-   dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
--  return SHORT_PLUGIN_NAME;
-+  return strdup(SHORT_PLUGIN_NAME);
- }
- 
- /* 
diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.in b/multimedia/libxine/files/patch-src:liba52:Makefile.in
deleted file mode 100644
index 0228e3b5a222..000000000000
--- a/multimedia/libxine/files/patch-src:liba52:Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/liba52/Makefile.in.orig	Wed Apr 27 02:01:07 2005
-+++ src/liba52/Makefile.in	Wed Apr 27 02:06:51 2005
-@@ -451,16 +451,11 @@
- lib_LTLIBRARIES = xineplug_decode_a52.la
- 
- xineplug_decode_a52_la_SOURCES = \
--	bitstream.c \
--	bit_allocate.c \
- 	crc.c \
--	downmix.c \
--	imdct.c \
--	parse.c \
- 	xine_decoder.c
- 
- 
--xineplug_decode_a52_la_LIBADD = $(XINE_LIB)
-+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -ldjbfft
- xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
- noinst_HEADERS = \
-@@ -478,8 +473,7 @@
- 
- xineplug_decode_a52_la_DEPENDENCIES = \
- 	$(top_builddir)/src/xine-engine/libxine.la
--am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo crc.lo \
--	downmix.lo imdct.lo parse.lo xine_decoder.lo
-+am_xineplug_decode_a52_la_OBJECTS = crc.lo xine_decoder.lo
- xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -549,12 +543,7 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit_allocate.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstream.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/downmix.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imdct.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
- 
- distclean-depend:
diff --git a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
deleted file mode 100644
index a17a4aa11a12..000000000000
--- a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/liba52/xine_decoder.c.orig	Tue Feb 18 07:15:22 2003
-+++ src/liba52/xine_decoder.c	Tue Mar 25 00:39:52 2003
-@@ -37,8 +37,8 @@
- 
- #include "xine_internal.h"
- #include "audio_out.h"
--#include "a52.h"
--#include "a52_internal.h"
-+#include <a52dec/a52.h>
-+#include <a52dec/a52_internal.h>
- #include "buffer.h"
- #include "xineutils.h"
- 
diff --git a/multimedia/libxine/files/patch-src:libfaad:structs.h b/multimedia/libxine/files/patch-src:libfaad:structs.h
deleted file mode 100644
index bbaacb2b6aa4..000000000000
--- a/multimedia/libxine/files/patch-src:libfaad:structs.h
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/libfaad/structs.h.old	Thu Apr 22 23:49:49 2004
-+++ src/libfaad/structs.h	Thu Apr 22 23:53:16 2004
-@@ -307,58 +307,58 @@
- typedef struct mp4AudioSpecificConfig
- {
-     /* Audio Specific Info */
--    uint8_t objectTypeIndex;
--    uint8_t samplingFrequencyIndex;
--    uint32_t samplingFrequency;
--    uint8_t channelsConfiguration;
-+    unsigned char objectTypeIndex;
-+    unsigned char samplingFrequencyIndex;
-+    unsigned long samplingFrequency;
-+    unsigned char channelsConfiguration;
- 
-     /* GA Specific Info */
--    uint8_t frameLengthFlag;
--    uint8_t dependsOnCoreCoder;
--    uint16_t coreCoderDelay;
--    uint8_t extensionFlag;
--    uint8_t aacSectionDataResilienceFlag;
--    uint8_t aacScalefactorDataResilienceFlag;
--    uint8_t aacSpectralDataResilienceFlag;
--    uint8_t epConfig;
-+    unsigned char frameLengthFlag;
-+    unsigned char dependsOnCoreCoder;
-+    unsigned short coreCoderDelay;
-+    unsigned char extensionFlag;
-+    unsigned char aacSectionDataResilienceFlag;
-+    unsigned char aacScalefactorDataResilienceFlag;
-+    unsigned char aacSpectralDataResilienceFlag;
-+    unsigned char epConfig;
- 
--    int8_t sbr_present_flag;
--    int8_t forceUpSampling;
-+    char sbr_present_flag;
-+    char forceUpSampling;
- } mp4AudioSpecificConfig;
- 
- typedef struct faacDecConfiguration
- {
--    uint8_t defObjectType;
--    uint32_t defSampleRate;
--    uint8_t outputFormat;
--    uint8_t downMatrix;
--    uint8_t useOldADTSFormat;
--    uint8_t dontUpSampleImplicitSBR;
-+    unsigned char defObjectType;
-+    unsigned long defSampleRate;
-+    unsigned char outputFormat;
-+    unsigned char downMatrix;
-+    unsigned char useOldADTSFormat;
-+    unsigned char dontUpSampleImplicitSBR;
- } faacDecConfiguration, *faacDecConfigurationPtr;
- 
- typedef struct faacDecFrameInfo
- {
--    uint32_t bytesconsumed;
--    uint32_t samples;
--    uint8_t channels;
--    uint8_t error;
--    uint32_t samplerate;
-+    unsigned long bytesconsumed;
-+    unsigned long samples;
-+    unsigned char channels;
-+    unsigned char error;
-+    unsigned long samplerate;
- 
-     /* SBR: 0: off, 1: on; normal, 2: on; downsampled */
--    uint8_t sbr;
-+    unsigned char sbr;
- 
-     /* MPEG-4 ObjectType */
--    uint8_t object_type;
-+    unsigned char object_type;
- 
-     /* AAC header type; MP4 will be signalled as RAW also */
--    uint8_t header_type;
-+    unsigned char header_type;
- 
-     /* multichannel configuration */
--    uint8_t num_front_channels;
--    uint8_t num_side_channels;
--    uint8_t num_back_channels;
--    uint8_t num_lfe_channels;
--    uint8_t channel_position[MAX_CHANNELS];
-+    unsigned char num_front_channels;
-+    unsigned char num_side_channels;
-+    unsigned char num_back_channels;
-+    unsigned char num_lfe_channels;
-+    unsigned char channel_position[MAX_CHANNELS];
- } faacDecFrameInfo;
- 
- typedef struct
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
deleted file mode 100644
index 643b19e62006..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/libffmpeg/libavcodec/h263.c.orig	Sun Sep 12 21:17:13 2004
-+++ src/libffmpeg/libavcodec/h263.c	Mon Nov 15 01:05:07 2004
-@@ -63,7 +63,7 @@
- static int h263p_decode_umotion(MpegEncContext * s, int pred);
- static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
-                              int n, int coded);
--static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-                               int n, int coded, int intra, int rvlc);
- static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr);
- #ifdef CONFIG_ENCODERS
-@@ -3279,7 +3279,7 @@
-  * @param dir_ptr the prediction direction will be stored here
-  * @return the quantized dc
-  */
--static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
-+static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
- {
-     int level, code;
- 
-@@ -3629,7 +3629,7 @@
-  * decodes a block.
-  * @return <0 if an error occured
-  */
--static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-                               int n, int coded, int intra, int rvlc)
- {
-     int level, i, last, run;
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
deleted file mode 100644
index 5dd6cce9fc91..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/libffmpeg/libavcodec/mpeg12.c.orig	Sun Sep 12 21:17:14 2004
-+++ src/libffmpeg/libavcodec/mpeg12.c	Mon Nov 15 01:06:46 2004
-@@ -1044,9 +1044,9 @@
-     return diff;
- }
- 
--static inline int mpeg1_decode_block_intra(MpegEncContext *s, 
--                               DCTELEM *block, 
--                               int n)
-+static int mpeg1_decode_block_intra(MpegEncContext *s, 
-+				    DCTELEM *block, 
-+				    int n)
- {
-     int level, dc, diff, i, j, run;
-     int component;
-@@ -1117,9 +1117,9 @@
-    return 0;
- }
- 
--static inline int mpeg1_decode_block_inter(MpegEncContext *s, 
--                               DCTELEM *block, 
--                               int n)
-+static int mpeg1_decode_block_inter(MpegEncContext *s, 
-+				    DCTELEM *block, 
-+				    int n)
- {
-     int level, i, j, run;
-     RLTable *rl = &rl_mpeg1;
-@@ -1195,9 +1195,9 @@
- 
- /* Also does unquantization here, since I will never support mpeg2
-    encoding */
--static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, 
--                               DCTELEM *block, 
--                               int n)
-+static int mpeg2_decode_block_non_intra(MpegEncContext *s, 
-+					DCTELEM *block, 
-+					int n)
- {
-     int level, i, j, run;
-     RLTable *rl = &rl_mpeg1;
-@@ -1274,9 +1274,9 @@
-     return 0;
- }
- 
--static inline int mpeg2_decode_block_intra(MpegEncContext *s, 
--                               DCTELEM *block, 
--                               int n)
-+static int mpeg2_decode_block_intra(MpegEncContext *s, 
-+				    DCTELEM *block, 
-+				    int n)
- {
-     int level, dc, diff, i, j, run;
-     int component;
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
deleted file mode 100644
index 4391fc9c730e..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libffmpeg/libavcodec/msmpeg4.c.orig	Sun Sep 12 21:17:14 2004
-+++ src/libffmpeg/libavcodec/msmpeg4.c	Mon Nov 15 01:10:50 2004
-@@ -64,7 +64,7 @@
-                                  int *mx_ptr, int *my_ptr);
- static void msmpeg4v2_encode_motion(MpegEncContext * s, int val);
- static void init_h263_dc_for_msmpeg4(void);
--static inline void msmpeg4_memsetw(short *tab, int val, int n);
-+static void msmpeg4_memsetw(short *tab, int val, int n);
- #ifdef CONFIG_ENCODERS
- static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra);
- static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr);
-@@ -1478,8 +1478,8 @@
- }
- 
- //#define ERROR_DETAILS
--static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
--                              int n, int coded, const uint8_t *scan_table)
-+static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+				int n, int coded, const uint8_t *scan_table)
- {
-     int level, i, last, run, run_diff;
-     int dc_pred_dir;
diff --git a/multimedia/libxine/files/patch-src:libmad:Makefile.in b/multimedia/libxine/files/patch-src:libmad:Makefile.in
deleted file mode 100644
index 0a4ba4ccddf0..000000000000
--- a/multimedia/libxine/files/patch-src:libmad:Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/libmad/Makefile.in.orig	Wed Apr 27 02:01:07 2005
-+++ src/libmad/Makefile.in	Wed Apr 27 02:11:43 2005
-@@ -454,21 +454,10 @@
- 
- lib_LTLIBRARIES = xineplug_decode_mad.la
- 
--xineplug_decode_mad_la_SOURCES = \
--	bit.c \
--	fixed.c \
--	frame.c \
--	huffman.c \
--	layer12.c \
--	layer3.c \
--	stream.c \
--	synth.c \
--	timer.c \
--	version.c \
--	xine_decoder.c
-+xineplug_decode_mad_la_SOURCES = xine_decoder.c
- 
- 
--xineplug_decode_mad_la_LIBADD = $(XINE_LIB)
-+xineplug_decode_mad_la_LIBADD = $(XINE_LIB) -lmad
- xineplug_decode_mad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
- noinst_HEADERS = \
-@@ -498,20 +487,13 @@
- 
- xineplug_decode_mad_la_DEPENDENCIES = \
- 	$(top_builddir)/src/xine-engine/libxine.la
--am_xineplug_decode_mad_la_OBJECTS = bit.lo fixed.lo frame.lo huffman.lo \
--	layer12.lo layer3.lo stream.lo synth.lo timer.lo version.lo \
--	xine_decoder.lo
-+am_xineplug_decode_mad_la_OBJECTS = xine_decoder.lo
- xineplug_decode_mad_la_OBJECTS = $(am_xineplug_decode_mad_la_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit.Plo ./$(DEPDIR)/fixed.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/frame.Plo ./$(DEPDIR)/huffman.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/layer12.Plo ./$(DEPDIR)/layer3.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/stream.Plo ./$(DEPDIR)/synth.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/timer.Plo ./$(DEPDIR)/version.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/xine_decoder.Plo
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -572,16 +554,6 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffman.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer12.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer3.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
- 
- distclean-depend:
diff --git a/multimedia/libxine/files/patch-src:libmad:xine_decoder.c b/multimedia/libxine/files/patch-src:libmad:xine_decoder.c
deleted file mode 100644
index 170e5929bc44..000000000000
--- a/multimedia/libxine/files/patch-src:libmad:xine_decoder.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libmad/xine_decoder.c.orig	Mon Dec 15 07:13:23 2003
-+++ src/libmad/xine_decoder.c	Tue Jan  6 23:43:14 2004
-@@ -24,6 +24,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#include <mad.h>
- 
- #define LOG_MODULE "mad_decoder"
- #define LOG_VERBOSE
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
new file mode 100644
index 000000000000..fc1444e3d60f
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
@@ -0,0 +1,11 @@
+--- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig	Sat Sep 17 01:51:42 2005
++++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h	Sat Sep 17 01:52:41 2005
+@@ -1,7 +1,6 @@
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#include <malloc.h>
+ 
+ #define USE_FOR_DSCALER
+ 
diff --git a/multimedia/libxine/files/patch-src:video_out:video_out_xv.c b/multimedia/libxine/files/patch-src:video_out:video_out_xv.c
deleted file mode 100644
index 3740304d22ef..000000000000
--- a/multimedia/libxine/files/patch-src:video_out:video_out_xv.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/video_out/video_out_xv.c.orig	Wed Apr 28 01:56:34 2004
-+++ src/video_out/video_out_xv.c	Sun May  9 21:51:48 2004
-@@ -47,7 +47,11 @@
- #if defined (__SVR4) && defined (__sun)
- # include <sys/int_types.h>
- #else
--# include <stdint.h>
-+# if defined(HAVE_STDINT_H)
-+#  include <stdint.h>
-+# else
-+#  include <inttypes.h>
-+# endif
- #endif
- 
- #include <sys/types.h>
diff --git a/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h b/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h
deleted file mode 100644
index 88f8ce9033a7..000000000000
--- a/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/xine-engine/xine_internal.h.orig	Tue Apr 26 17:09:12 2005
-+++ src/xine-engine/xine_internal.h	Sat Apr 30 14:16:33 2005
-@@ -70,6 +70,77 @@
- #  include <xine/info_helper.h>
- #endif
- 
-+#ifndef INT8_MIN
-+#define INT8_MIN	(-0x7f-1)
-+#endif
-+
-+#ifndef INT8_MAX
-+#define INT8_MAX	0x7f
-+#endif
-+
-+#ifndef INT16_MAX
-+#define INT16_MAX 0x7fff
-+#endif
-+
-+#ifndef INT16_MIN
-+#define INT16_MIN (-0x7fff-1)
-+#endif
-+
-+#ifndef INT32_MAX
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
-+#ifndef INT32_MIN
-+#define INT32_MIN (-0x7fffffff-1)
-+#endif
-+
-+#ifndef PRIiMAX
-+#define PRIiMAX	"lld"
-+typedef long long intmax_t;
-+#endif
-+
-+#ifndef PRId64
-+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
-+#define PRId64 "ld"
-+#else if defined(__i386__) || defined(__powerpc__)
-+#define PRId64 "lld"
-+#endif
-+#endif
-+
-+#ifndef PRIdMAX
-+#define PRIdMAX	"lld"
-+#endif
-+
-+#ifndef	SCNdMAX
-+#define SCNdMAX	"lld"
-+#endif
-+
-+#ifndef PRIx32
-+#define	PRIx32	"x"
-+#endif
-+
-+#ifndef PRIx16
-+#define	PRIx16	"x"
-+#endif
-+
-+#ifndef PRIx8
-+#define	PRIx8	"x"
-+#endif
-+
-+#ifndef PRIXMAX
-+#define	PRIXMAX	"llX"
-+#endif
-+
-+#ifndef PRIxMAX
-+#define	PRIxMAX	"llx"
-+#endif
-+
-+#ifndef UINT64_C
-+#define	UINT64_C(c)	(c ## ULL)
-+#endif
-+
-+
-+
- 
- #define XINE_MAX_EVENT_LISTENERS         50
- #define XINE_MAX_EVENT_TYPES             100
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 30afdd16a949..cc37059ea138 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -32,109 +32,110 @@ include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.so
-lib/libxine.so.13
-lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.0.1/post/xineplug_post_goom.so
-lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.0.1/post/xineplug_post_planar.so
-lib/xine/plugins/1.0.1/post/xineplug_post_switch.so
-lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.so
-@exec mkdir -p %D/lib/xine/plugins/1.0.1/vidix
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/mach64_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/mga_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/nvidia_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/pm2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/pm3_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/radeon_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/rage128_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/savage_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/sis_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/vidix/unichrome_vid.so
-%%WITH_ARTS%%lib/xine/plugins/1.0.1/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%lib/xine/plugins/1.0.1/xineplug_ao_out_esd.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_file.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_none.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.1/xineplug_decode_a52.so
-lib/xine/plugins/1.0.1/xineplug_decode_bitplane.so
-lib/xine/plugins/1.0.1/xineplug_decode_dts.so
-lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.0.1/xineplug_decode_faad.so
-lib/xine/plugins/1.0.1/xineplug_decode_ff.so
-lib/xine/plugins/1.0.1/xineplug_decode_gsm610.so
-lib/xine/plugins/1.0.1/xineplug_decode_image.so
-lib/xine/plugins/1.0.1/xineplug_decode_lpcm.so
-lib/xine/plugins/1.0.1/xineplug_decode_mad.so
-lib/xine/plugins/1.0.1/xineplug_decode_mpc.so
-lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.0.1/xineplug_decode_nsf.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/xineplug_decode_qt.so
-lib/xine/plugins/1.0.1/xineplug_decode_real.so
-lib/xine/plugins/1.0.1/xineplug_decode_real_audio.so
-lib/xine/plugins/1.0.1/xineplug_decode_rgb.so
-lib/xine/plugins/1.0.1/xineplug_decode_speex.so
-lib/xine/plugins/1.0.1/xineplug_decode_spu.so
-lib/xine/plugins/1.0.1/xineplug_decode_spucc.so
-lib/xine/plugins/1.0.1/xineplug_decode_spucmml.so
-lib/xine/plugins/1.0.1/xineplug_decode_spudvb.so
-lib/xine/plugins/1.0.1/xineplug_decode_sputext.so
-%%WITH_LIBTHEORA%%lib/xine/plugins/1.0.1/xineplug_decode_theora.so
-%%WITH_LIBCACA%%lib/xine/plugins/1.0.1/xineplug_vo_out_caca.so
-lib/xine/plugins/1.0.1/xineplug_decode_vorbis.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/xineplug_decode_w32dll.so
-lib/xine/plugins/1.0.1/xineplug_decode_yuv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_asf.so
-lib/xine/plugins/1.0.1/xineplug_dmx_audio.so
-lib/xine/plugins/1.0.1/xineplug_dmx_avi.so
-lib/xine/plugins/1.0.1/xineplug_dmx_fli.so
-lib/xine/plugins/1.0.1/xineplug_dmx_flv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_games.so
-lib/xine/plugins/1.0.1/xineplug_dmx_iff.so
-lib/xine/plugins/1.0.1/xineplug_dmx_image.so
-lib/xine/plugins/1.0.1/xineplug_dmx_matroska.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mng.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.0.1/xineplug_dmx_nsv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_ogg.so
-lib/xine/plugins/1.0.1/xineplug_dmx_pva.so
-lib/xine/plugins/1.0.1/xineplug_dmx_qt.so
-lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_real.so
-lib/xine/plugins/1.0.1/xineplug_dmx_slave.so
-lib/xine/plugins/1.0.1/xineplug_dmx_sputext.so
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.0.1/xineplug_flac.so
-lib/xine/plugins/1.0.1/xineplug_inp_cdda.so
-lib/xine/plugins/1.0.1/xineplug_inp_dvb.so
-lib/xine/plugins/1.0.1/xineplug_inp_dvd.so
-lib/xine/plugins/1.0.1/xineplug_inp_file.so
-%%WITH_GNOMEVFS2%%lib/xine/plugins/1.0.1/xineplug_inp_gnome_vfs.so
-lib/xine/plugins/1.0.1/xineplug_inp_http.so
-lib/xine/plugins/1.0.1/xineplug_inp_mms.so
-lib/xine/plugins/1.0.1/xineplug_inp_net.so
-lib/xine/plugins/1.0.1/xineplug_inp_pnm.so
-lib/xine/plugins/1.0.1/xineplug_inp_rtp.so
-lib/xine/plugins/1.0.1/xineplug_inp_rtsp.so
-%%WITH_SMB%%lib/xine/plugins/1.0.1/xineplug_inp_smb.so
-lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.0.1/xineplug_inp_vcd.so
-lib/xine/plugins/1.0.1/xineplug_inp_vcdo.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_aa.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_none.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_xshm.so
-%%WITH_LIBXV%%lib/xine/plugins/1.0.1/xineplug_vo_out_xv.so
-%%WITH_XVMC%%lib/xine/plugins/1.0.1/xineplug_vo_out_xvmc.so
+lib/libxine.so.14
+lib/xine/plugins/1.1.0/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.1.0/post/xineplug_post_goom.so
+lib/xine/plugins/1.1.0/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.1.0/post/xineplug_post_planar.so
+lib/xine/plugins/1.1.0/post/xineplug_post_switch.so
+lib/xine/plugins/1.1.0/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.1.0/post/xineplug_post_visualizations.so
+@exec mkdir -p %D/lib/xine/plugins/1.1.0/vidix
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/cyberblade_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/mach64_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/mga_crtc2_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/mga_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/nvidia_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/pm2_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/pm3_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/radeon_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/rage128_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/savage_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/sis_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/vidix/unichrome_vid.so
+%%WITH_ARTS%%lib/xine/plugins/1.1.0/xineplug_ao_out_arts.so
+%%WITH_ESOUND%%lib/xine/plugins/1.1.0/xineplug_ao_out_esd.so
+lib/xine/plugins/1.1.0/xineplug_ao_out_file.so
+lib/xine/plugins/1.1.0/xineplug_ao_out_none.so
+lib/xine/plugins/1.1.0/xineplug_ao_out_oss.so
+%%WITH_POLYPAUDIO%%lib/xine/plugins/1.1.0/xineplug_ao_out_polypaudio.so
+lib/xine/plugins/1.1.0/xineplug_decode_a52.so
+lib/xine/plugins/1.1.0/xineplug_decode_bitplane.so
+lib/xine/plugins/1.1.0/xineplug_decode_dts.so
+lib/xine/plugins/1.1.0/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.1.0/xineplug_decode_faad.so
+lib/xine/plugins/1.1.0/xineplug_decode_ff.so
+lib/xine/plugins/1.1.0/xineplug_decode_gsm610.so
+lib/xine/plugins/1.1.0/xineplug_decode_image.so
+lib/xine/plugins/1.1.0/xineplug_decode_lpcm.so
+lib/xine/plugins/1.1.0/xineplug_decode_mad.so
+lib/xine/plugins/1.1.0/xineplug_decode_mpc.so
+lib/xine/plugins/1.1.0/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.1.0/xineplug_decode_nsf.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/xineplug_decode_qt.so
+lib/xine/plugins/1.1.0/xineplug_decode_real.so
+lib/xine/plugins/1.1.0/xineplug_decode_real_audio.so
+lib/xine/plugins/1.1.0/xineplug_decode_rgb.so
+lib/xine/plugins/1.1.0/xineplug_decode_speex.so
+lib/xine/plugins/1.1.0/xineplug_decode_spu.so
+lib/xine/plugins/1.1.0/xineplug_decode_spucc.so
+lib/xine/plugins/1.1.0/xineplug_decode_spucmml.so
+lib/xine/plugins/1.1.0/xineplug_decode_spudvb.so
+lib/xine/plugins/1.1.0/xineplug_decode_sputext.so
+%%WITH_LIBTHEORA%%lib/xine/plugins/1.1.0/xineplug_decode_theora.so
+%%WITH_LIBCACA%%lib/xine/plugins/1.1.0/xineplug_vo_out_caca.so
+lib/xine/plugins/1.1.0/xineplug_decode_vorbis.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/xineplug_decode_w32dll.so
+lib/xine/plugins/1.1.0/xineplug_decode_yuv.so
+lib/xine/plugins/1.1.0/xineplug_dmx_asf.so
+lib/xine/plugins/1.1.0/xineplug_dmx_audio.so
+lib/xine/plugins/1.1.0/xineplug_dmx_avi.so
+lib/xine/plugins/1.1.0/xineplug_dmx_fli.so
+lib/xine/plugins/1.1.0/xineplug_dmx_flv.so
+lib/xine/plugins/1.1.0/xineplug_dmx_games.so
+lib/xine/plugins/1.1.0/xineplug_dmx_iff.so
+lib/xine/plugins/1.1.0/xineplug_dmx_image.so
+lib/xine/plugins/1.1.0/xineplug_dmx_matroska.so
+lib/xine/plugins/1.1.0/xineplug_dmx_mng.so
+lib/xine/plugins/1.1.0/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.1.0/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.1.0/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.1.0/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.1.0/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.1.0/xineplug_dmx_nsv.so
+lib/xine/plugins/1.1.0/xineplug_dmx_ogg.so
+lib/xine/plugins/1.1.0/xineplug_dmx_pva.so
+lib/xine/plugins/1.1.0/xineplug_dmx_qt.so
+lib/xine/plugins/1.1.0/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.1.0/xineplug_dmx_real.so
+lib/xine/plugins/1.1.0/xineplug_dmx_slave.so
+lib/xine/plugins/1.1.0/xineplug_dmx_sputext.so
+lib/xine/plugins/1.1.0/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.1.0/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.1.0/xineplug_flac.so
+lib/xine/plugins/1.1.0/xineplug_inp_cdda.so
+lib/xine/plugins/1.1.0/xineplug_inp_dvb.so
+lib/xine/plugins/1.1.0/xineplug_inp_dvd.so
+lib/xine/plugins/1.1.0/xineplug_inp_file.so
+%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.0/xineplug_inp_gnome_vfs.so
+lib/xine/plugins/1.1.0/xineplug_inp_http.so
+lib/xine/plugins/1.1.0/xineplug_inp_mms.so
+lib/xine/plugins/1.1.0/xineplug_inp_net.so
+lib/xine/plugins/1.1.0/xineplug_inp_pnm.so
+lib/xine/plugins/1.1.0/xineplug_inp_rtp.so
+lib/xine/plugins/1.1.0/xineplug_inp_rtsp.so
+%%WITH_SMB%%lib/xine/plugins/1.1.0/xineplug_inp_smb.so
+lib/xine/plugins/1.1.0/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.1.0/xineplug_inp_vcd.so
+lib/xine/plugins/1.1.0/xineplug_inp_vcdo.so
+lib/xine/plugins/1.1.0/xineplug_vo_out_aa.so
+lib/xine/plugins/1.1.0/xineplug_vo_out_none.so
+lib/xine/plugins/1.1.0/xineplug_vo_out_opengl.so
+lib/xine/plugins/1.1.0/xineplug_vo_out_sdl.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.0/xineplug_vo_out_vidix.so
+lib/xine/plugins/1.1.0/xineplug_vo_out_xshm.so
+%%WITH_LIBXV%%lib/xine/plugins/1.1.0/xineplug_vo_out_xv.so
+%%WITH_XVMC%%lib/xine/plugins/1.1.0/xineplug_vo_out_xvmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 %%DOCSDIR%%/README
@@ -202,9 +203,9 @@ 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 include/xine
-@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/1.1.0/vidix
+@dirrm lib/xine/plugins/1.1.0/post
+@dirrm lib/xine/plugins/1.1.0
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm %%DOCSDIR%%/hackersguide