porting XDirectFB to Xorg 7.1

[Ville Syrjälä]

On Tue, Sep 12, 2006 at 09:54:48PM +0200, Denis Oliver Kropp wrote:
> Ville Syrjälä schrieb:
> >>>I started (with Xorg 7.0) by getting XDirectFB to build against
> >>>xorg-server 1.0.2. Unfrtunately getting it to build wasn't enough
> >>>to make it work. Things go bad somewhere in the fb code when starting
> >>>gnome, twm+xterm almost worked but the colors were all wrong.
> 
> Maybe you didn't bring over this one?
> 
> 
> diff -ur programs/Xserver/fb/fbcmap.c programs/Xserver/fb/fbcmap.c
> --- programs/Xserver/fb/fbcmap.c        2005-03-01 21:14:18.000000000 +0200
> +++ programs/Xserver/fb/fbcmap.c        2005-03-01 21:29:33.000000000 +0200
> @@ -37,7 +37,7 @@
>  #include "resource.h"
>  #include "fb.h"
> 
> -#ifndef XFree86Server
> +#if !defined(XFree86Server) && !defined(DIRECTFBSERVER)
>  ColormapPtr FbInstalledMaps[MAXSCREENS];
> 
>  int

Yes, I missed that one. Actually I just assumed the ifdef was removed 
because the file is not included in libfb.a. That fixed the colors and 
gnome now starts. Thanks!

It's still not perfect though. Some programs don't want to start and 
others exit at various stages. gnome-terminal, for example, gets a 
BadRequest on startup.

-- 
Ville Syrjälä
syrjala at sci.fi
http://www.sci.fi/~syrjala/