# HG changeset patch
# User atmos4
# Date 1020025206 0
# Node ID f3283d1c7e4146fb21c7c6056b51106684ce7320
# Parent  111d2406a87a29b06e0fb52ea7e651717021f388
DFB 0.9.10 update patch by Jiri.

diff -r 111d2406a87a -r f3283d1c7e41 configure
--- a/configure	Sun Apr 28 17:48:45 2002 +0000
+++ b/configure	Sun Apr 28 20:20:06 2002 +0000
@@ -1858,6 +1858,21 @@
 fi
 echores "$_directfb099"
 fi
+if test "$_directfb" = yes; then
+echocheck "DirectFB >= 0.9.10"
+  _directfb0910=no
+  cat > $TMPC <<EOF
+#include <directfb.h>
+int main(void) { DFBDisplayLayerCapabilities  caps=DLCAPS_DST_COLORKEY; return 0; }
+EOF
+  cc_check -ldirectfb && _directfb0910=yes
+if test "$_directfb0910" = yes ; then
+  _def_directfb0910='#define HAVE_DIRECTFB0910 1'
+else
+  _def_directfb0910='#undef HAVE_DIRECTFB0910'
+fi
+echores "$_directfb0910"
+fi
 echocheck "X11"
 if test "$_x11" = auto || test "$_x11" = yes ; then
   cat > $TMPC <<EOF
@@ -4008,6 +4023,7 @@
 $_def_tdfxfb
 $_def_directfb
 $_def_directfb099
+$_def_directfb0910
 $_def_zr
 $_def_mga
 $_def_xmga
diff -r 111d2406a87a -r f3283d1c7e41 libvo/vo_directfb.c
--- a/libvo/vo_directfb.c	Sun Apr 28 17:48:45 2002 +0000
+++ b/libvo/vo_directfb.c	Sun Apr 28 20:20:06 2002 +0000
@@ -224,8 +224,16 @@
      if (caps & DLCAPS_ALPHACHANNEL)
           printf( "  - Supports blending based on alpha channel.\n" );
 
+#ifdef HAVE_DIRECTFB0910
+     if (caps & DLCAPS_SRC_COLORKEY)
+          printf( "  - Supports source based color keying.\n" );
+
+     if (caps & DLCAPS_DST_COLORKEY)
+          printf( "  - Supports destination based color keying.\n" );
+#else
      if (caps & DLCAPS_COLORKEYING)
           printf( "  - Supports color keying.\n" );
+#endif
 
      if (caps & DLCAPS_FLICKER_FILTERING)
           printf( "  - Supports flicker filtering.\n" );
@@ -289,10 +297,10 @@
     	    DFBCHECK (DirectFBSetOption ("fbdev",fb_dev_name));
 	}
 
-	// disable YV12 for dfb 0.9.9 - there is a bug in dfb!
+	// disable YV12 for dfb until 0.9.10 - there is a bug in dfb! should be revised with every dfb version until bug is fixed in dfb.
 	if ((directfb_major_version <= 0) &&
 	    (directfb_minor_version <= 9) &&
-	    (directfb_micro_version <= 9)) {
+	    (directfb_micro_version <= 10)) {
 	    buggyYV12BitBlt=1;
 	    if (verbose) printf("DirectFB: Buggy YV12BitBlt!\n");
 	}