Hello all,

Please find attached my modifications to XDirectFB for:

- more robust font support
- missing stanza in the Imakefile for the XDirectFB server which were
  preventing the XDirectFB server from being rebuilt properly

With these patches, I was able to easily patch my vendor's (Mandrake)
XFree86 RPM SPEC file to build the XDirectFB server in addition to the
standard XFree86 server.  I even used their host.def with only 1
modification (BuildXF86MiscExt changed from YES to NO) and I got an
XDirectFB that I could directly substitute for their XFree86 server.
It suppoorted all of the advancements that Mandrake have put into
their XFree68 packages, most notibly the leading edge font
technologies.

Cheers!
b.

-- 
Brian J. Murrell
? this.diff
Index: xc-directfb.diff
===================================================================
RCS file: /cvs/directfb/XDirectFB/xc-directfb.diff,v
retrieving revision 1.6
diff -u -r1.6 xc-directfb.diff
--- xc-directfb.diff    27 Dec 2002 04:47:52 -0000      1.6
+++ xc-directfb.diff    6 Jan 2003 14:30:39 -0000
@@ -21,7 +21,7 @@
 diff -u -r3.275 Imakefile
 --- programs/Xserver/Imakefile 2002/12/21 00:19:11     3.275
 +++ programs/Xserver/Imakefile 2002/12/27 04:45:11
-@@ -520,6 +520,27 @@
+@@ -520,6 +520,29 @@
  #endif        /* XhpServer */
  
  
@@ -35,8 +35,10 @@
 +DIRECTFBOBJS = 
 +DIRECTFBLIBS = PreFbLibs $(DIRECTFBDDXDIR)/LibraryTargetName(directfb) FbPostFbLibs
 +DIRECTFBSYSLIBS = $(FONTLIBS) $(SYSLIBS) `directfb-config --libs`
-+
-+
++#if ForceServerRemake
++$(DIRECTFBOBJS) $(DIRECTFBLIBS) $(DIRECTFBSYSLIBS):: all.subdirs
++      @if [ -f $@ ]; then touch $@; fi
++#endif
 +SetUIDServerTarget(XDirectFB,$(DIRECTFBDIRS),$(DIRECTFBOBJS), \
 +      $(DIRECTFBLIBS),$(DIRECTFBSYSLIBS))
 +
Index: config/cf/directfb.cf
===================================================================
RCS file: /cvs/directfb/XDirectFB/config/cf/directfb.cf,v
retrieving revision 1.7
diff -u -r1.7 directfb.cf
--- config/cf/directfb.cf       20 Aug 2002 18:06:07 -0000      1.7
+++ config/cf/directfb.cf       6 Jan 2003 14:30:39 -0000
@@ -57,19 +57,19 @@
 #endif
 
 #ifndef BuildSpeedo
-#define BuildSpeedo            NO
+#define BuildSpeedo            YES
 #endif
 
 #ifndef BuildType1
-#define BuildType1             NO
+#define BuildType1             YES
 #endif
 
 #ifndef BuildCID
-#define BuildCID               NO
+#define BuildCID               YES
 #endif
 
 #ifndef BuildFreeType
-#define BuildFreeType          NO
+#define BuildFreeType          YES
 #endif
 
 #ifndef BuildBuiltinFonts
@@ -116,6 +116,10 @@
 
 #ifndef BuildXKB
 #define BuildXKB               YES
+#endif
+
+#ifndef BuildXKBlib
+#define BuildXKBlib            YES
 #endif
 
 #ifndef BuildXIE

Attachment: msg01268/pgp00000.pgp
Description: PGP signature

Reply via email to