Mercurial > mplayer.hg
changeset 19979:0dc175cbeed8
vo_caca: use the pre-1.x compatibility layer so recent
versions of libcaca still work.
| author | corey |
|---|---|
| date | Tue, 26 Sep 2006 23:43:21 +0000 |
| parents | f04afca36cf4 |
| children | fb106243f413 |
| files | configure libvo/vo_caca.c |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Sep 26 21:10:50 2006 +0000 +++ b/configure Tue Sep 26 23:43:21 2006 +0000 @@ -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
--- a/libvo/vo_caca.c Tue Sep 26 21:10:50 2006 +0000 +++ b/libvo/vo_caca.c Tue Sep 26 23:43:21 2006 +0000 @@ -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",