[MPlayer-cvslog] r19985 - in trunk: configure libvo/vo_caca.c

[corey]

Author: corey
Date: Wed Sep 27 01:43:21 2006
New Revision: 19985

Modified:
   trunk/configure
   trunk/libvo/vo_caca.c

Log:
vo_caca: use the pre-1.x compatibility layer so recent
versions of libcaca still work.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Sep 27 01:43:21 2006
@@ -4172,6 +4172,9 @@
   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

Modified: trunk/libvo/vo_caca.c
==============================================================================
--- trunk/libvo/vo_caca.c	(original)
+++ trunk/libvo/vo_caca.c	Wed Sep 27 01:43:21 2006
@@ -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",