xine-lib 1.2.2-1 màj port

6 files changed, 257 insertions, 307 deletions

diff --git a/xine-lib/.footprint.i686 b/xine-lib/.footprint.i686
index b8f7c23d7..7c8b9dfe1 100644
--- a/xine-lib/.footprint.i686
+++ b/xine-lib/.footprint.i686
@@ -48,120 +48,136 @@ drwxr-xr-x	root/root	usr/include/xine/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libxine-interface.la
 -rwxr-xr-x	root/root	usr/lib/libxine.la
-lrwxrwxrwx	root/root	usr/lib/libxine.so -> libxine.so.2.1.0
-lrwxrwxrwx	root/root	usr/lib/libxine.so.2 -> libxine.so.2.1.0
--rwxr-xr-x	root/root	usr/lib/libxine.so.2.1.0
+lrwxrwxrwx	root/root	usr/lib/libxine.so -> libxine.so.2.2.0
+lrwxrwxrwx	root/root	usr/lib/libxine.so.2 -> libxine.so.2.2.0
+-rwxr-xr-x	root/root	usr/lib/libxine.so.2.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libxine.pc
 drwxr-xr-x	root/root	usr/lib/xine/
 drwxr-xr-x	root/root	usr/lib/xine/plugins/
-drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/
--rw-r--r--	root/root	usr/lib/xine/plugins/2.1/mime.types
-drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_audio_filters.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_goom.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_mosaico.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_planar.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_switch.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_tvtime.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_visualizations.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_alsa.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_esd.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_file.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_jack.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_none.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_oss.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_pulseaudio.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_a52.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_bitplane.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dts.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dvaudio.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dxr3_spu.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dxr3_video.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_faad.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_ff.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_gdk_pixbuf.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_gsm610.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_image.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_lpcm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_mad.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_mpc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_mpeg2.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_real.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_rgb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spu.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spucc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spucmml.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spudvb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spuhdmv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_h264.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_h264_alter.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_mpeg12.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_mpeg4.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_vc1.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_yuv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_asf.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_audio.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_avi.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_fli.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_flv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_games.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_iff.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_image.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_matroska.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mng.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_block.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_elem.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_pes.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_ts.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_nsv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_playlist.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_pva.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_qt.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_rawdv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_real.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_slave.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_vc1_es.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_yuv4mpeg2.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_yuv_frames.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_flac.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_cdda.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_dvb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_dvd.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_file.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_http.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_mms.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_net.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_pnm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_pvr.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_rtp.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_rtsp.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_smb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_stdin_fifo.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_v4l2.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_vcd.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_vcdo.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_nsf.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_sputext.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vdr.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_aa.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_caca.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_dxr3.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_fb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_none.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_opengl.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_raw.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_sdl.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_vdpau.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xcbshm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xcbxv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xshm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xvmc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xxmc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_wavpack.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_xiph.so
+drwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/
+-rw-r--r--	root/root	usr/lib/xine/plugins/2.2/mime.types
+drwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_audio_filters.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_goom.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_mosaico.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_planar.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_switch.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_tvtime.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_visualizations.so
+drwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/cyberblade_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/mach64_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/mga_crtc2_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/mga_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/nvidia_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/pm2_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/pm3_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/radeon_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/rage128_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/savage_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/sis_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/unichrome_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_alsa.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_esd.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_file.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_jack.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_none.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_oss.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_pulseaudio.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_a52.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_bitplane.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dts.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dvaudio.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dxr3_spu.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dxr3_video.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_faad.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_ff.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_gdk_pixbuf.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_gsm610.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_image.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_lpcm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_mad.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_mpc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_mpeg2.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_qt.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_real.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_rgb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spu.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spucc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spucmml.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spudvb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spuhdmv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_h264.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_h264_alter.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_mpeg12.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_mpeg4.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_vc1.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_w32dll.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_yuv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_asf.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_audio.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_avi.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_fli.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_flv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_games.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_iff.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_image.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_matroska.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mng.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_block.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_elem.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_pes.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_ts.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_nsv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_playlist.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_pva.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_qt.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_rawdv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_real.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_slave.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_vc1_es.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_yuv4mpeg2.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_yuv_frames.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_flac.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_cdda.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_dvb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_dvd.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_file.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_http.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_mms.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_net.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_pnm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_pvr.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_rtp.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_rtsp.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_smb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_stdin_fifo.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_v4l2.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_vcd.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_vcdo.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_nsf.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_sputext.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vdr.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_aa.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_caca.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_dxr3.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_fb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_none.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_opengl.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_raw.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_sdl.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_vdpau.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_vidix.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xcbshm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xcbxv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xshm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xvmc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xxmc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_wavpack.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_xiph.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/xine.m4
diff --git a/xine-lib/.footprint.x86_64 b/xine-lib/.footprint.x86_64
index b8f7c23d7..7c8b9dfe1 100644
--- a/xine-lib/.footprint.x86_64
+++ b/xine-lib/.footprint.x86_64
@@ -48,120 +48,136 @@ drwxr-xr-x	root/root	usr/include/xine/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libxine-interface.la
 -rwxr-xr-x	root/root	usr/lib/libxine.la
-lrwxrwxrwx	root/root	usr/lib/libxine.so -> libxine.so.2.1.0
-lrwxrwxrwx	root/root	usr/lib/libxine.so.2 -> libxine.so.2.1.0
--rwxr-xr-x	root/root	usr/lib/libxine.so.2.1.0
+lrwxrwxrwx	root/root	usr/lib/libxine.so -> libxine.so.2.2.0
+lrwxrwxrwx	root/root	usr/lib/libxine.so.2 -> libxine.so.2.2.0
+-rwxr-xr-x	root/root	usr/lib/libxine.so.2.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libxine.pc
 drwxr-xr-x	root/root	usr/lib/xine/
 drwxr-xr-x	root/root	usr/lib/xine/plugins/
-drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/
--rw-r--r--	root/root	usr/lib/xine/plugins/2.1/mime.types
-drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_audio_filters.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_goom.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_mosaico.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_planar.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_switch.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_tvtime.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/xineplug_post_visualizations.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_alsa.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_esd.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_file.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_jack.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_none.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_oss.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_pulseaudio.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_a52.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_bitplane.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dts.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dvaudio.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dxr3_spu.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dxr3_video.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_faad.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_ff.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_gdk_pixbuf.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_gsm610.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_image.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_lpcm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_mad.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_mpc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_mpeg2.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_real.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_rgb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spu.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spucc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spucmml.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spudvb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_spuhdmv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_h264.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_h264_alter.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_mpeg12.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_mpeg4.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_vdpau_vc1.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_yuv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_asf.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_audio.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_avi.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_fli.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_flv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_games.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_iff.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_image.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_matroska.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mng.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_block.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_elem.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_pes.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_mpeg_ts.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_nsv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_playlist.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_pva.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_qt.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_rawdv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_real.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_slave.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_vc1_es.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_yuv4mpeg2.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_dmx_yuv_frames.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_flac.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_cdda.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_dvb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_dvd.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_file.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_http.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_mms.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_net.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_pnm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_pvr.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_rtp.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_rtsp.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_smb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_stdin_fifo.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_v4l2.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_vcd.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_inp_vcdo.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_nsf.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_sputext.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vdr.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_aa.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_caca.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_dxr3.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_fb.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_none.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_opengl.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_raw.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_sdl.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_vdpau.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xcbshm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xcbxv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xshm.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xv.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xvmc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_xxmc.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_wavpack.so
--rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_xiph.so
+drwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/
+-rw-r--r--	root/root	usr/lib/xine/plugins/2.2/mime.types
+drwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_audio_filters.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_goom.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_mosaico.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_planar.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_switch.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_tvtime.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/post/xineplug_post_visualizations.so
+drwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/cyberblade_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/mach64_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/mga_crtc2_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/mga_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/nvidia_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/pm2_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/pm3_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/radeon_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/rage128_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/savage_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/sis_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/vidix/unichrome_vid.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_alsa.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_esd.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_file.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_jack.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_none.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_oss.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_ao_out_pulseaudio.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_a52.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_bitplane.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dts.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dvaudio.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dxr3_spu.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_dxr3_video.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_faad.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_ff.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_gdk_pixbuf.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_gsm610.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_image.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_lpcm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_mad.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_mpc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_mpeg2.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_qt.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_real.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_rgb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spu.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spucc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spucmml.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spudvb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_spuhdmv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_h264.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_h264_alter.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_mpeg12.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_mpeg4.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_vdpau_vc1.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_w32dll.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_decode_yuv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_asf.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_audio.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_avi.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_fli.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_flv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_games.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_iff.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_image.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_matroska.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mng.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_block.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_elem.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_pes.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_mpeg_ts.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_nsv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_playlist.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_pva.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_qt.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_rawdv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_real.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_slave.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_vc1_es.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_yuv4mpeg2.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_dmx_yuv_frames.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_flac.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_cdda.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_dvb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_dvd.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_file.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_http.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_mms.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_net.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_pnm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_pvr.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_rtp.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_rtsp.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_smb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_stdin_fifo.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_v4l2.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_vcd.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_inp_vcdo.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_nsf.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_sputext.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vdr.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_aa.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_caca.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_dxr3.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_fb.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_none.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_opengl.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_raw.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_sdl.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_vdpau.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_vidix.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xcbshm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xcbxv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xshm.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xv.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xvmc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_vo_out_xxmc.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_wavpack.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.2/xineplug_xiph.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/xine.m4
diff --git a/xine-lib/.md5sum.i686 b/xine-lib/.md5sum.i686
index ff6a024d4..593074e36 100644
--- a/xine-lib/.md5sum.i686
+++ b/xine-lib/.md5sum.i686
@@ -1,2 +1 @@
-5b8c22606a55e1b1f723cd8c1c1ae0d7  ffmpeg-0.11.patch
-6884ba356ebd7f0ccf900f91ebf15a65  xine-lib-1.2.1.tar.xz
+6fa70fa336f708452ce9bf311b401de2  xine-lib-1.2.2.tar.xz
diff --git a/xine-lib/.md5sum.x86_64 b/xine-lib/.md5sum.x86_64
index ff6a024d4..593074e36 100644
--- a/xine-lib/.md5sum.x86_64
+++ b/xine-lib/.md5sum.x86_64
@@ -1,2 +1 @@
-5b8c22606a55e1b1f723cd8c1c1ae0d7  ffmpeg-0.11.patch
-6884ba356ebd7f0ccf900f91ebf15a65  xine-lib-1.2.1.tar.xz
+6fa70fa336f708452ce9bf311b401de2  xine-lib-1.2.2.tar.xz
diff --git a/xine-lib/Pkgfile b/xine-lib/Pkgfile
index afb26042c..5afd3f96a 100755
--- a/xine-lib/Pkgfile
+++ b/xine-lib/Pkgfile
@@ -6,14 +6,12 @@
 # Run on: mesa3d,xorg-libxvmc,xorg-libxcb,faad2,libcaca,speex,libmng,esound,libvorbis,flac,libtheora,sdl,ffmpeg,vcdimager,wavpack,samba3,librsvg,imagemagick,libvdpau,jack2,pulseaudio,speex
 
 name=xine-lib
-version=1.2.1
-release=2
-source=(http://downloads.sourceforge.net/xine/$name-$version.tar.xz
-	ffmpeg-0.11.patch)
+version=1.2.2
+release=1
+source=(http://downloads.sourceforge.net/xine/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
-	patch -p1 < ../ffmpeg-0.11.patch
 	./configure  --prefix=/usr \
 		--with-w32-path=/usr/lib/codecs \
 		--with-xv-path=/usr/lib \
diff --git a/xine-lib/ffmpeg-0.11.patch b/xine-lib/ffmpeg-0.11.patch
deleted file mode 100644
index c24aee8a3..000000000
--- a/xine-lib/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From ebbd60ff7043826886cd7c35fde9e06bfe3b5093 Mon Sep 17 00:00:00 2001
-From: Edgar Hucek
-Date: Sun, 29 Jan 2012 21:39:38 +0000
-Subject: fix compile against recent ffmpeg
-
----
-diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
-index ecfa0a8..2ec18c5 100644
---- a/src/combined/ffmpeg/ff_video_decoder.c
-+++ b/src/combined/ffmpeg/ff_video_decoder.c
-@@ -130,7 +130,9 @@ struct ff_video_decoder_s {
- 
-   yuv_planes_t      yuv;
- 
-+#ifdef AVPaletteControl
-   AVPaletteControl  palette_control;
-+#endif
- 
- #ifdef LOG
-   enum PixelFormat  debug_fmt;
-@@ -218,7 +220,9 @@ static int get_buffer(AVCodecContext *context, AVFrame *av_frame){
-   /* We should really keep track of the ages of xine frames (see
-    * avcodec_default_get_buffer in libavcodec/utils.c)
-    * For the moment tell ffmpeg that every frame is new (age = bignumber) */
-+#ifdef AVFRAMEAGE
-   av_frame->age = 256*256*256*64;
-+#endif
- 
-   av_frame->type= FF_BUFFER_TYPE_USER;
- 
-@@ -1028,7 +1032,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
-     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-       buf->decoder_info[2]);
- 
--  } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
-+  }
-+#ifdef AVPaletteControl
-+  else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
-     unsigned int i;
- 
-     palette_entry_t *demuxer_palette;
-@@ -1047,7 +1053,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
-     }
-     decoder_palette->palette_changed = 1;
- 
--  } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
-+  }
-+#endif
-+  else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
-     int i;
- 
-     lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
-@@ -1794,7 +1802,9 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen,
-   this->av_frame          = avcodec_alloc_frame();
-   this->context           = avcodec_alloc_context();
-   this->context->opaque   = this;
-+#ifdef AVPaletteControl
-   this->context->palctrl  = NULL;
-+#endif
- 
-   this->decoder_ok        = 0;
-   this->decoder_init_mode = 1;
-diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
-index 371b5cc..69b9aa3 100644
---- a/src/combined/ffmpeg/ffmpeg_compat.h
-+++ b/src/combined/ffmpeg/ffmpeg_compat.h
-@@ -91,5 +91,9 @@
- #  define AVAUDIO 2
- #endif
- 
-+/* AVFrame.age */
-+#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1)
-+#  define AVFRAMEAGE 1
-+#endif
- 
- #endif /* XINE_AVCODEC_COMPAT_H */
---
-cgit v0.9.0.2-39-g756e