   * notify frame format change
   */
  typedef struct {
-diff -x xine-config -x configure.ac -x 'configure.h*' -x config.guess -x config.sub -x configure -x SlackBuild -x '*.m4' -x ltmain.sh -x libtool -x Makefile -x Makefile.in -ru xine-lib-1-2-767ccb7795a2/src/combined/Makefile.am ../xine-lib-1-2-767ccb7795a2/src/combined/Makefile.am
---- xine-lib-1-2-767ccb7795a2/src/combined/Makefile.am	2008-07-17 16:50:59.000000000 +0100
-+++ ../xine-lib-1-2-767ccb7795a2/src/combined/Makefile.am	2008-07-23 08:34:02.000000000 +0100
-@@ -64,3 +64,8 @@
+diff --git a/include/xine/buffer.h b/include/xine/buffer.h
+index e64246a..4004b9b 100644
+--- a/include/xine/buffer.h
++++ b/include/xine/buffer.h
+@@ -284,6 +284,7 @@ extern "C" {
+ #define BUF_SPU_CVD             0x04050000
+ #define BUF_SPU_OGM             0x04060000
+ #define BUF_SPU_CMML            0x04070000
++#define BUF_SPU_KATE            0x04080000
+ /*@}*/
+ 
+ /**
+diff --git a/m4/decoders.m4 b/m4/decoders.m4
+index d8e3ac5..a91bf92 100644
+--- a/m4/decoders.m4
++++ b/m4/decoders.m4
+@@ -411,6 +411,36 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
+     AM_CONDITIONAL([ENABLE_VORBIS], [test x"$have_vorbis" = x"yes"])
+ 
+ 
++    dnl Ogg/Kate (optional; enabled by default; external)
++    AC_ARG_WITH([kate],
++                [AS_HELP_STRING([--with-kate], [Enable Kate overlay decoder support (default: enabled)])],
++                [test x"$withval" != x"no" && with_kate="yes"])
++    if test x"$with_kate" != x"no"; then
++        PKG_CHECK_MODULES([KATE], [ogg kate], [have_kate=yes], [have_kate=no])
++        if test x"$with_kate" = x"yes" && test x"$have_kate" = "xno"; then
++            AC_MSG_ERROR([Kate support requested, but libkate not found])
++        elif test x"$have_kate" = x"yes"; then
++            AC_DEFINE([HAVE_KATE], 1, [Define this if you have kate])
++        fi
++    fi
++    AM_CONDITIONAL([ENABLE_KATE], [test x"$have_kate" = x"yes"])
++
++
++    dnl Tiger renderer for Kate streams (optional; enabled by default; external)
++    AC_ARG_WITH([tiger],
++                [AS_HELP_STRING([--with-tiger], [Enable Tiger rendering for Kate streams (default: enabled)])],
++                [test x"$withval" != x"no" && with_tiger="yes"])
++    if test x"$with_tiger" != x"no"; then
++        PKG_CHECK_MODULES([TIGER], [tiger], [have_tiger=yes], [have_tiger=no])
++        if test x"$with_tiger" = x"yes" && test x"$have_tiger" = "xno"; then
++            AC_MSG_ERROR([Tiger support requested, but libtiger not found])
++        elif test x"$have_tiger" = x"yes"; then
++            AC_DEFINE([HAVE_TIGER], 1, [Define this if you have tiger])
++        fi
++    fi
++    AM_CONDITIONAL([ENABLE_TIGER], [test x"$have_tiger" = x"yes"])
++
++
+     dnl real (optional; enabled by default)
+     dnl On some systems, we cannot enable Real codecs support to begin with.
+     dnl This includes Darwin, because it uses Mach-O rather than ELF.
+diff --git a/m4/summary.m4 b/m4/summary.m4
+index 9437401..bf79d95 100644
+--- a/m4/summary.m4
++++ b/m4/summary.m4
+@@ -160,6 +160,13 @@ AC_DEFUN([XINE_LIB_SUMMARY], [
+     echo "   - spucmml         - sputext"
+     echo "   - spudvb"
+     test x"$have_dxr3" = x"yes" && echo "   - dxr3_spu"
++    if test x"$have_kate" = x"yes"; then
++        if test x"$have_tiger" = x"yes"; then
++            echo "   - Kate (with Tiger rendering)"
++        else
++            echo "   - Kate (basic rendering)"
++        fi
++    fi
+     echo ""
+ 
+     dnl post plugins
+diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
+index 92d49a3..b2c322d 100644
+--- a/src/combined/Makefile.am
++++ b/src/combined/Makefile.am
+@@ -64,3 +64,8 @@ xineplug_xiph_la_SOURCES += xine_speex_decoder.c
  xineplug_xiph_la_LIBADD += $(SPEEX_LIBS)
  xineplug_xiph_la_CFLAGS += $(SPEEX_CFLAGS)
  endif
 +
 +if ENABLE_KATE
-+xineplug_xiph_la_LIBADD += $(KATE_LIBS)
-+xineplug_xiph_la_CFLAGS += $(KATE_CFLAGS)
++xineplug_xiph_la_LIBADD += $(TIGER_LIBS) $(KATE_LIBS)
++xineplug_xiph_la_CFLAGS += $(TIGER_CFLAGS) $(KATE_CFLAGS)
 +endif
-diff -x xine-config -x configure.ac -x 'configure.h*' -x config.guess -x config.sub -x configure -x SlackBuild -x '*.m4' -x ltmain.sh -x libtool -x Makefile -x Makefile.in -ru xine-lib-1-2-767ccb7795a2/src/combined/xine_ogg_demuxer.c ../xine-lib-1-2-767ccb7795a2/src/combined/xine_ogg_demuxer.c
---- xine-lib-1-2-767ccb7795a2/src/combined/xine_ogg_demuxer.c	2008-07-17 16:50:59.000000000 +0100
-+++ ../xine-lib-1-2-767ccb7795a2/src/combined/xine_ogg_demuxer.c	2008-07-23 16:31:13.000000000 +0100
+diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
+index 036d2f0..65c0c15 100644
+--- a/src/combined/xine_ogg_demuxer.c
++++ b/src/combined/xine_ogg_demuxer.c
 @@ -53,6 +53,11 @@
  #include <theora/theora.h>
  #endif

     } else {
       lprintf("unknown codec\n");
     }
@@ -1473,7 +1532,12 @@
           this->num_audio_tracks++;
           break;
         case MATROSKA_TRACK_SUBTITLE:

 static void decode_flac_header (demux_ogg_t *this, const int stream_num, ogg_packet *op) {
   xine_flac_metadata_header header;
   xine_flac_streaminfo_block streaminfo = {};
@@ -1430,6 +1514,8 @@ static void send_header (demux_ogg_t *this) {
           decode_anxdata_header(this, stream_num, &op);
 	} else if (!memcmp (&op.packet[0], "CMML", 4)) {
 	  decode_cmml_header(this, stream_num, &op);
