On Friday 23 April 2004 19:59, Branden Robinson wrote:
> > Basically, it's a patch for the xfree86 source package generating a
> > XDirectFB binary. Only this binary is different from the ordinary
> > xserver-xfree86 installation.
>
> Er, uh, where's the patch?
Sorry, here. Taken from
http://directfb.org/download/XDirectFB/XDirectFB-1.0-rc5.tar.gz.
Micha
Index: config/cf/linux.cf
===================================================================
RCS file: /cvs/xc/config/cf/linux.cf,v
retrieving revision 3.203
diff -p -u -r3.203 linux.cf
--- config/cf/linux.cf 2003/04/24 22:14:53 3.203
+++ config/cf/linux.cf 2003/05/22 23:32:03
@@ -958,6 +958,8 @@ InstallNamedTargetNoClobber(install,file
#include <lnxLib.rules>
#ifdef KDriveXServer
# include <kdrive.cf>
+#elif defined (XDirectFBServer)
+# include <directfb.cf>
#else
# include <xfree86.cf>
#endif
Index: programs/Xserver/Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/Imakefile,v
retrieving revision 3.284
diff -p -u -r3.284 Imakefile
--- programs/Xserver/Imakefile 2003/05/14 05:27:53 3.284
+++ programs/Xserver/Imakefile 2003/05/22 23:32:04
@@ -488,6 +488,25 @@ ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),
#endif /* XhpServer */
+#if XDirectFBServer
+XCOMM
+XCOMM X DirectFB server
+XCOMM
+FBDIR = fb
+DIRECTFBDDXDIR = hw/directfb
+DIRECTFBDIRS = $(STDDIRS) $(FBDIR) $(DIRECTFBDDXDIR) $(DEPDIRS)
+DIRECTFBOBJS =
+DIRECTFBLIBS = PreFbLibs $(DIRECTFBDDXDIR)/LibraryTargetName(directfb) FbPostFbLibs
+DIRECTFBSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(XLIB) `directfb-config --libs`
+SetUIDServerTarget(XDirectFB,$(DIRECTFBDIRS),$(DIRECTFBOBJS), \
+ $(DIRECTFBLIBS),$(DIRECTFBSYSLIBS))
+
+#ifndef ServerToInstall
+#define ServerToInstall XDirectFB
+#endif
+#endif /* XDirectFBServer */
+
+
#if HasParallelMake
XCOMM
XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides
@@ -1339,7 +1358,7 @@ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(R
IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
$(HPDDXDIR) $(XFREE86DDXDIR) $(XWINDDXDIR) $(DARWINDDXDIR) \
- $(XVFBDDXDIR) $(XNESTDDXDIR)
+ $(DIRECTFBDDXDIR) $(XVFBDDXDIR) $(XNESTDDXDIR)
SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
$(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) \
$(XWINPARSERDIR)
Index: programs/Xserver/Xserver.man
===================================================================
RCS file: /cvs/xc/programs/Xserver/Xserver.man,v
retrieving revision 3.23
diff -p -u -r3.23 Xserver.man
--- programs/Xserver/Xserver.man 2003/04/14 20:37:17 3.23
+++ programs/Xserver/Xserver.man 2003/05/22 23:32:04
@@ -713,7 +713,7 @@ Controlling the server once started: \fI
.PP
Server-specific man pages:
\fIXdec\fP(1), \fIXmacII\fP(1), \fIXsun\fP(1), \fIXnest\fP(1),
-\fIXvfb\fP(1), \fIXFree86\fP(1), \fIXDarwin\fP(1).
+\fIXvfb\fP(1), \fIXFree86\fP(1), \fIXDarwin\fP(1), \fIXDirectFB\fP(1).
.PP
Server internal documentation:
.I "Definition of the Porting Layer for the X v11 Sample Server"
Index: programs/Xserver/fb/fbcmap.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/fb/fbcmap.c,v
retrieving revision 1.6
diff -p -u -r1.6 fbcmap.c
--- programs/Xserver/fb/fbcmap.c 2001/10/28 03:33:08 1.6
+++ programs/Xserver/fb/fbcmap.c 2003/05/22 23:32:04
@@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "resource.h"
#include "fb.h"
-#ifndef XFree86Server
+#if !defined(XFree86Server) && !defined(DIRECTFBSERVER)
ColormapPtr FbInstalledMaps[MAXSCREENS];
int
