 +    else
 +    {
 +        /* Normal text subs, easy markup */
-+        p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM;
++        p_spu->p_region->i_align = SUBPICTURE_ALIGN_BOTTOM;
 +        p_spu->i_x = 0;
 +        p_spu->i_y = 10;
 +    }

+dnl  kate decoder plugin
+dnl
+AC_ARG_ENABLE(kate,
+[  --enable-kate         kate codec (default disabled)])
+if test "${enable_kate}" = "yes"
+then
+  AC_CHECK_HEADERS(kate/kate.h kate/oggkate.h, [
+    AC_CHECK_LIB(oggkate, kate_ogg_decode_headerin, [
+      if test "${SYS}" = "mingw32"; then
+        VLC_ADD_PLUGINS([kate])
+      else
+        VLC_ADD_BUILTINS([kate])
+      fi
+      kate_libs="-loggkate -lkate -logg"
+      VLC_ADD_LDFLAGS([kate],[${kate_libs}]) ],[
+      AC_MSG_ERROR([libkate doesn't appear to be installed on your system.
+You also need to check that you have a libogg posterior to the 1.0 release.])],
+      [-lkate -logg])
+  ])
+fi
+
 
 dnl
 dnl  Video plugins
diff -x '*.o' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x version.c -x config.h.in -x Makefile.am -urN /tmp/vlc-0.8.6e/modules/LIST vlc-0.8.6e/modules/LIST
--- /tmp/vlc-0.8.6e/modules/LIST	2007-11-21 22:23:30.000000000 +0000
+++ vlc-0.8.6e/modules/LIST	2008-03-15 18:38:11.000000000 +0000
@@ -129,6 +129,7 @@
  * ipv4: IPv4 network abstraction layer
  * ipv6: IPv6 network abstraction layer
  * jack: jack server audio output
+ * kate: kate text bitstream decoder
  * libmpeg2: Mpeg2 video decoder using libmpeg2
  * linear_resampler: linear audio resampler
  * lirc: Linux infrared control module
diff -x '*.o' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x version.c -x config.h.in -x Makefile.am -urN /tmp/vlc-0.8.6e/modules/codec/Modules.am vlc-0.8.6e/modules/codec/Modules.am
--- /tmp/vlc-0.8.6e/modules/codec/Modules.am	2007-11-21 22:23:29.000000000 +0000
+++ vlc-0.8.6e/modules/codec/Modules.am	2008-03-15 18:38:11.000000000 +0000
@@ -29,3 +29,4 @@
 SOURCES_fake = fake.c
 SOURCES_realaudio = realaudio.c
 SOURCES_sdl_image = sdl_image.c
+SOURCES_kate = kate.c
diff -x '*.o' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x version.c -x config.h.in -x Makefile.am -urN /tmp/vlc-0.8.6e/modules/codec/kate.c vlc-0.8.6e/modules/codec/kate.c
--- /tmp/vlc-0.8.6e/modules/codec/kate.c	1970-01-01 01:00:00.000000000 +0100
+++ vlc-0.8.6e/modules/codec/kate.c	2008-03-16 21:20:16.000000000 +0000
@@ -0,0 +1,588 @@
+/*****************************************************************************
+ * kate.c : a decoder for the kate bitstream format
+ *****************************************************************************

         default:
             p_stream->b_force_backup = 0;
             break;
@@ -556,15 +567,21 @@
         /* Backup the ogg packet (likely an header packet) */
         p_stream->p_headers =
             realloc( p_stream->p_headers, p_stream->i_headers +
