Mercurial > sdl-ios-xcode
diff src/video/directfb/SDL_DirectFB_video.c @ 1165:4fa705cdecb9
Date: Tue, 1 Nov 2005 02:51:09 +0000
From: Mike Frysinger <vapier@gentoo.org>
To: sdl@libsdl.org
Subject: Re: [SDL] libsdl needs some tweaks for DirectFB 0.9.23
On Fri, Oct 28, 2005 at 01:23:57AM +0000, Mike Frysinger wrote:
> the new release of DirectFB breaks the libsdl DirectRB video module
>
> specifically, this change:
> http://www.directfb.org/index.php/viewcvs.cgi/DirectFB/include/directfb.h.diff?r1=1.266&r2=1.267
>
> but (unless i missed something), it should be trivial to fix (just annoying)
> ... ive done so in Gentoo (also attached):
> http://viewcvs.gentoo.org/media-libs/libsdl/files/libsdl-1.2.9-DirectFB-updates.patch
hmm, i did miss something ... need to include directfb_version.h before trying
to test version defines :)
updated patch attached as well as previous URL
-mike
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Tue, 01 Nov 2005 04:18:08 +0000 |
| parents | f87f87efd45a |
| children | c9b51268668f |
line wrap: on
line diff
--- a/src/video/directfb/SDL_DirectFB_video.c Tue Nov 01 04:14:24 2005 +0000 +++ b/src/video/directfb/SDL_DirectFB_video.c Tue Nov 01 04:18:08 2005 +0000 @@ -40,6 +40,7 @@ #include <sys/mman.h> #include <directfb.h> +#include <directfb_version.h> #include "SDL.h" #include "SDL_error.h" @@ -376,7 +377,11 @@ { int i; DFBResult ret; +#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23) DFBCardCapabilities caps; +#else + DFBGraphicsDeviceDescription caps; +#endif DFBDisplayLayerConfig dlc; struct DirectFBEnumRect *rect; IDirectFB *dfb = NULL; @@ -448,7 +453,11 @@ /* Query card capabilities to get the video memory size */ +#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23) dfb->GetCardCapabilities (dfb, &caps); +#else + dfb->GetDeviceDescription (dfb, &caps); +#endif this->info.wm_available = 1; this->info.hw_available = 1;