--- xine-ui-0.99.4/m4/caca.m4.orig	2004-02-28 21:06:37.000000000 +0100
+++ xine-ui-0.99.4/m4/caca.m4	2006-12-24 10:53:37.213851861 +0100
@@ -56,9 +56,9 @@
       CACA_CFLAGS=`$CACA_CONFIG $caca_config_args --cflags`
       CACA_LIBS=`$CACA_CONFIG $caca_config_args --plugin-libs`
       caca_major_version=`$CACA_CONFIG $caca_config_args --version | \
-             sed 's/\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+             sed 's/^\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
       caca_minor_version=`$CACA_CONFIG $caca_config_args --version | \
-             sed 's/\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+             sed 's/^\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
 
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
--- xine-ui-0.99.4/src/aaui/main.c.orig	2004-12-12 22:57:10.000000000 +0100
+++ xine-ui-0.99.4/src/aaui/main.c	2006-12-24 11:33:55.575666444 +0100
@@ -64,6 +64,9 @@
 
 #ifdef CACA
 #  include <caca.h>
+#  ifdef CACA_API_VERSION_1
+#    include <caca0.h>
+#  endif
 #endif
 
 /* Sound mixer capabilities */