debrix/include Makefile.am, 1.2, 1.3 config.h.in, 1.2, 1.3 picturestr.h, 1.2, 1.3

Committed by: daniel

Update of /cvs/xserver/debrix/include
In directory pdx:/tmp/cvs-serv31934/include

Modified Files:
	Makefile.am config.h.in picturestr.h 
Log Message:
2004-06-29  Daniel Stone  <[email protected]>

	* 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/include/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	13 Jun 2004 03:05:56 -0000	1.2
+++ Makefile.am	1 Jul 2004 17:49:50 -0000	1.3
@@ -51,7 +51,7 @@
 
 EXTRA_DIST = $(sdk_HEADERS) config.h
 
-debrix.h:
+debrix.h: config.h
 	cp config.h $@
 
 DISTCLEANFILES = debrix.h

Index: config.h.in
===================================================================
RCS file: /cvs/xserver/debrix/include/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.h.in	16 Jun 2004 00:25:30 -0000	1.2
+++ config.h.in	1 Jul 2004 17:49:50 -0000	1.3
@@ -20,12 +20,12 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Support Damage extension */
-#undef DAMAGEEXT
-
 /* Use OsVendorInit */
 #undef DDXOSINIT
 
+/* Build Debrix server */
+#undef DEBRIX
+
 /* Build DPMS extension */
 #undef DPMSExtension
 
@@ -174,9 +174,6 @@
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
-/* Define to 1 if you have the <X11/XF86keysym.h> header file. */
-#undef HAVE_X11_XF86KEYSYM_H
-
 /* Built-in input drivers */
 #undef IDRIVERS
 
@@ -297,9 +294,6 @@
 /* Support XFree86 Video Mode extension */
 #undef XF86VIDMODE
 
-/* Support XFixes extension */
-#undef XFIXES
-
 /* Building XFree86 loader */
 #undef XFree86LOADER
 
@@ -333,6 +327,9 @@
 /* Current Xorg version */
 #undef XORG_VERSION_CURRENT
 
+/* Build XRes extension */
+#undef XResExtension
+
 /* Support XSync extension */
 #undef XSYNC
 

Index: picturestr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/picturestr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- picturestr.h	12 Jun 2004 15:18:54 -0000	1.2
+++ picturestr.h	1 Jul 2004 17:49:50 -0000	1.3
@@ -1,5 +1,6 @@
+/* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.2 2004/04/23 19:54:29 eich Exp $ */
 /*
- * $Id$
+ * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.21 2002/11/06 22:45:36 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -38,7 +39,7 @@
 } DirectFormatRec;
 
 typedef struct _IndexFormat {
-    VisualID	    vid;
+    VisualPtr	    pVisual;
     ColormapPtr	    pColormap;
     int		    nvalues;
     xIndexValue	    *pValues;
@@ -102,12 +103,11 @@
     int		    filter_nparams;
 } PictureRec;
 
-typedef Bool (*PictFilterValidateParamsProcPtr) (PicturePtr pPicture, int id,
-						 xFixed *params, int nparams);
 typedef struct {
-    char			    *name;
-    int				    id;
-    PictFilterValidateParamsProcPtr ValidateParams;
+    char	    *name;
+    xFixed	    *params;
+    int		    nparams;
+    int		    id;
 } PictFilterRec, *PictFilterPtr;
 
 #define PictFilterNearest	0
@@ -340,9 +340,7 @@
 PictureGetFilterName (int id);
 
 int
-PictureAddFilter (ScreenPtr			    pScreen,
-		  char				    *filter,
-		  PictFilterValidateParamsProcPtr   ValidateParams);
+PictureAddFilter (ScreenPtr pScreen, char *filter, xFixed *params, int nparams);
 
 Bool
 PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias);
@@ -398,12 +396,6 @@
 		     xRectangle	*rects);
 
 int
-SetPictureClipRegion (PicturePtr    pPicture,
-		      int	    xOrigin,
-		      int	    yOrigin,
-		      RegionPtr	    pRegion);
-
-int
 SetPictureTransform (PicturePtr	    pPicture,
 		     PictTransform  *transform);
 		     
@@ -502,7 +494,7 @@
 int
 AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor);
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 void PanoramiXRenderInit (void);
 void PanoramiXRenderReset (void);
 #endif