On Thu, Jan 08, 2004 at 10:56:57AM +0900, Bang Jun-Young wrote:
> Hi,
>
> The current vesa driver has hardcoded dependency on afb. As a result,
> removing afb/ from the tree (and support for it as well) causes vesa
> build to fail. The following patch fixes it:
Including Imakefile and vesa.c as well:
Index: Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile,v
retrieving revision 1.7
diff -u -r1.7 Imakefile
--- Imakefile 21 Apr 2003 12:32:12 -0000 1.7
+++ Imakefile 8 Jan 2004 13:56:28 -0000
@@ -7,12 +7,16 @@
OBJS = vesa.o
+#if XF86AFB
+AFBSRC = $(SERVERSRC)/afb
+#endif
+
#if defined(XF86DriverSDK)
INCLUDES = -I. -I../../include
#else
INCLUDES = -I. -I$(SERVERSRC)/fb -I$(XF86SRC)/xf4bpp -I$(XF86SRC)/xf1bpp \
-I$(XF86SRC)/xf24_32bpp \
- -I$(SERVERSRC)/mfb -I$(SERVERSRC)/afb -I$(SERVERSRC)/mi \
+ -I$(SERVERSRC)/mfb -I$(AFBSRC) -I$(SERVERSRC)/mi \
-I$(SERVERSRC)/miext/shadow -I$(SERVERSRC)/render \
-I$(XF86SRC)/vgahw \
-I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \
Index: vesa.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v
retrieving revision 1.41
diff -u -r1.41 vesa.c
--- vesa.c 7 Nov 2003 22:50:57 -0000 1.41
+++ vesa.c 8 Jan 2004 13:56:28 -0000
@@ -152,7 +152,9 @@
static const char *miscfbSymbols[] = {
"xf1bppScreenInit",
"xf4bppScreenInit",
+#ifdef USE_AFB
"afbScreenInit",
+#endif
"mfbScreenInit",
NULL
};
Index: vesa.h
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v
retrieving revision 1.14
diff -u -r1.14 vesa.h
--- vesa.h 16 Jan 2003 16:09:10 -0000 1.14
+++ vesa.h 8 Jan 2004 13:56:28 -0000
@@ -73,7 +73,9 @@
#include "xf1bpp.h"
#include "xf4bpp.h"
#include "fb.h"
+#ifdef USE_AFB
#include "afb.h"
+#endif
#include "mfb.h"
#include "cfb24_32.h"
--
Bang Jun-Young <[EMAIL PROTECTED]>
_______________________________________________
Devel mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/devel
