1 files changed, 75 insertions, 105 deletions

diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index befddebe46e9..63a5341ba100 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -2,8 +2,8 @@ bin/xine-config
 bin/xine-list-1.2
 include/xine.h
 include/xine/alphablend.h
-include/xine/attributes.h
 include/xine/array.h
+include/xine/attributes.h
 include/xine/audio_decoder.h
 include/xine/audio_out.h
 include/xine/broadcaster.h
@@ -28,8 +28,8 @@ include/xine/scratch.h
 include/xine/sorted_array.h
 include/xine/spu.h
 include/xine/spu_decoder.h
-include/xine/version.h
 include/xine/vdr.h
+include/xine/version.h
 include/xine/video_decoder.h
 include/xine/video_out.h
 include/xine/video_overlay.h
@@ -42,46 +42,10 @@ include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.la
+lib/libxine-interface.la
 lib/libxine.so
 lib/libxine.so.2
-lib/libxine.so.2.5.0
-lib/libxine-interface.la
-share/xine-lib/fonts/cetus-16.xinefont.gz
-share/xine-lib/fonts/cetus-20.xinefont.gz
-share/xine-lib/fonts/cetus-24.xinefont.gz
-share/xine-lib/fonts/cetus-32.xinefont.gz
-share/xine-lib/fonts/cetus-48.xinefont.gz
-share/xine-lib/fonts/cetus-64.xinefont.gz
-share/xine-lib/fonts/cc-16.xinefont.gz
-share/xine-lib/fonts/cc-20.xinefont.gz
-share/xine-lib/fonts/cc-24.xinefont.gz
-share/xine-lib/fonts/cc-32.xinefont.gz
-share/xine-lib/fonts/cc-48.xinefont.gz
-share/xine-lib/fonts/cc-64.xinefont.gz
-share/xine-lib/fonts/cci-16.xinefont.gz
-share/xine-lib/fonts/cci-20.xinefont.gz
-share/xine-lib/fonts/cci-24.xinefont.gz
-share/xine-lib/fonts/cci-32.xinefont.gz
-share/xine-lib/fonts/cci-48.xinefont.gz
-share/xine-lib/fonts/cci-64.xinefont.gz
-share/xine-lib/fonts/mono-16.xinefont.gz
-share/xine-lib/fonts/mono-20.xinefont.gz
-share/xine-lib/fonts/mono-24.xinefont.gz
-share/xine-lib/fonts/mono-32.xinefont.gz
-share/xine-lib/fonts/mono-48.xinefont.gz
-share/xine-lib/fonts/mono-64.xinefont.gz
-share/xine-lib/fonts/sans-16.xinefont.gz
-share/xine-lib/fonts/sans-20.xinefont.gz
-share/xine-lib/fonts/sans-24.xinefont.gz
-share/xine-lib/fonts/sans-32.xinefont.gz
-share/xine-lib/fonts/sans-48.xinefont.gz
-share/xine-lib/fonts/sans-64.xinefont.gz
-share/xine-lib/fonts/serif-16.xinefont.gz
-share/xine-lib/fonts/serif-20.xinefont.gz
-share/xine-lib/fonts/serif-24.xinefont.gz
-share/xine-lib/fonts/serif-32.xinefont.gz
-share/xine-lib/fonts/serif-48.xinefont.gz
-share/xine-lib/fonts/serif-64.xinefont.gz
+lib/libxine.so.2.7.0
 %%PLUGINSDIR%%/mime.types
 %%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
 %%PLUGINSDIR%%/post/xineplug_post_goom.so
@@ -92,12 +56,10 @@ share/xine-lib/fonts/serif-64.xinefont.gz
 %%PLUGINSDIR%%/post/xineplug_post_visualizations.so
 %%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
 %%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
-%%PLUGINSDIR%%/xineplug_ao_out_file.so
-%%PLUGINSDIR%%/xineplug_ao_out_none.so
 %%PLUGINSDIR%%/xineplug_ao_out_oss.so
 %%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
+%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.so
 %%PLUGINSDIR%%/xineplug_decode_a52.so
-%%PLUGINSDIR%%/xineplug_decode_bitplane.so
 %%PLUGINSDIR%%/xineplug_decode_dts.so
 %%PLUGINSDIR%%/xineplug_decode_dvaudio.so
 %%PLUGINSDIR%%/xineplug_decode_faad.so
@@ -110,62 +72,35 @@ share/xine-lib/fonts/serif-64.xinefont.gz
 %%PLUGINSDIR%%/xineplug_decode_lpcm.so
 %%PLUGINSDIR%%/xineplug_decode_mad.so
 %%PLUGINSDIR%%/xineplug_decode_mpeg2.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_qt.so
-%%PLUGINSDIR%%/xineplug_decode_rgb.so
+%%PLUGINSDIR%%/xineplug_decode_rawvideo.so
 %%PLUGINSDIR%%/xineplug_decode_spu.so
 %%PLUGINSDIR%%/xineplug_decode_spucc.so
 %%PLUGINSDIR%%/xineplug_decode_spucmml.so
 %%PLUGINSDIR%%/xineplug_decode_spudvb.so
 %%PLUGINSDIR%%/xineplug_decode_spuhdmv.so
-%%PLUGINSDIR%%/xineplug_decode_vdpau_h264_alter.so
-%%PLUGINSDIR%%/xineplug_decode_vdpau_h264.so
-%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg12.so
-%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg4.so
-%%PLUGINSDIR%%/xineplug_decode_vdpau_vc1.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_w32dll.so
-%%PLUGINSDIR%%/xineplug_decode_yuv.so
+%%PLUGINSDIR%%/xineplug_decode_vdpau.so
 %%PLUGINSDIR%%/xineplug_dmx_asf.so
 %%PLUGINSDIR%%/xineplug_dmx_audio.so
-%%PLUGINSDIR%%/xineplug_dmx_avi.so
 %%PLUGINSDIR%%/xineplug_dmx_fli.so
-%%PLUGINSDIR%%/xineplug_dmx_flv.so
 %%PLUGINSDIR%%/xineplug_dmx_games.so
-%%PLUGINSDIR%%/xineplug_dmx_iff.so
-%%WITH_DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_image.so
-%%PLUGINSDIR%%/xineplug_dmx_matroska.so
+%%DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_image.so
 %%PLUGINSDIR%%/xineplug_dmx_mng.so
 %%PLUGINSDIR%%/xineplug_dmx_modplug.so
-%%PLUGINSDIR%%/xineplug_dmx_mpeg.so
-%%PLUGINSDIR%%/xineplug_dmx_mpeg_block.so
-%%PLUGINSDIR%%/xineplug_dmx_mpeg_elem.so
-%%PLUGINSDIR%%/xineplug_dmx_mpeg_pes.so
-%%PLUGINSDIR%%/xineplug_dmx_mpeg_ts.so
 %%PLUGINSDIR%%/xineplug_dmx_nsv.so
 %%PLUGINSDIR%%/xineplug_dmx_playlist.so
 %%PLUGINSDIR%%/xineplug_dmx_pva.so
-%%PLUGINSDIR%%/xineplug_dmx_qt.so
-%%PLUGINSDIR%%/xineplug_dmx_rawdv.so
-%%PLUGINSDIR%%/xineplug_dmx_real.so
 %%PLUGINSDIR%%/xineplug_dmx_slave.so
-%%PLUGINSDIR%%/xineplug_dmx_vc1_es.so
-%%PLUGINSDIR%%/xineplug_dmx_yuv4mpeg2.so
-%%PLUGINSDIR%%/xineplug_dmx_yuv_frames.so
+%%PLUGINSDIR%%/xineplug_dmx_video.so
 %%PLUGINSDIR%%/xineplug_flac.so
-%%PLUGINSDIR%%/xineplug_inp_cdda.so
 %%LIBBLURAY%%%%PLUGINSDIR%%/xineplug_inp_bluray.so
-%%PLUGINSDIR%%/xineplug_inp_dvb.so
+%%PLUGINSDIR%%/xineplug_inp_cdda.so
+%%DVB%%%%PLUGINSDIR%%/xineplug_inp_dvb.so
 %%PLUGINSDIR%%/xineplug_inp_dvd.so
-%%PLUGINSDIR%%/xineplug_inp_file.so
 %%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
-%%PLUGINSDIR%%/xineplug_inp_http.so
 %%PLUGINSDIR%%/xineplug_inp_mms.so
-%%PLUGINSDIR%%/xineplug_inp_net.so
-%%PLUGINSDIR%%/xineplug_inp_pnm.so
+%%PLUGINSDIR%%/xineplug_inp_network.so
 %%PLUGINSDIR%%/xineplug_inp_rtp.so
-%%PLUGINSDIR%%/xineplug_inp_rtsp.so
 %%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
-%%PLUGINSDIR%%/xineplug_inp_stdin_fifo.so
-%%PLUGINSDIR%%/xineplug_inp_test.so
 %%PLUGINSDIR%%/xineplug_inp_vcd.so
 %%PLUGINSDIR%%/xineplug_inp_vcdo.so
 %%PLUGINSDIR%%/xineplug_nsf.so
@@ -173,17 +108,16 @@ share/xine-lib/fonts/serif-64.xinefont.gz
 %%PLUGINSDIR%%/xineplug_vdr.so
 %%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
 %%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
-%%PLUGINSDIR%%/xineplug_vo_out_none.so
 %%PLUGINSDIR%%/xineplug_vo_out_opengl.so
 %%PLUGINSDIR%%/xineplug_vo_out_opengl2.so
 %%PLUGINSDIR%%/xineplug_vo_out_raw.so
 %%PLUGINSDIR%%/xineplug_vo_out_sdl.so
+%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
 %%PLUGINSDIR%%/xineplug_vo_out_vdpau.so
 %%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so
 %%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so
 %%PLUGINSDIR%%/xineplug_vo_out_xshm.so
 %%PLUGINSDIR%%/xineplug_vo_out_xv.so
-%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
 %%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
 %%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
 %%WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so
@@ -192,32 +126,31 @@ libdata/pkgconfig/libxine.pc
 man/man1/xine-config.1.gz
 man/man1/xine-list-1.2.1.gz
 man/man5/xine.5.gz
-share/aclocal/xine.m4
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CREDITS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.MINGWCROSS
-%%DOCSDIR%%/README.WIN32
-%%DOCSDIR%%/README.cetus
-%%DOCSDIR%%/README.dvb
-%%DOCSDIR%%/README.dxr3
-%%DOCSDIR%%/README.freebsd
-%%DOCSDIR%%/README.irix
-%%DOCSDIR%%/README.macosx
-%%DOCSDIR%%/README.network_dvd
-%%DOCSDIR%%/README.opengl
-%%DOCSDIR%%/README.solaris
-%%DOCSDIR%%/README_xxmc.html
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/faq.html
-%%DOCSDIR%%/faq.txt
-%%DOCSDIR%%/hackersguide/architecture.png
-%%DOCSDIR%%/hackersguide/hackersguide.html
-%%DOCSDIR%%/hackersguide/library.png
-%%DOCSDIR%%/hackersguide/overlays.png
-%%DOCSDIR%%/hackersguide/post_frame.png
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.MINGWCROSS
+%%PORTDOCS%%%%DOCSDIR%%/README.WIN32
+%%PORTDOCS%%%%DOCSDIR%%/README.cetus
+%%PORTDOCS%%%%DOCSDIR%%/README.dvb
+%%PORTDOCS%%%%DOCSDIR%%/README.dxr3
+%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
+%%PORTDOCS%%%%DOCSDIR%%/README.irix
+%%PORTDOCS%%%%DOCSDIR%%/README.macosx
+%%PORTDOCS%%%%DOCSDIR%%/README.network_dvd
+%%PORTDOCS%%%%DOCSDIR%%/README.opengl
+%%PORTDOCS%%%%DOCSDIR%%/README.solaris
+%%PORTDOCS%%%%DOCSDIR%%/README_xxmc.html
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/hackersguide/architecture.png
+%%PORTDOCS%%%%DOCSDIR%%/hackersguide/hackersguide.html
+%%PORTDOCS%%%%DOCSDIR%%/hackersguide/library.png
+%%PORTDOCS%%%%DOCSDIR%%/hackersguide/overlays.png
+%%PORTDOCS%%%%DOCSDIR%%/hackersguide/post_frame.png
 %%NLS%%share/locale/cs/LC_MESSAGES/libxine2.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libxine2.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/libxine2.mo
@@ -231,3 +164,40 @@ share/aclocal/xine.m4
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine2.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo
+%%DATADIR%%/aclocal/xine.m4
+%%DATADIR%%/fonts/cc-16.xinefont.gz
+%%DATADIR%%/fonts/cc-20.xinefont.gz
+%%DATADIR%%/fonts/cc-24.xinefont.gz
+%%DATADIR%%/fonts/cc-32.xinefont.gz
+%%DATADIR%%/fonts/cc-48.xinefont.gz
+%%DATADIR%%/fonts/cc-64.xinefont.gz
+%%DATADIR%%/fonts/cci-16.xinefont.gz
+%%DATADIR%%/fonts/cci-20.xinefont.gz
+%%DATADIR%%/fonts/cci-24.xinefont.gz
+%%DATADIR%%/fonts/cci-32.xinefont.gz
+%%DATADIR%%/fonts/cci-48.xinefont.gz
+%%DATADIR%%/fonts/cci-64.xinefont.gz
+%%DATADIR%%/fonts/cetus-16.xinefont.gz
+%%DATADIR%%/fonts/cetus-20.xinefont.gz
+%%DATADIR%%/fonts/cetus-24.xinefont.gz
+%%DATADIR%%/fonts/cetus-32.xinefont.gz
+%%DATADIR%%/fonts/cetus-48.xinefont.gz
+%%DATADIR%%/fonts/cetus-64.xinefont.gz
+%%DATADIR%%/fonts/mono-16.xinefont.gz
+%%DATADIR%%/fonts/mono-20.xinefont.gz
+%%DATADIR%%/fonts/mono-24.xinefont.gz
+%%DATADIR%%/fonts/mono-32.xinefont.gz
+%%DATADIR%%/fonts/mono-48.xinefont.gz
+%%DATADIR%%/fonts/mono-64.xinefont.gz
+%%DATADIR%%/fonts/sans-16.xinefont.gz
+%%DATADIR%%/fonts/sans-20.xinefont.gz
+%%DATADIR%%/fonts/sans-24.xinefont.gz
+%%DATADIR%%/fonts/sans-32.xinefont.gz
+%%DATADIR%%/fonts/sans-48.xinefont.gz
+%%DATADIR%%/fonts/sans-64.xinefont.gz
+%%DATADIR%%/fonts/serif-16.xinefont.gz
+%%DATADIR%%/fonts/serif-20.xinefont.gz
+%%DATADIR%%/fonts/serif-24.xinefont.gz
+%%DATADIR%%/fonts/serif-32.xinefont.gz
+%%DATADIR%%/fonts/serif-48.xinefont.gz
+%%DATADIR%%/fonts/serif-64.xinefont.gz