frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore requests to load GLcore and speedo.

This commit is contained in:
Daniel Stone 2006-06-01 19:49:55 +00:00
parent 07c731a2bc
commit ee689c1042
5 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -31,6 +31,13 @@
Get rid of horrendous, somewhat misguided, DDX binary-compatibility Get rid of horrendous, somewhat misguided, DDX binary-compatibility
glue. glue.
* hw/xfree86/common/xf86Config.c:
* hw/xfree86/common/xf86Configure.c:
* parser/Module.c:
* parser/xf86Parser.c:
Ignore requests to load deprecated GLcore and speedo modules
(properly, this time).
2006-05-30 Matthieu Herrb <matthieu.herrb@laas.fr> 2006-05-30 Matthieu Herrb <matthieu.herrb@laas.fr>
* hw/xfree86/os-support/bsd/Makefile.am: * hw/xfree86/os-support/bsd/Makefile.am:

20
hw/xfree86/common/xf86Config.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.29 2006/05/25 23:32:33 reed Exp $ */ /* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.30 2006/05/29 11:14:02 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
@ -249,8 +249,9 @@ xf86ValidateFontPath(char *path)
char ** char **
xf86ModulelistFromConfig(pointer **optlist) xf86ModulelistFromConfig(pointer **optlist)
{ {
int count = 0; int count = 0, i = 0;
char **modulearray; char **modulearray;
char **ignore = { "GLcore", "speedo", NULL };
pointer *optarray; pointer *optarray;
XF86LoadPtr modp; XF86LoadPtr modp;
@ -271,7 +272,12 @@ xf86ModulelistFromConfig(pointer **optlist)
*/ */
modp = xf86configptr->conf_modules->mod_load_lst; modp = xf86configptr->conf_modules->mod_load_lst;
while (modp) { while (modp) {
count++; for (i = 0; ignore[i]; i++) {
if (strcmp(modp->load_name, ignore[i]) == 0)
modp->ignore = 1;
}
if (!modp->ignore)
count++;
modp = (XF86LoadPtr) modp->list.next; modp = (XF86LoadPtr) modp->list.next;
} }
} }
@ -287,9 +293,11 @@ xf86ModulelistFromConfig(pointer **optlist)
if (xf86configptr->conf_modules) { if (xf86configptr->conf_modules) {
modp = xf86configptr->conf_modules->mod_load_lst; modp = xf86configptr->conf_modules->mod_load_lst;
while (modp) { while (modp) {
modulearray[count] = modp->load_name; if (!modp->ignore) {
optarray[count] = modp->load_opt; modulearray[count] = modp->load_name;
count++; optarray[count] = modp->load_opt;
count++;
}
modp = (XF86LoadPtr) modp->list.next; modp = (XF86LoadPtr) modp->list.next;
} }
} }

6
hw/xfree86/common/xf86Configure.c
View File

@ -625,10 +625,8 @@ configureModuleSection (void)
module = xf86confmalloc(sizeof(XF86LoadRec)); module = xf86confmalloc(sizeof(XF86LoadRec));
memset((XF86LoadPtr)module,0,sizeof(XF86LoadRec)); memset((XF86LoadPtr)module,0,sizeof(XF86LoadRec));
module->load_name = *el; module->load_name = *el;
/* HACK, remove GLcore, glx, loads it as a submodule */ ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
if (strcmp(*el, "GLcore")) (glp)ptr->mod_load_lst, (glp)module);
ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
(glp)ptr->mod_load_lst, (glp)module);
} }
xfree(elist); xfree(elist);
} }

2
hw/xfree86/parser/Module.c
View File

@ -92,6 +92,7 @@ xf86parseModuleSubSection (XF86LoadPtr head, char *name)
ptr->load_name = name; ptr->load_name = name;
ptr->load_type = XF86_LOAD_MODULE; ptr->load_type = XF86_LOAD_MODULE;
ptr->ignore = 0;
ptr->load_opt = NULL; ptr->load_opt = NULL;
ptr->list.next = NULL; ptr->list.next = NULL;
@ -229,6 +230,7 @@ xf86addNewLoadDirective (XF86LoadPtr head, char *name, int type, XF86OptionPtr o
new->load_name = name; new->load_name = name;
new->load_type = type; new->load_type = type;
new->load_opt = opts; new->load_opt = opts;
new->ignore = 0;
new->list.next = NULL; new->list.next = NULL;
if ((token = xf86getToken(NULL)) == COMMENT) if ((token = xf86getToken(NULL)) == COMMENT)

1
hw/xfree86/parser/xf86Parser.h
View File

@ -91,6 +91,7 @@ typedef struct
char *load_name; char *load_name;
XF86OptionPtr load_opt; XF86OptionPtr load_opt;
char *load_comment; char *load_comment;
int ignore;
} }
XF86LoadRec, *XF86LoadPtr; XF86LoadRec, *XF86LoadPtr;