- Update to 1.1.4

- Fix disabling esound
- Add jack option and fix packing list when jack is installed
- Fix packing list by disabling v4l (in case multimedia/v4l_compat is
  installed)
- Fix shlib version by using ltverhack

PR:		ports/108564
Submitted by:	jylefort
Approved by:	maintainer timeout (16 days)

3 files changed, 244 insertions, 118 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 5996119ade0d..fcaee4de6861 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,7 +37,7 @@ USE_ICONV=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	gnomehack gnometarget ltverhack
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_SDL=	sdl
@@ -51,11 +51,13 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCA
 		EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \
 		--mandir=${PREFIX}/man --with-external-libmad \
-		--with-external-libdts
+		--with-external-libdts --with-libflac --disable-v4l
 
 MAN1=	xine-config.1
 MAN5=	xine.5
 
+DOCSDIR=	${TARGETDIR}/share/doc/xine-lib
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
@@ -79,7 +81,15 @@ USE_GNOME+=	esound
 PLIST_SUB+=	WITH_ESOUND=""
 .else
 PLIST_SUB+=	WITH_ESOUND="@comment "
-CONFIGURE_ARGS+=	--disable-esd --disable-esdtest
+CONFIGURE_ARGS+=	--without-esound
+.endif
+
+.if !defined(WITHOUT_JACK) && (exists(${LOCALBASE}/lib/libjack.so) || defined(WITH_JACK))
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+PLIST_SUB+=	WITH_JACK=""
+.else
+PLIST_SUB+=	WITH_JACK="@comment "
+CONFIGURE_ARGS+=	--disable-jack
 .endif
 
 .if !defined(WITHOUT_GNOMEVFS2) && (${HAVE_GNOME:Mgnomevfs2} != "" || defined(WITH_GNOMEVFS2))
@@ -175,6 +185,11 @@ pre-everything::
 .else
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
 .endif
+.if !exists(${LOCALBASE}/lib/libjack.so) && !defined(WITH_JACK) || defined(WITHOUT_JACK)
+	@${ECHO_MSG} "===> WITH_JACK (JACK support)"
+.else
+	@${ECHO_MSG} "===> WITH_JACK (JACK support, enabled)"
+.endif
 .if !exists(${LOCALBASE}/lib/libpulse.so.0) && !defined(WITH_PULSEAUDIO) || defined(WITHOUT_PULSEAUDIO)
 	@${ECHO_MSG} "===> WITH_PULSEAUDIO (pulseaudio support)"
 .else
@@ -192,6 +207,13 @@ pre-everything::
 .endif
 	@${ECHO_MSG} "===>"
 
+post-patch:
+# fix the shlib version by using the libtool patched by ltverhack
+	@${REINPLACE_CMD} -e 's|^LIBTOOL = .*|LIBTOOL = @LIBTOOL@|' \
+		${WRKSRC}/src/xine-utils/Makefile.in \
+		${WRKSRC}/src/xine-engine/Makefile.in \
+		${WRKSRC}/src/libw32dll/wine/Makefile.in
+
 pre-configure:
 	@${REINPLACE_CMD} -e \
 		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 0160fc5fd381..d12ad182fddd 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,3 +1,3 @@
-MD5 (xine-lib-1.1.3.tar.gz) = 161dc882a9e7352c63b3fd1b6ff2e55f
-SHA256 (xine-lib-1.1.3.tar.gz) = 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0
-SIZE (xine-lib-1.1.3.tar.gz) = 8508884
+MD5 (xine-lib-1.1.4.tar.gz) = 6631bf12e1e9bfc740797e0c56f46be6
+SHA256 (xine-lib-1.1.4.tar.gz) = 1de93c996645c966585a45a622dbaeeaa4b60f866a12b230bae3308209175eab
+SIZE (xine-lib-1.1.4.tar.gz) = 8603909
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 77822685907d..cc1294fba493 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -39,111 +39,216 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
 lib/libxine.so
-lib/libxine.so.16
-lib/xine/plugins/1.1.3/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.1.3/post/xineplug_post_goom.so
-lib/xine/plugins/1.1.3/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.1.3/post/xineplug_post_planar.so
-lib/xine/plugins/1.1.3/post/xineplug_post_switch.so
-lib/xine/plugins/1.1.3/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.1.3/post/xineplug_post_visualizations.so
-@exec mkdir -p %D/lib/xine/plugins/1.1.3/vidix
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/mach64_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/mga_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/nvidia_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/pm2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/pm3_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/radeon_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/rage128_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/savage_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/sis_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/vidix/unichrome_vid.so
-%%WITH_ARTS%%lib/xine/plugins/1.1.3/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%lib/xine/plugins/1.1.3/xineplug_ao_out_esd.so
-lib/xine/plugins/1.1.3/xineplug_ao_out_file.so
-lib/xine/plugins/1.1.3/xineplug_ao_out_none.so
-lib/xine/plugins/1.1.3/xineplug_ao_out_oss.so
-%%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.3/xineplug_ao_out_pulseaudio.so
-lib/xine/plugins/1.1.3/xineplug_decode_a52.so
-lib/xine/plugins/1.1.3/xineplug_decode_bitplane.so
-lib/xine/plugins/1.1.3/xineplug_decode_dts.so
-lib/xine/plugins/1.1.3/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.1.3/xineplug_decode_faad.so
-lib/xine/plugins/1.1.3/xineplug_decode_ff.so
-%%WITH_GTK2%%lib/xine/plugins/1.1.3/xineplug_decode_gdk_pixbuf.so
-lib/xine/plugins/1.1.3/xineplug_decode_gsm610.so
-%%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.3/xineplug_decode_image.so
-lib/xine/plugins/1.1.3/xineplug_decode_lpcm.so
-lib/xine/plugins/1.1.3/xineplug_decode_mad.so
-lib/xine/plugins/1.1.3/xineplug_decode_mpc.so
-lib/xine/plugins/1.1.3/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.1.3/xineplug_decode_nsf.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/xineplug_decode_qt.so
-lib/xine/plugins/1.1.3/xineplug_decode_real.so
-lib/xine/plugins/1.1.3/xineplug_decode_real_audio.so
-lib/xine/plugins/1.1.3/xineplug_decode_rgb.so
-lib/xine/plugins/1.1.3/xineplug_decode_speex.so
-lib/xine/plugins/1.1.3/xineplug_decode_spu.so
-lib/xine/plugins/1.1.3/xineplug_decode_spucc.so
-lib/xine/plugins/1.1.3/xineplug_decode_spucmml.so
-lib/xine/plugins/1.1.3/xineplug_decode_spudvb.so
-lib/xine/plugins/1.1.3/xineplug_decode_sputext.so
-lib/xine/plugins/1.1.3/xineplug_decode_theora.so
-lib/xine/plugins/1.1.3/xineplug_decode_vorbis.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/xineplug_decode_w32dll.so
-lib/xine/plugins/1.1.3/xineplug_decode_yuv.so
-lib/xine/plugins/1.1.3/xineplug_dmx_asf.so
-lib/xine/plugins/1.1.3/xineplug_dmx_audio.so
-lib/xine/plugins/1.1.3/xineplug_dmx_avi.so
-lib/xine/plugins/1.1.3/xineplug_dmx_fli.so
-lib/xine/plugins/1.1.3/xineplug_dmx_flv.so
-lib/xine/plugins/1.1.3/xineplug_dmx_games.so
-lib/xine/plugins/1.1.3/xineplug_dmx_iff.so
-%%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.3/xineplug_dmx_image.so
-lib/xine/plugins/1.1.3/xineplug_dmx_matroska.so
-lib/xine/plugins/1.1.3/xineplug_dmx_mng.so
-lib/xine/plugins/1.1.3/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.1.3/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.1.3/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.1.3/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.1.3/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.1.3/xineplug_dmx_nsv.so
-lib/xine/plugins/1.1.3/xineplug_dmx_ogg.so
-lib/xine/plugins/1.1.3/xineplug_dmx_pva.so
-lib/xine/plugins/1.1.3/xineplug_dmx_qt.so
-lib/xine/plugins/1.1.3/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.1.3/xineplug_dmx_real.so
-lib/xine/plugins/1.1.3/xineplug_dmx_slave.so
-lib/xine/plugins/1.1.3/xineplug_dmx_sputext.so
-lib/xine/plugins/1.1.3/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.1.3/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.1.3/xineplug_flac.so
-lib/xine/plugins/1.1.3/xineplug_inp_cdda.so
-lib/xine/plugins/1.1.3/xineplug_inp_dvb.so
-lib/xine/plugins/1.1.3/xineplug_inp_dvd.so
-lib/xine/plugins/1.1.3/xineplug_inp_file.so
-%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.3/xineplug_inp_gnome_vfs.so
-lib/xine/plugins/1.1.3/xineplug_inp_http.so
-lib/xine/plugins/1.1.3/xineplug_inp_mms.so
-lib/xine/plugins/1.1.3/xineplug_inp_net.so
-lib/xine/plugins/1.1.3/xineplug_inp_pnm.so
-lib/xine/plugins/1.1.3/xineplug_inp_rtp.so
-lib/xine/plugins/1.1.3/xineplug_inp_rtsp.so
-%%WITH_SMB%%lib/xine/plugins/1.1.3/xineplug_inp_smb.so
-lib/xine/plugins/1.1.3/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.1.3/xineplug_inp_vcd.so
-lib/xine/plugins/1.1.3/xineplug_inp_vcdo.so
-%%WITH_AALIB%%lib/xine/plugins/1.1.3/xineplug_vo_out_aa.so
-%%WITH_CACA%%lib/xine/plugins/1.1.3/xineplug_vo_out_caca.so
-lib/xine/plugins/1.1.3/xineplug_vo_out_none.so
-lib/xine/plugins/1.1.3/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.1.3/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.3/xineplug_vo_out_vidix.so
-lib/xine/plugins/1.1.3/xineplug_vo_out_xshm.so
-lib/xine/plugins/1.1.3/xineplug_vo_out_xv.so
-%%WITH_XVMC%%lib/xine/plugins/1.1.3/xineplug_vo_out_xvmc.so
+lib/libxine.so.1
+lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.a
+lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.1.4/post/xineplug_post_goom.a
+lib/xine/plugins/1.1.4/post/xineplug_post_goom.so
+lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.a
+lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.1.4/post/xineplug_post_planar.a
+lib/xine/plugins/1.1.4/post/xineplug_post_planar.so
+lib/xine/plugins/1.1.4/post/xineplug_post_switch.a
+lib/xine/plugins/1.1.4/post/xineplug_post_switch.so
+lib/xine/plugins/1.1.4/post/xineplug_post_tvtime.a
+lib/xine/plugins/1.1.4/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.a
+lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.so
+@exec mkdir -p %D/lib/xine/plugins/1.1.4/vidix
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/cyberblade_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/cyberblade_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mach64_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mach64_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/nvidia_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/nvidia_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm2_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm2_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm3_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm3_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/radeon_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/radeon_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/rage128_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/rage128_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/savage_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/savage_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/sis_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/sis_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/unichrome_vid.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/unichrome_vid.so
+%%WITH_ARTS%%lib/xine/plugins/1.1.4/xineplug_ao_out_arts.a
+%%WITH_ARTS%%lib/xine/plugins/1.1.4/xineplug_ao_out_arts.so
+%%WITH_ESOUND%%lib/xine/plugins/1.1.4/xineplug_ao_out_esd.a
+%%WITH_ESOUND%%lib/xine/plugins/1.1.4/xineplug_ao_out_esd.so
+%%WITH_JACK%%lib/xine/plugins/1.1.4/xineplug_ao_out_jack.a
+%%WITH_JACK%%lib/xine/plugins/1.1.4/xineplug_ao_out_jack.so
+lib/xine/plugins/1.1.4/xineplug_ao_out_file.a
+lib/xine/plugins/1.1.4/xineplug_ao_out_file.so
+lib/xine/plugins/1.1.4/xineplug_ao_out_none.a
+lib/xine/plugins/1.1.4/xineplug_ao_out_none.so
+lib/xine/plugins/1.1.4/xineplug_ao_out_oss.a
+lib/xine/plugins/1.1.4/xineplug_ao_out_oss.so
+%%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.4/xineplug_ao_out_pulseaudio.a
+%%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.4/xineplug_ao_out_pulseaudio.so
+lib/xine/plugins/1.1.4/xineplug_decode_a52.a
+lib/xine/plugins/1.1.4/xineplug_decode_a52.so
+lib/xine/plugins/1.1.4/xineplug_decode_bitplane.a
+lib/xine/plugins/1.1.4/xineplug_decode_bitplane.so
+lib/xine/plugins/1.1.4/xineplug_decode_dts.a
+lib/xine/plugins/1.1.4/xineplug_decode_dts.so
+lib/xine/plugins/1.1.4/xineplug_decode_dvaudio.a
+lib/xine/plugins/1.1.4/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.1.4/xineplug_decode_faad.a
+lib/xine/plugins/1.1.4/xineplug_decode_faad.so
+lib/xine/plugins/1.1.4/xineplug_decode_ff.a
+lib/xine/plugins/1.1.4/xineplug_decode_ff.so
+%%WITH_GTK2%%lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.a
+%%WITH_GTK2%%lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.so
+lib/xine/plugins/1.1.4/xineplug_decode_gsm610.a
+lib/xine/plugins/1.1.4/xineplug_decode_gsm610.so
+%%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.4/xineplug_decode_image.a
+%%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.4/xineplug_decode_image.so
+lib/xine/plugins/1.1.4/xineplug_decode_lpcm.a
+lib/xine/plugins/1.1.4/xineplug_decode_lpcm.so
+lib/xine/plugins/1.1.4/xineplug_decode_mad.a
+lib/xine/plugins/1.1.4/xineplug_decode_mad.so
+lib/xine/plugins/1.1.4/xineplug_decode_mpc.a
+lib/xine/plugins/1.1.4/xineplug_decode_mpc.so
+lib/xine/plugins/1.1.4/xineplug_decode_mpeg2.a
+lib/xine/plugins/1.1.4/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.1.4/xineplug_decode_nsf.a
+lib/xine/plugins/1.1.4/xineplug_decode_nsf.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_qt.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_qt.so
+lib/xine/plugins/1.1.4/xineplug_decode_real.a
+lib/xine/plugins/1.1.4/xineplug_decode_real.so
+lib/xine/plugins/1.1.4/xineplug_decode_real_audio.a
+lib/xine/plugins/1.1.4/xineplug_decode_real_audio.so
+lib/xine/plugins/1.1.4/xineplug_decode_rgb.a
+lib/xine/plugins/1.1.4/xineplug_decode_rgb.so
+lib/xine/plugins/1.1.4/xineplug_decode_speex.a
+lib/xine/plugins/1.1.4/xineplug_decode_speex.so
+lib/xine/plugins/1.1.4/xineplug_decode_spu.a
+lib/xine/plugins/1.1.4/xineplug_decode_spu.so
+lib/xine/plugins/1.1.4/xineplug_decode_spucc.a
+lib/xine/plugins/1.1.4/xineplug_decode_spucc.so
+lib/xine/plugins/1.1.4/xineplug_decode_spucmml.a
+lib/xine/plugins/1.1.4/xineplug_decode_spucmml.so
+lib/xine/plugins/1.1.4/xineplug_decode_spudvb.a
+lib/xine/plugins/1.1.4/xineplug_decode_spudvb.so
+lib/xine/plugins/1.1.4/xineplug_decode_sputext.a
+lib/xine/plugins/1.1.4/xineplug_decode_sputext.so
+lib/xine/plugins/1.1.4/xineplug_decode_theora.a
+lib/xine/plugins/1.1.4/xineplug_decode_theora.so
+lib/xine/plugins/1.1.4/xineplug_decode_vorbis.a
+lib/xine/plugins/1.1.4/xineplug_decode_vorbis.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_w32dll.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_w32dll.so
+lib/xine/plugins/1.1.4/xineplug_decode_yuv.a
+lib/xine/plugins/1.1.4/xineplug_decode_yuv.so
+lib/xine/plugins/1.1.4/xineplug_dmx_asf.a
+lib/xine/plugins/1.1.4/xineplug_dmx_asf.so
+lib/xine/plugins/1.1.4/xineplug_dmx_audio.a
+lib/xine/plugins/1.1.4/xineplug_dmx_audio.so
+lib/xine/plugins/1.1.4/xineplug_dmx_avi.a
+lib/xine/plugins/1.1.4/xineplug_dmx_avi.so
+lib/xine/plugins/1.1.4/xineplug_dmx_fli.a
+lib/xine/plugins/1.1.4/xineplug_dmx_fli.so
+lib/xine/plugins/1.1.4/xineplug_dmx_flv.a
+lib/xine/plugins/1.1.4/xineplug_dmx_flv.so
+lib/xine/plugins/1.1.4/xineplug_dmx_games.a
+lib/xine/plugins/1.1.4/xineplug_dmx_games.so
+lib/xine/plugins/1.1.4/xineplug_dmx_iff.a
+lib/xine/plugins/1.1.4/xineplug_dmx_iff.so
+%%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.4/xineplug_dmx_image.a
+%%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.4/xineplug_dmx_image.so
+lib/xine/plugins/1.1.4/xineplug_dmx_matroska.a
+lib/xine/plugins/1.1.4/xineplug_dmx_matroska.so
+lib/xine/plugins/1.1.4/xineplug_dmx_mng.a
+lib/xine/plugins/1.1.4/xineplug_dmx_mng.so
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg.a
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_block.a
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_elem.a
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_pes.a
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_ts.a
+lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.1.4/xineplug_dmx_nsv.a
+lib/xine/plugins/1.1.4/xineplug_dmx_nsv.so
+lib/xine/plugins/1.1.4/xineplug_dmx_ogg.a
+lib/xine/plugins/1.1.4/xineplug_dmx_ogg.so
+lib/xine/plugins/1.1.4/xineplug_dmx_pva.a
+lib/xine/plugins/1.1.4/xineplug_dmx_pva.so
+lib/xine/plugins/1.1.4/xineplug_dmx_qt.a
+lib/xine/plugins/1.1.4/xineplug_dmx_qt.so
+lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.a
+lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.1.4/xineplug_dmx_real.a
+lib/xine/plugins/1.1.4/xineplug_dmx_real.so
+lib/xine/plugins/1.1.4/xineplug_dmx_slave.a
+lib/xine/plugins/1.1.4/xineplug_dmx_slave.so
+lib/xine/plugins/1.1.4/xineplug_dmx_sputext.a
+lib/xine/plugins/1.1.4/xineplug_dmx_sputext.so
+lib/xine/plugins/1.1.4/xineplug_dmx_yuv4mpeg2.a
+lib/xine/plugins/1.1.4/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.a
+lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.1.4/xineplug_flac.a
+lib/xine/plugins/1.1.4/xineplug_flac.so
+lib/xine/plugins/1.1.4/xineplug_inp_cdda.a
+lib/xine/plugins/1.1.4/xineplug_inp_cdda.so
+lib/xine/plugins/1.1.4/xineplug_inp_dvb.a
+lib/xine/plugins/1.1.4/xineplug_inp_dvb.so
+lib/xine/plugins/1.1.4/xineplug_inp_dvd.a
+lib/xine/plugins/1.1.4/xineplug_inp_dvd.so
+lib/xine/plugins/1.1.4/xineplug_inp_file.a
+lib/xine/plugins/1.1.4/xineplug_inp_file.so
+%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.a
+%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.so
+lib/xine/plugins/1.1.4/xineplug_inp_http.a
+lib/xine/plugins/1.1.4/xineplug_inp_http.so
+lib/xine/plugins/1.1.4/xineplug_inp_mms.a
+lib/xine/plugins/1.1.4/xineplug_inp_mms.so
+lib/xine/plugins/1.1.4/xineplug_inp_net.a
+lib/xine/plugins/1.1.4/xineplug_inp_net.so
+lib/xine/plugins/1.1.4/xineplug_inp_pnm.a
+lib/xine/plugins/1.1.4/xineplug_inp_pnm.so
+lib/xine/plugins/1.1.4/xineplug_inp_rtp.a
+lib/xine/plugins/1.1.4/xineplug_inp_rtp.so
+lib/xine/plugins/1.1.4/xineplug_inp_rtsp.a
+lib/xine/plugins/1.1.4/xineplug_inp_rtsp.so
+%%WITH_SMB%%lib/xine/plugins/1.1.4/xineplug_inp_smb.a
+%%WITH_SMB%%lib/xine/plugins/1.1.4/xineplug_inp_smb.so
+lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.a
+lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.1.4/xineplug_inp_vcd.a
+lib/xine/plugins/1.1.4/xineplug_inp_vcd.so
+lib/xine/plugins/1.1.4/xineplug_inp_vcdo.a
+lib/xine/plugins/1.1.4/xineplug_inp_vcdo.so
+%%WITH_AALIB%%lib/xine/plugins/1.1.4/xineplug_vo_out_aa.a
+%%WITH_AALIB%%lib/xine/plugins/1.1.4/xineplug_vo_out_aa.so
+%%WITH_CACA%%lib/xine/plugins/1.1.4/xineplug_vo_out_caca.a
+%%WITH_CACA%%lib/xine/plugins/1.1.4/xineplug_vo_out_caca.so
+lib/xine/plugins/1.1.4/xineplug_vo_out_none.a
+lib/xine/plugins/1.1.4/xineplug_vo_out_none.so
+lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.a
+lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.so
+lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.a
+lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.a
+%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.so
+lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.a
+lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.so
+lib/xine/plugins/1.1.4/xineplug_vo_out_xv.a
+lib/xine/plugins/1.1.4/xineplug_vo_out_xv.so
+%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.a
+%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 %%DOCSDIR%%/README
@@ -158,8 +263,8 @@ share/aclocal/xine.m4
 %%DOCSDIR%%/README.solaris
 %%DOCSDIR%%/README.syncfb
 %%DOCSDIR%%/README_xxmc.html
-%%DOCSDIR%%/faq/faq.html
-%%DOCSDIR%%/faq/faq.txt
+%%DOCSDIR%%/faq.html
+%%DOCSDIR%%/faq.txt
 %%DOCSDIR%%/hackersguide/architecture.png
 %%DOCSDIR%%/hackersguide/hackersguide.html
 %%DOCSDIR%%/hackersguide/library.png
@@ -211,13 +316,12 @@ share/locale/sk/LC_MESSAGES/libxine1.mo
 %%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz
 %%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz
 @dirrm include/xine
-@dirrm lib/xine/plugins/1.1.3/vidix
-@dirrm lib/xine/plugins/1.1.3/post
-@dirrm lib/xine/plugins/1.1.3
+@dirrm lib/xine/plugins/1.1.4/vidix
+@dirrm lib/xine/plugins/1.1.4/post
+@dirrm lib/xine/plugins/1.1.4
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm %%DOCSDIR%%/hackersguide
-@dirrm %%DOCSDIR%%/faq
 @dirrm %%DOCSDIR%%
 @dirrmtry share/locale/pl_PL/LC_MESSAGES
 @dirrmtry share/locale/pl_PL