debrix/hw/xorg/xf4bpp Makefile.am,1.1,1.2 vgamodule.c,1.2,1.3

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/xf4bpp
In directory pdx:/tmp/cvs-serv31934/hw/xorg/xf4bpp

Modified Files:
	Makefile.am vgamodule.c 
Log Message:
2004-06-29  Daniel Stone  <daniel at freedesktop.org>

	* configure.ac:
	Made CFLAGS a little less embarassingly large; fix it so the script
	actually runs and works fine (no more sed errors); remove XF86keysym.h
	check, which probably never actually worked. Get rid of INCLUDES;
	merge it into CFLAGS.

	* */Makefile.am:
	Sanitise INCLUDES/CFLAGS usage to radically decrease length of gcc
	lines.

	* include/Makefile.am:
	Make debrix.h depend on config.h, so they stay in sync. Oops.

	* hw/xorg/int10/xf86int10module.c:
	Change int10VersRec declaration from static, so debrixInit can see it.

	* hw/xorg/common/xf86KbdLnx.c:
	* hw/xorg/os-support/linux/lnx_KbdMap.c:
	Axe unused DECkeysym.h header dep.

	* hw/xorg/include/X11/extensions/Makefile.am:
	Finally fix the ext_HEADERS debacle.

	* hw/xorg/loader/dlloader.c:
	* hw/xorg/loader/loader.c:
	dlopen() NULL at startup, and include it in dlsym() searches, so we
	can find symbols included in the main binary with the standard module
	search.

	* hw/xorg/loader/loader.c:
	* hw/xorg/loader/loadmod.c:
	* hw/xorg/loader/xf86sym.c:
	* hw/xorg/common/xf86Init.c:
	Change loader API to introduce a new 'builtin' class, which doesn't
	actually load a module, but goes through all the motions; get rid of
	baseModules list for the time being (we don't want bitmap, and pcidata
	is already loaded). Explicitly add all ModuleData objects being loaded
	to xf86sym.c, so they don't get 'optimised' out.
	
	* hw/xorg/common/debrixInit.c:
	* hw/xorg/common/xf86Init.c:
	Add new debrixInit() function, which adds a few modules as builtins.

	* hw/xorg/loader/xf86sym.c:
	* hw/xorg/os-support/linux/Makefile.am:
	Re-enable a few missing os-support functions (xf86UDelay, xf86IODelay,
	xf86BusToMem, xf86MemToBus, xf86LoadKernelModule).

	* configure.ac:
	* fb/Makefile.am:
	* miext/shadow/Makefile.am:
	Make fb and shadow modular once more.

	* fb/fb.h:
	* render/filter.c:
	* render/picture.c:
	* include/picturestr.h:
	Rolled back to X.Org versions until I can figure out why pictures
	don't actually display in most cases.

	The following two are thanks to Jabuk Piotr C?apa.
	* os/xdmauth.c:
	"Xdmcp.h" -> <X11/Xdmcp.h>

	* hw/xorg/os-support/shared/drm/kernel/drm.h:
	Guard linux/config.h inclusion with #ifdef __KERNEL__.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf4bpp/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	10 Jun 2004 19:14:52 -0000	1.1
+++ Makefile.am	1 Jul 2004 17:49:50 -0000	1.2
@@ -41,10 +41,11 @@
         mfbbres.c \
         mfbbresd.c \
         mfbfillarc.c \
-        mfbzerarc.c
+        mfbzerarc.c \
+        vgamodule.c
 DISTCLEANFILES = mfbseg.c
 mfbseg.c:
 	echo "#define POLYSEGMENT" > $@
 	echo "#include \"mfbline.c\"" >> $@
 
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
+INCLUDES = -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb

Index: vgamodule.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf4bpp/vgamodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vgamodule.c	23 Apr 2004 19:54:17 -0000	1.2
+++ vgamodule.c	1 Jul 2004 17:49:50 -0000	1.3
@@ -25,12 +25,16 @@
  * XFree86 Project.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef XFree86LOADER
 #include "xf86Module.h"
 
 static MODULESETUPPROTO(xf4bppSetup);
 
-static XF86ModuleVersionInfo VersRec =
+XF86ModuleVersionInfo xf4bppVersRec =
 {
         "xf4bpp",
         MODULEVENDORSTRING,
@@ -44,7 +48,7 @@
         {0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData xf4bppModuleData = { &VersRec, xf4bppSetup, NULL };
+XF86ModuleData xf4bppModuleData = { &xf4bppVersRec, xf4bppSetup, NULL };
 
 static pointer
 xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)