From 43011c75f0356cfd7cf45d1507878e76e9e011cf Mon Sep 17 00:00:00 2001
From: corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 26 Sep 2006 23:43:21 +0000
Subject: [PATCH] vo_caca: use the pre-1.x compatibility layer so recent
 versions of libcaca still work.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19985 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure       | 3 +++
 libvo/vo_caca.c | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/configure b/configure
index b1acf18c60..e84d27f3dc 100755
--- a/configure
+++ b/configure
@@ -4172,6 +4172,9 @@ if test "$_caca" = auto ; then
   if ( caca-config --version ) >> "$TMPLOG" 2>&1 ; then
   cat > $TMPC << EOF
 #include <caca.h>
+#ifdef CACA_API_VERSION_1
+  #include <caca0.h>
+#endif
 int main(void) { (void) caca_init(); return 0; }
 EOF
   cc_check `caca-config --libs` && _caca=yes
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index 9e6b0a6c9d..74342f6cb1 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -28,6 +28,14 @@
 #include "mp_msg.h"
 
 #include <caca.h>
+#ifdef CACA_API_VERSION_1
+  /* Include the pre-1.x compatibility header.
+   * Once libcaca 1.x is widespread, vo_caca should be fully
+   * converted to the new API. A patch exists:
+   * http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-July/044674.html
+   */
+  #include <caca0.h>
+#endif
 
 static vo_info_t info = {
   "libcaca",