- Update to 1.1.2.

- Enable Theora codec support by default and remove WITH_THEORA knob.

11 files changed, 153 insertions, 323 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 7ddb78484e7c..67b07e6e9a99 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.1.1
-PORTREVISION=	6
+PORTVERSION=	1.1.2
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,14 +29,16 @@ LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		cdio.7:${PORTSDIR}/sysutils/libcdio \
 		modplug.0:${PORTSDIR}/audio/libmodplug \
 		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
-		Wand.10:${PORTSDIR}/graphics/ImageMagick
+		Wand.10:${PORTSDIR}/graphics/ImageMagick \
+		theora.2:${PORTSDIR}/multimedia/libtheora
 
+USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	gnomehack gnometarget gtk20
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_SDL=	sdl
@@ -48,7 +49,8 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCA
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
 		EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6
+CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \
+		--mandir=${PREFIX}/man
 INSTALLS_SHLIB=	yes
 
 MAN1=	xine-config.1
@@ -117,14 +119,6 @@ PLIST_SUB+=	WITH_XVMC=""
 PLIST_SUB+=	WITH_XVMC="@comment "
 .endif
 
-.if !defined(WITHOUT_THEORA) && (exists(${LOCALBASE}/lib/libtheora.so.2) || defined (WITH_THEORA))
-LIB_DEPENDS+=	theora.2:${PORTSDIR}/multimedia/libtheora
-PLIST_SUB+=	WITH_THEORA=""
-.else
-PLIST_SUB+=	WITH_THEORA="@comment "
-CONFIGURE_ARGS+=	--disable-theoratest
-.endif
-
 .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=""
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index b8e220bcd47c..e9e30d28cdf2 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,3 +1,3 @@
-MD5 (xine-lib-1.1.1.tar.gz) = b1f42602c776bb93e3cbf127e220cbfd
-SHA256 (xine-lib-1.1.1.tar.gz) = 8d37d556a0496b9df421dc3c01ce7457b88e8b2762720a577b5bbdb5374d1505
-SIZE (xine-lib-1.1.1.tar.gz) = 7990031
+MD5 (xine-lib-1.1.2.tar.bz2) = c4dd262c47caae6f428eb902ac8ec0e8
+SHA256 (xine-lib-1.1.2.tar.bz2) = 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
+SIZE (xine-lib-1.1.2.tar.bz2) = 6457108
diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure
index afae9aaa4ac6..f13122492c31 100644
--- a/multimedia/libxine/files/patch-configure
+++ b/multimedia/libxine/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Nov 15 20:40:27 2005
-+++ configure	Mon May  1 01:33:08 2006
-@@ -26269,7 +26269,7 @@
+--- configure.orig	Sun Jul 23 21:25:31 2006
++++ configure	Sun Jul 23 21:25:31 2006
+@@ -28905,7 +28905,7 @@
                   "ac_cv_lib_avcodec_pp_get_context" \
                   "ac_cv_lib_postproc_pp_get_context" \
                   "ac_cv_lib_avcodec_register_avcodec"; do
@@ -9,21 +9,12 @@
          done
  
                  if test "${ac_cv_header_avcodec_h+set}" = set; then
-@@ -26804,7 +26804,7 @@
-       fi
-     else
-             CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
--      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
-+      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}"
-       cat >conftest.$ac_ext <<_ACEOF
- #include <avcodec.h>
- #include <postprocess.h>
-@@ -35293,6 +35293,8 @@
- fi
+@@ -38707,6 +38707,8 @@
+ 
         CFLAGS="$ac_save_CFLAGS"
         LIBS="$ac_save_LIBS"
 +else
 +no_theora=yes
    fi
  
-   if test "x$no_theora" = x ; then
+   if test "x$no_ogg" = x ; then
diff --git a/multimedia/libxine/files/patch-src:input:input_cdda.c b/multimedia/libxine/files/patch-src:input:input_cdda.c
deleted file mode 100644
index a0e655ea642b..000000000000
--- a/multimedia/libxine/files/patch-src:input:input_cdda.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/input_cdda.c.orig	Sun Dec 11 03:34:00 2005
-+++ src/input/input_cdda.c	Sun Dec 11 03:34:07 2005
-@@ -32,7 +32,7 @@
- #include <unistd.h>
- 
- #include <sys/types.h>
--#ifdef SYS_PARAM_H
-+#ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #ifdef HAVE_DIRENT_H
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 df1108051dd0..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/libffmpeg/libavcodec/h263.c.orig	Fri Dec 16 00:57:15 2005
-+++ src/libffmpeg/libavcodec/h263.c	Fri Dec 16 01:00:23 2005
-@@ -66,8 +66,8 @@
- 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_dc(MpegEncContext * s, int n, int *dir_ptr);
--static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
-+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-                               int n, int coded, int intra, int rvlc);
- static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, 
-                                uint8_t *scan_table);
-@@ -4682,7 +4682,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;
- 
-@@ -4727,7 +4727,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 a5e83b6367ec..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/libffmpeg/libavcodec/mpeg12.c.orig	Fri Dec 16 01:04:27 2005
-+++ src/libffmpeg/libavcodec/mpeg12.c	Fri Dec 16 01:12:18 2005
-@@ -65,21 +65,21 @@
-                          int component);
- static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code);    // RAL: f_code parameter added
- #endif //CONFIG_ENCODERS
--static inline int mpeg1_decode_block_inter(MpegEncContext *s, 
-+static int mpeg1_decode_block_inter(MpegEncContext *s, 
-                               DCTELEM *block, 
-                               int n);
--static inline int mpeg1_decode_block_intra(MpegEncContext *s, 
-+static int mpeg1_decode_block_intra(MpegEncContext *s, 
-                               DCTELEM *block, 
-                               int n);
--static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
--static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, 
-+static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
-+static int mpeg2_decode_block_non_intra(MpegEncContext *s, 
-                                         DCTELEM *block, 
-                                         int n);
--static inline int mpeg2_decode_block_intra(MpegEncContext *s, 
-+static int mpeg2_decode_block_intra(MpegEncContext *s, 
-                                     DCTELEM *block, 
-                                     int n);
--static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
--static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
-+static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
-+static int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
- static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
- static void exchange_uv(MpegEncContext *s);
- 
-@@ -1505,7 +1505,7 @@
-     return diff;
- }
- 
--static inline int mpeg1_decode_block_intra(MpegEncContext *s, 
-+static int mpeg1_decode_block_intra(MpegEncContext *s, 
-                                DCTELEM *block, 
-                                int n)
- {
-@@ -1578,7 +1578,7 @@
-    return 0;
- }
- 
--static inline int mpeg1_decode_block_inter(MpegEncContext *s, 
-+static int mpeg1_decode_block_inter(MpegEncContext *s, 
-                                DCTELEM *block, 
-                                int n)
- {
-@@ -1656,7 +1656,7 @@
-     return 0;
- }
- 
--static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
-+static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
- {
-     int level, i, j, run;
-     RLTable *rl = &rl_mpeg1;
-@@ -1728,7 +1728,7 @@
- }
- 
- 
--static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, 
-+static int mpeg2_decode_block_non_intra(MpegEncContext *s, 
-                                DCTELEM *block, 
-                                int n)
- {
-@@ -1809,7 +1809,7 @@
-     return 0;
- }
- 
--static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, 
-+static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, 
-                                DCTELEM *block, 
-                                int n)
- {
-@@ -1872,7 +1872,7 @@
- }
- 
- 
--static inline int mpeg2_decode_block_intra(MpegEncContext *s, 
-+static int mpeg2_decode_block_intra(MpegEncContext *s, 
-                                DCTELEM *block, 
-                                int n)
- {
-@@ -1952,7 +1952,7 @@
-     return 0;
- }
- 
--static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, 
-+static int mpeg2_fast_decode_block_intra(MpegEncContext *s, 
-                                DCTELEM *block, 
-                                int n)
- {
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 ded87b1c6672..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/libffmpeg/libavcodec/msmpeg4.c.orig	Fri Dec 16 01:17:22 2005
-+++ src/libffmpeg/libavcodec/msmpeg4.c	Fri Dec 16 01:18:00 2005
-@@ -60,7 +60,7 @@
- static uint32_t v2_dc_chroma_table[512][2];
- 
- static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
--static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-                                        int n, int coded, const uint8_t *scantable);
- static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
- static int msmpeg4_decode_motion(MpegEncContext * s, 
-@@ -1659,7 +1659,7 @@
-     return 0;
- }
- //#define ERROR_DETAILS
--static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+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;
diff --git a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
index a642a0744ac0..7148d0253651 100644
--- a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
+++ b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
@@ -1,5 +1,5 @@
---- src/libreal/audio_decoder.c.orig	Sun Oct 23 07:09:47 2005
-+++ src/libreal/audio_decoder.c	Sun Dec 11 02:49:37 2005
+--- src/libreal/audio_decoder.c.orig	Sun Jul  9 23:39:11 2006
++++ src/libreal/audio_decoder.c	Sun Jul 23 21:38:59 2006
 @@ -48,6 +48,14 @@
  #include "buffer.h"
  #include "xineutils.h"
@@ -15,7 +15,7 @@
  typedef struct {
    audio_decoder_class_t   decoder_class;
  
-@@ -709,24 +717,12 @@
+@@ -713,28 +721,14 @@
  
    /* try some auto-detection */
  
@@ -29,19 +29,25 @@
 -    default_real_codec_path = "/opt/RealPlayer8/Codecs";
 -  if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib/RealPlayer10/codecs/drvc.so", &s)) 
+-    default_real_codec_path = "/usr/lib/RealPlayer10/codecs";
 -  if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
 -  if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib64/RealPlayer10/codecs/drvc.so", &s)) 
+-    default_real_codec_path = "/usr/lib64/RealPlayer10/codecs";
 -  if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/codecs";
 -  if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/win32";
-+  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
++  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
 +    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
++  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 +    default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
++  if (!stat ("/usr/X11R6/lib/RealPlayer/codecs/drvc.so", &s)) 
++    default_real_codec_path = "/usr/X11R6/lib/RealPlayer/codecs";
++  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
 +    default_real_codec_path = "/usr/local/lib/win32";
    
    real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
diff --git a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
index 829547cfcf88..5e91bbb32d3e 100644
--- a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
@@ -1,5 +1,5 @@
---- src/libreal/xine_decoder.c.orig	Thu Oct 27 23:58:56 2005
-+++ src/libreal/xine_decoder.c	Sun Dec 11 02:52:23 2005
+--- src/libreal/xine_decoder.c.orig	Sun Jul  9 23:39:11 2006
++++ src/libreal/xine_decoder.c	Sun Jul 23 21:41:12 2006
 @@ -47,6 +47,14 @@
  #include "buffer.h"
  #include "xineutils.h"
@@ -15,7 +15,7 @@
  typedef struct {
    video_decoder_class_t   decoder_class;
  
-@@ -589,25 +597,13 @@
+@@ -606,28 +614,14 @@
  
    /* try some auto-detection */
  
@@ -29,22 +29,26 @@
 -    default_real_codec_path = "/opt/RealPlayer8/Codecs";
 -  if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib/RealPlayer10/codecs/drvc.so", &s)) 
+-    default_real_codec_path = "/usr/lib/RealPlayer10/codecs";
 -  if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
 -  if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
+-  if (!stat ("/usr/lib64/RealPlayer10/codecs/drvc.so", &s)) 
+-    default_real_codec_path = "/usr/lib64/RealPlayer10/codecs";
 -  if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/codecs";
 -  if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
 -    default_real_codec_path = "/usr/lib/win32";
--  
-+  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
++  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
 +    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
++  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
 +    default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
++  if (!stat ("/usr/X11R6/lib/RealPlayer/codecs/drvc.so", &s)) 
++    default_real_codec_path = "/usr/X11R6/lib/RealPlayer/codecs";
++  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
 +    default_real_codec_path = "/usr/local/lib/win32";
-+
+   
    real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
  					     default_real_codec_path,
- 					     _("path to RealPlayer codecs"),
diff --git a/multimedia/libxine/files/patch-src_input_input_http.c b/multimedia/libxine/files/patch-src_input_input_http.c
deleted file mode 100644
index 16cba0bcd3f8..000000000000
--- a/multimedia/libxine/files/patch-src_input_input_http.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/input/input_http.c.orig	Tue Jun  6 21:16:04 2006
-+++ src/input/input_http.c	Tue Jun  6 21:22:34 2006
-@@ -895,6 +895,12 @@
- 	len = 0;
-     } else
-       len ++;
-+    if ( len >= BUFSIZE ) {
-+       _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
-+       xine_log (this->stream->xine, XINE_LOG_MSG,
-+         _("input_http: buffer exhausted after %d bytes."), BUFSIZE);
-+       return 0;
-+    }
-   }
- 
-   lprintf ("end of headers\n");
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 5386529ff491..56b83f7c661d 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -2,6 +2,7 @@ bin/xine-config
 include/xine.h
 include/xine/alphablend.h
 include/xine/attributes.h
+include/xine/array.h
 include/xine/audio_decoder.h
 include/xine/audio_out.h
 include/xine/broadcaster.h
@@ -12,14 +13,18 @@ include/xine/demux.h
 include/xine/info_helper.h
 include/xine/input_plugin.h
 include/xine/io_helper.h
+include/xine/list.h
 include/xine/metronom.h
 include/xine/os_types.h
 include/xine/osd.h
 include/xine/plugin_catalog.h
+include/xine/pool.h
 include/xine/post.h
 include/xine/refcounter.h
 include/xine/resample.h
+include/xine/ring_buffer.h
 include/xine/scratch.h
+include/xine/sorted_array.h
 include/xine/spu_decoder.h
 include/xine/video_decoder.h
 include/xine/video_out.h
@@ -35,109 +40,110 @@ include/xine/xmlparser.h
 lib/libxine.la
 lib/libxine.so
 lib/libxine.so.15
-lib/xine/plugins/1.1.1/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.1.1/post/xineplug_post_goom.so
-lib/xine/plugins/1.1.1/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.1.1/post/xineplug_post_planar.so
-lib/xine/plugins/1.1.1/post/xineplug_post_switch.so
-lib/xine/plugins/1.1.1/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.1.1/post/xineplug_post_visualizations.so
-@exec mkdir -p %D/lib/xine/plugins/1.1.1/vidix
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/mach64_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/mga_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/nvidia_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/pm2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/pm3_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/radeon_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/rage128_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/savage_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/sis_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/vidix/unichrome_vid.so
-%%WITH_ARTS%%lib/xine/plugins/1.1.1/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%lib/xine/plugins/1.1.1/xineplug_ao_out_esd.so
-lib/xine/plugins/1.1.1/xineplug_ao_out_file.so
-lib/xine/plugins/1.1.1/xineplug_ao_out_none.so
-lib/xine/plugins/1.1.1/xineplug_ao_out_oss.so
-%%WITH_POLYPAUDIO%%lib/xine/plugins/1.1.1/xineplug_ao_out_polypaudio.so
-lib/xine/plugins/1.1.1/xineplug_decode_a52.so
-lib/xine/plugins/1.1.1/xineplug_decode_bitplane.so
-lib/xine/plugins/1.1.1/xineplug_decode_dts.so
-lib/xine/plugins/1.1.1/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.1.1/xineplug_decode_faad.so
-lib/xine/plugins/1.1.1/xineplug_decode_ff.so
-lib/xine/plugins/1.1.1/xineplug_decode_gsm610.so
-lib/xine/plugins/1.1.1/xineplug_decode_image.so
-lib/xine/plugins/1.1.1/xineplug_decode_lpcm.so
-lib/xine/plugins/1.1.1/xineplug_decode_mad.so
-lib/xine/plugins/1.1.1/xineplug_decode_mpc.so
-lib/xine/plugins/1.1.1/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.1.1/xineplug_decode_nsf.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/xineplug_decode_qt.so
-lib/xine/plugins/1.1.1/xineplug_decode_real.so
-lib/xine/plugins/1.1.1/xineplug_decode_real_audio.so
-lib/xine/plugins/1.1.1/xineplug_decode_rgb.so
-lib/xine/plugins/1.1.1/xineplug_decode_speex.so
-lib/xine/plugins/1.1.1/xineplug_decode_spu.so
-lib/xine/plugins/1.1.1/xineplug_decode_spucc.so
-lib/xine/plugins/1.1.1/xineplug_decode_spucmml.so
-lib/xine/plugins/1.1.1/xineplug_decode_spudvb.so
-lib/xine/plugins/1.1.1/xineplug_decode_sputext.so
-%%WITH_THEORA%%lib/xine/plugins/1.1.1/xineplug_decode_theora.so
-%%WITH_CACA%%lib/xine/plugins/1.1.1/xineplug_vo_out_caca.so
-lib/xine/plugins/1.1.1/xineplug_decode_vorbis.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/xineplug_decode_w32dll.so
-lib/xine/plugins/1.1.1/xineplug_decode_yuv.so
-lib/xine/plugins/1.1.1/xineplug_dmx_asf.so
-lib/xine/plugins/1.1.1/xineplug_dmx_audio.so
-lib/xine/plugins/1.1.1/xineplug_dmx_avi.so
-lib/xine/plugins/1.1.1/xineplug_dmx_fli.so
-lib/xine/plugins/1.1.1/xineplug_dmx_flv.so
-lib/xine/plugins/1.1.1/xineplug_dmx_games.so
-lib/xine/plugins/1.1.1/xineplug_dmx_iff.so
-lib/xine/plugins/1.1.1/xineplug_dmx_image.so
-lib/xine/plugins/1.1.1/xineplug_dmx_matroska.so
-lib/xine/plugins/1.1.1/xineplug_dmx_mng.so
-lib/xine/plugins/1.1.1/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.1.1/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.1.1/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.1.1/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.1.1/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.1.1/xineplug_dmx_nsv.so
-lib/xine/plugins/1.1.1/xineplug_dmx_ogg.so
-lib/xine/plugins/1.1.1/xineplug_dmx_pva.so
-lib/xine/plugins/1.1.1/xineplug_dmx_qt.so
-lib/xine/plugins/1.1.1/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.1.1/xineplug_dmx_real.so
-lib/xine/plugins/1.1.1/xineplug_dmx_slave.so
-lib/xine/plugins/1.1.1/xineplug_dmx_sputext.so
-lib/xine/plugins/1.1.1/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.1.1/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.1.1/xineplug_flac.so
-lib/xine/plugins/1.1.1/xineplug_inp_cdda.so
-lib/xine/plugins/1.1.1/xineplug_inp_dvb.so
-lib/xine/plugins/1.1.1/xineplug_inp_dvd.so
-lib/xine/plugins/1.1.1/xineplug_inp_file.so
-%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.1/xineplug_inp_gnome_vfs.so
-lib/xine/plugins/1.1.1/xineplug_inp_http.so
-lib/xine/plugins/1.1.1/xineplug_inp_mms.so
-lib/xine/plugins/1.1.1/xineplug_inp_net.so
-lib/xine/plugins/1.1.1/xineplug_inp_pnm.so
-lib/xine/plugins/1.1.1/xineplug_inp_rtp.so
-lib/xine/plugins/1.1.1/xineplug_inp_rtsp.so
-%%WITH_SMB%%lib/xine/plugins/1.1.1/xineplug_inp_smb.so
-lib/xine/plugins/1.1.1/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.1.1/xineplug_inp_vcd.so
-lib/xine/plugins/1.1.1/xineplug_inp_vcdo.so
-lib/xine/plugins/1.1.1/xineplug_vo_out_aa.so
-lib/xine/plugins/1.1.1/xineplug_vo_out_none.so
-lib/xine/plugins/1.1.1/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.1.1/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.1/xineplug_vo_out_vidix.so
-lib/xine/plugins/1.1.1/xineplug_vo_out_xshm.so
-%%WITH_LIBXV%%lib/xine/plugins/1.1.1/xineplug_vo_out_xv.so
-%%WITH_XVMC%%lib/xine/plugins/1.1.1/xineplug_vo_out_xvmc.so
+lib/xine/plugins/1.1.2/post/xineplug_post_audio_filters.so
+lib/xine/plugins/1.1.2/post/xineplug_post_goom.so
+lib/xine/plugins/1.1.2/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.1.2/post/xineplug_post_planar.so
+lib/xine/plugins/1.1.2/post/xineplug_post_switch.so
+lib/xine/plugins/1.1.2/post/xineplug_post_tvtime.so
+lib/xine/plugins/1.1.2/post/xineplug_post_visualizations.so
+@exec mkdir -p %D/lib/xine/plugins/1.1.2/vidix
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/cyberblade_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/mach64_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/mga_crtc2_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/mga_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/nvidia_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/pm2_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/pm3_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/radeon_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/rage128_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/savage_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/sis_vid.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/vidix/unichrome_vid.so
+%%WITH_ARTS%%lib/xine/plugins/1.1.2/xineplug_ao_out_arts.so
+%%WITH_ESOUND%%lib/xine/plugins/1.1.2/xineplug_ao_out_esd.so
+lib/xine/plugins/1.1.2/xineplug_ao_out_file.so
+lib/xine/plugins/1.1.2/xineplug_ao_out_none.so
+lib/xine/plugins/1.1.2/xineplug_ao_out_oss.so
+%%WITH_POLYPAUDIO%%lib/xine/plugins/1.1.2/xineplug_ao_out_polypaudio.so
+lib/xine/plugins/1.1.2/xineplug_decode_a52.so
+lib/xine/plugins/1.1.2/xineplug_decode_bitplane.so
+lib/xine/plugins/1.1.2/xineplug_decode_dts.so
+lib/xine/plugins/1.1.2/xineplug_decode_dvaudio.so
+lib/xine/plugins/1.1.2/xineplug_decode_faad.so
+lib/xine/plugins/1.1.2/xineplug_decode_ff.so
+lib/xine/plugins/1.1.2/xineplug_decode_gdk_pixbuf.so
+lib/xine/plugins/1.1.2/xineplug_decode_gsm610.so
+lib/xine/plugins/1.1.2/xineplug_decode_image.so
+lib/xine/plugins/1.1.2/xineplug_decode_lpcm.so
+lib/xine/plugins/1.1.2/xineplug_decode_mad.so
+lib/xine/plugins/1.1.2/xineplug_decode_mpc.so
+lib/xine/plugins/1.1.2/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.1.2/xineplug_decode_nsf.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/xineplug_decode_qt.so
+lib/xine/plugins/1.1.2/xineplug_decode_real.so
+lib/xine/plugins/1.1.2/xineplug_decode_real_audio.so
+lib/xine/plugins/1.1.2/xineplug_decode_rgb.so
+lib/xine/plugins/1.1.2/xineplug_decode_speex.so
+lib/xine/plugins/1.1.2/xineplug_decode_spu.so
+lib/xine/plugins/1.1.2/xineplug_decode_spucc.so
+lib/xine/plugins/1.1.2/xineplug_decode_spucmml.so
+lib/xine/plugins/1.1.2/xineplug_decode_spudvb.so
+lib/xine/plugins/1.1.2/xineplug_decode_sputext.so
+lib/xine/plugins/1.1.2/xineplug_decode_theora.so
+%%WITH_CACA%%lib/xine/plugins/1.1.2/xineplug_vo_out_caca.so
+lib/xine/plugins/1.1.2/xineplug_decode_vorbis.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/xineplug_decode_w32dll.so
+lib/xine/plugins/1.1.2/xineplug_decode_yuv.so
+lib/xine/plugins/1.1.2/xineplug_dmx_asf.so
+lib/xine/plugins/1.1.2/xineplug_dmx_audio.so
+lib/xine/plugins/1.1.2/xineplug_dmx_avi.so
+lib/xine/plugins/1.1.2/xineplug_dmx_fli.so
+lib/xine/plugins/1.1.2/xineplug_dmx_flv.so
+lib/xine/plugins/1.1.2/xineplug_dmx_games.so
+lib/xine/plugins/1.1.2/xineplug_dmx_iff.so
+lib/xine/plugins/1.1.2/xineplug_dmx_image.so
+lib/xine/plugins/1.1.2/xineplug_dmx_matroska.so
+lib/xine/plugins/1.1.2/xineplug_dmx_mng.so
+lib/xine/plugins/1.1.2/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.1.2/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.1.2/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.1.2/xineplug_dmx_mpeg_pes.so
+lib/xine/plugins/1.1.2/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.1.2/xineplug_dmx_nsv.so
+lib/xine/plugins/1.1.2/xineplug_dmx_ogg.so
+lib/xine/plugins/1.1.2/xineplug_dmx_pva.so
+lib/xine/plugins/1.1.2/xineplug_dmx_qt.so
+lib/xine/plugins/1.1.2/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.1.2/xineplug_dmx_real.so
+lib/xine/plugins/1.1.2/xineplug_dmx_slave.so
+lib/xine/plugins/1.1.2/xineplug_dmx_sputext.so
+lib/xine/plugins/1.1.2/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.1.2/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.1.2/xineplug_flac.so
+lib/xine/plugins/1.1.2/xineplug_inp_cdda.so
+lib/xine/plugins/1.1.2/xineplug_inp_dvb.so
+lib/xine/plugins/1.1.2/xineplug_inp_dvd.so
+lib/xine/plugins/1.1.2/xineplug_inp_file.so
+%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.2/xineplug_inp_gnome_vfs.so
+lib/xine/plugins/1.1.2/xineplug_inp_http.so
+lib/xine/plugins/1.1.2/xineplug_inp_mms.so
+lib/xine/plugins/1.1.2/xineplug_inp_net.so
+lib/xine/plugins/1.1.2/xineplug_inp_pnm.so
+lib/xine/plugins/1.1.2/xineplug_inp_rtp.so
+lib/xine/plugins/1.1.2/xineplug_inp_rtsp.so
+%%WITH_SMB%%lib/xine/plugins/1.1.2/xineplug_inp_smb.so
+lib/xine/plugins/1.1.2/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.1.2/xineplug_inp_vcd.so
+lib/xine/plugins/1.1.2/xineplug_inp_vcdo.so
+lib/xine/plugins/1.1.2/xineplug_vo_out_aa.so
+lib/xine/plugins/1.1.2/xineplug_vo_out_none.so
+lib/xine/plugins/1.1.2/xineplug_vo_out_opengl.so
+lib/xine/plugins/1.1.2/xineplug_vo_out_sdl.so
+%%WITH_VIDIX%%lib/xine/plugins/1.1.2/xineplug_vo_out_vidix.so
+lib/xine/plugins/1.1.2/xineplug_vo_out_xshm.so
+%%WITH_LIBXV%%lib/xine/plugins/1.1.2/xineplug_vo_out_xv.so
+%%WITH_XVMC%%lib/xine/plugins/1.1.2/xineplug_vo_out_xvmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 %%DOCSDIR%%/README
@@ -205,9 +211,9 @@ 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.1/vidix
-@dirrm lib/xine/plugins/1.1.1/post
-@dirrm lib/xine/plugins/1.1.1
+@dirrm lib/xine/plugins/1.1.2/vidix
+@dirrm lib/xine/plugins/1.1.2/post
+@dirrm lib/xine/plugins/1.1.2
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm %%DOCSDIR%%/hackersguide