changeset 32167:41c11d96b5db

Require DirectFB version 0.9.15 instead of 0.9.13. This simplifies the build system at the cost of requiring a library version that was released at the end rather than the middle of 2002.

--- a/DOCS/xml/en/install.xml	Wed Sep 15 09:25:20 2010 +0000
+++ b/DOCS/xml/en/install.xml	Wed Sep 15 15:58:48 2010 +0000
@@ -66,8 +66,8 @@
   required for the optional PNG video output driver
 </para></listitem>
 <listitem><para>
-  <emphasis role="bold">directfb</emphasis> - optional, 0.9.13 or later
-  required for the directfb video output driver
+  <emphasis role="bold">directfb</emphasis> - optional, 0.9.15 or later
+  required for the directfb/dfbmga video output drivers
 </para></listitem>
 <listitem><para>
   <emphasis role="bold">lame</emphasis> - 3.90 or later is recommended,

--- a/Makefile	Wed Sep 15 09:25:20 2010 +0000
+++ b/Makefile	Wed Sep 15 15:58:48 2010 +0000
@@ -537,10 +537,9 @@
 SRCS_MPLAYER-$(COREAUDIO)    += libao2/ao_coreaudio.c
 SRCS_MPLAYER-$(COREVIDEO)    += libvo/vo_corevideo.m libvo/osx_common.c
 SRCS_MPLAYER-$(DART)         += libao2/ao_dart.c
-SRCS_MPLAYER-$(DFBMGA)       += libvo/vo_dfbmga.c
 SRCS_MPLAYER-$(DGA)          += libvo/vo_dga.c
 SRCS_MPLAYER-$(DIRECT3D)     += libvo/vo_direct3d.c libvo/w32_common.c
-SRCS_MPLAYER-$(DIRECTFB)     += libvo/vo_directfb2.c
+SRCS_MPLAYER-$(DIRECTFB)     += libvo/vo_directfb2.c libvo/vo_dfbmga.c
 SRCS_MPLAYER-$(DIRECTX)      += libao2/ao_dsound.c libvo/vo_directx.c
 SRCS_MPLAYER-$(DXR2)         += libao2/ao_dxr2.c libvo/vo_dxr2.c
 SRCS_MPLAYER-$(DXR3)         += libvo/vo_dxr3.c

--- a/configure	Wed Sep 15 09:25:20 2010 +0000
+++ b/configure	Wed Sep 15 15:58:48 2010 +0000
@@ -4281,14 +4281,13 @@
     _dfb_minor=$(echo $_directfb_version | cut -d . -f 2)
     _dfb_micro=$(echo $_directfb_version | cut -d . -f 3)
     _dfb_version=$(dfb_version $_dfb_major $_dfb_minor $_dfb_micro)
-    if test "$_dfb_version" -ge $(dfb_version 0 9 13); then
+    if test "$_dfb_version" -ge $(dfb_version 0 9 15); then
       def_directfb_version="#define DIRECTFBVERSION $_dfb_version"
       res_comment="$_directfb_version"
-      test "$_dfb_version" -ge $(dfb_version 0 9 15) && _dfbmga=yes
     else
       def_directfb_version='#undef DIRECTFBVERSION'
       _directfb=no
-      res_comment="version >=0.9.13 required"
+      res_comment="version >=0.9.15 required"
     fi
   else
     _directfb=no
@@ -4299,18 +4298,11 @@
 
 if test "$_directfb" = yes ; then
   def_directfb='#define CONFIG_DIRECTFB 1'
-  vomodules="directfb $vomodules"
+  vomodules="directfb dfbmga $vomodules"
   libs_mplayer="$libs_mplayer -ldirectfb"
 else
   def_directfb='#undef CONFIG_DIRECTFB'
-  novomodules="directfb $novomodules"
-fi
-if test "$_dfbmga" = yes; then
-  vomodules="dfbmga $vomodules"
-  def_dfbmga='#define CONFIG_DFBMGA 1'
-else
-  novomodules="dfbmga $novomodules"
-  def_dfbmga='#undef CONFIG_DFBMGA'
+  novomodules="directfb dfbmga $novomodules"
 fi
 
 
@@ -8280,7 +8272,6 @@
 COREAUDIO = $_coreaudio
 COREVIDEO = $_corevideo
 DART = $_dart
-DFBMGA = $_dfbmga
 DGA = $_dga
 DIRECT3D = $_direct3d
 DIRECTFB = $_directfb
@@ -8814,7 +8805,6 @@
 $def_bl
 $def_caca
 $def_corevideo
-$def_dfbmga
 $def_dga
 $def_dga1
 $def_dga2

--- a/libvo/video_out.c	Wed Sep 15 09:25:20 2010 +0000
+++ b/libvo/video_out.c	Wed Sep 15 15:58:48 2010 +0000
@@ -250,8 +250,6 @@
 #endif
 #ifdef CONFIG_DIRECTFB
         &video_out_directfb,
-#endif
-#ifdef CONFIG_DFBMGA
         &video_out_dfbmga,
 #endif
 #ifdef CONFIG_VIDIX

--- a/libvo/vo_directfb2.c	Wed Sep 15 09:25:20 2010 +0000
+++ b/libvo/vo_directfb2.c	Wed Sep 15 15:58:48 2010 +0000
@@ -57,7 +57,7 @@
 	"Direct Framebuffer Device",
 	"directfb",
 	"Jiri Svoboda [e-mail]",
-	"v 2.0 (for DirectFB version >=0.9.13)"
+	"v 2.0 (for DirectFB version >=0.9.15)"
 };
 
 const LIBVO_EXTERN(directfb)
@@ -242,7 +242,7 @@
 
 	if (((directfb_major_version <= 0) &&
 	    (directfb_minor_version <= 9) &&
-	    (directfb_micro_version < 13)))
+	    (directfb_micro_version < 15)))
 	{
 	    mp_msg(MSGT_VO, MSGL_ERR,"DirectFB: Unsupported DirectFB version\n");
 	    return 1;
@@ -570,7 +570,6 @@
 	} // vm end
 
 // just to be sure clear primary layer
-#if DIRECTFBVERSION > DFB_VERSION(0,9,13)
         ret = dfb->GetDisplayLayer( dfb, DLID_PRIMARY, &layer);
 	if (ret==DFB_OK) {
 	    ret = layer->GetSurface(layer,&primary);
@@ -586,7 +585,6 @@
         layer->Release(layer);
 	}
 	layer=NULL;
-#endif
 
 // find best layer
 
@@ -796,9 +794,7 @@
 
 // test surface for flipping
 	DFBCHECK(primary->GetCapabilities(primary,&caps));
-#if DIRECTFBVERSION > DFB_VERSION(0,9,13)
 	primary->Clear(primary,0,0,0,0xff);
-#endif
         flipping = 0;
 	if (caps & (DSCAPS_FLIPPING
 #ifdef TRIPLE
@@ -808,7 +804,6 @@
 	    ret = primary->Flip(primary,NULL,0);
 	    if (ret==DFB_OK) {
 		flipping = 1;
-#if DIRECTFBVERSION > DFB_VERSION(0,9,13)
 		primary->Clear(primary,0,0,0,0xff);
 #ifdef TRIPLE
 // if we have 3 buffers clean once more
@@ -818,7 +813,6 @@
 		flipping = 2;
 	}
 #endif
-#endif
 	    }
 	};