Mercurial > sdl-ios-xcode

comparison src/video/directfb/SDL_DirectFB_video.c @ 1165:4fa705cdecb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1164:10b3fb28c86b 1165:4fa705cdecb9
38 #include <fcntl.h> 38 #include <fcntl.h>
39 #include <unistd.h> 39 #include <unistd.h>
40 #include <sys/mman.h> 40 #include <sys/mman.h>
41 41
42 #include <directfb.h> 42 #include <directfb.h>
43 #include <directfb_version.h>
43 44
44 #include "SDL.h" 45 #include "SDL.h"
45 #include "SDL_error.h" 46 #include "SDL_error.h"
46 #include "SDL_video.h" 47 #include "SDL_video.h"
47 #include "SDL_mouse.h" 48 #include "SDL_mouse.h"
374 375
375 int DirectFB_VideoInit(_THIS, SDL_PixelFormat *vformat) 376 int DirectFB_VideoInit(_THIS, SDL_PixelFormat *vformat)
376 { 377 {
377 int i; 378 int i;
378 DFBResult ret; 379 DFBResult ret;
380 #if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23)
379 DFBCardCapabilities caps; 381 DFBCardCapabilities caps;
382 #else
383 DFBGraphicsDeviceDescription caps;
384 #endif
380 DFBDisplayLayerConfig dlc; 385 DFBDisplayLayerConfig dlc;
381 struct DirectFBEnumRect *rect; 386 struct DirectFBEnumRect *rect;
382 IDirectFB *dfb = NULL; 387 IDirectFB *dfb = NULL;
383 IDirectFBDisplayLayer *layer = NULL; 388 IDirectFBDisplayLayer *layer = NULL;
384 IDirectFBEventBuffer *events = NULL; 389 IDirectFBEventBuffer *events = NULL;
446 451
447 HIDDEN->modelist[i] = NULL; 452 HIDDEN->modelist[i] = NULL;
448 453
449 454
450 /* Query card capabilities to get the video memory size */ 455 /* Query card capabilities to get the video memory size */
456 #if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23)
451 dfb->GetCardCapabilities (dfb, &caps); 457 dfb->GetCardCapabilities (dfb, &caps);
458 #else
459 dfb->GetDeviceDescription (dfb, &caps);
460 #endif
452 461
453 this->info.wm_available = 1; 462 this->info.wm_available = 1;
454 this->info.hw_available = 1; 463 this->info.hw_available = 1;
455 this->info.blit_hw = 1; 464 this->info.blit_hw = 1;
456 this->info.blit_hw_CC = 1; 465 this->info.blit_hw_CC = 1;