Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.524 diff -u -p -r1.524 configure --- configure 23 Jul 2002 15:13:00 -0000 1.524 +++ configure 26 Jul 2002 13:18:35 -0000 @@ -2052,6 +2052,21 @@ else fi echores "$_directfb0911" fi +if test "$_directfb" = yes; then +echocheck "DirectFB >= 0.9.13" + _directfb0913=no + cat > $TMPC < +int main(void) { DFBDisplayLayerDescription foo; return foo.type; } +EOF + cc_check $_inc_directfb -ldirectfb && _directfb0913=yes +if test "$_directfb0913" = yes ; then + _def_directfb0913='#define HAVE_DIRECTFB0913 1' +else + _def_directfb0913='#undef HAVE_DIRECTFB0913' +fi +echores "$_directfb0913" +fi echocheck "X11 headers presence" @@ -4525,6 +4540,7 @@ $_def_directfb $_def_directfb099 $_def_directfb0910 $_def_directfb0911 +$_def_directfb0913 $_def_zr $_def_mga $_def_xmga Index: libvo/vo_directfb.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v retrieving revision 1.20 diff -u -p -r1.20 vo_directfb.c --- libvo/vo_directfb.c 12 Jul 2002 10:27:08 -0000 1.20 +++ libvo/vo_directfb.c 26 Jul 2002 13:18:35 -0000 @@ -222,10 +222,18 @@ return DFENUM_OK; } +#ifdef HAVE_DIRECTFB0913 +DFBEnumerationResult enum_layers_callback( DFBDisplayLayerID id, + DFBDisplayLayerDescription desc, + void *data ) +{ + DFBDisplayLayerCapabilities caps = desc.caps; +#else DFBEnumerationResult enum_layers_callback( unsigned int id, DFBDisplayLayerCapabilities caps, void *data ) { +#endif IDirectFBDisplayLayer **layer = (IDirectFBDisplayLayer **)data; if (verbose) { printf("\nDirectFB: Layer %d:\n", id ); @@ -421,7 +429,13 @@ if (verbose) printf("DirectFB: Preinit e // test for color caps { DFBDisplayLayerCapabilities caps; +#ifdef HAVE_DIRECTFB0913 + DFBDisplayLayerDescription desc; + videolayer->GetDescription(videolayer,&desc); + caps = desc.caps; +#else videolayer->GetCapabilities(videolayer,&caps); +#endif if (caps & DLCAPS_BRIGHTNESS) { videolayercaps.brightness=1; } else {