xserver: Branch 'master' - 3 commits
Alan Coopersmith
alanc at kemper.freedesktop.org
Mon Dec 1 16:51:42 PST 2008
hw/xfree86/common/xf86Configure.c | 27 +--------------------------
hw/xfree86/common/xf86RandR.c | 2 +-
hw/xfree86/doc/man/Xorg.man.pre | 6 +++---
hw/xfree86/doc/man/xorg.conf.man.pre | 7 +++----
4 files changed, 8 insertions(+), 34 deletions(-)
New commits:
commit 24c562f04b41d219c34f5fa3f963564accf329f2
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Mon Dec 1 16:28:45 2008 -0800
Update See Also lists in Xorg & xorg.conf man pages
Remove xorgconfig & xorgcfg
Update driver lists:
- Remove vga
- i810->intel
- via->openchrome
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index c1baefe..95f6311 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -577,7 +577,7 @@ Initial access control list for display
.IR n .
.SH "SEE ALSO"
X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
-__xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), xorgcfg(__appmansuffix__), xvidtune(__appmansuffix__),
+__xconfigfile__(__filemansuffix__), xvidtune(__appmansuffix__),
apm(__drivermansuffix__),
ati(__drivermansuffix__),
chips(__drivermansuffix__),
@@ -588,12 +588,13 @@ glide(__drivermansuffix__),
glint(__drivermansuffix__),
i128(__drivermansuffix__),
i740(__drivermansuffix__),
-i810(__drivermansuffix__),
imstt(__drivermansuffix__),
+intel(__drivermansuffix__),
mga(__drivermansuffix__),
neomagic(__drivermansuffix__),
nsc(__drivermansuffix__),
nv(__drivermansuffix__),
+openchrome (__drivermansuffix__),
r128(__drivermansuffix__),
rendition(__drivermansuffix__),
s3virge(__drivermansuffix__),
@@ -612,7 +613,6 @@ trident(__drivermansuffix__),
tseng(__drivermansuffix__),
v4l(__drivermansuffix__),
vesa(__drivermansuffix__),
-vga(__drivermansuffix__),
vmware(__drivermansuffix__),
.br
Web site
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 3baa7fb..d1a92d9 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -2162,7 +2162,7 @@ General:
.PP
Display drivers:
.BR apm (__drivermansuffix__),
-.\" .BR ati (__drivermansuffix__),
+.BR ati (__drivermansuffix__),
.BR chips (__drivermansuffix__),
.BR cirrus (__drivermansuffix__),
.BR cyrix (__drivermansuffix__),
@@ -2171,11 +2171,12 @@ Display drivers:
.BR glint (__drivermansuffix__),
.BR i128 (__drivermansuffix__),
.BR i740 (__drivermansuffix__),
-.BR i810 (__drivermansuffix__),
.BR imstt (__drivermansuffix__),
+.BR intel (__drivermansuffix__),
.BR mga (__drivermansuffix__),
.BR neomagic (__drivermansuffix__),
.BR nv (__drivermansuffix__),
+.BR openchrome (__drivermansuffix__),
.BR r128 (__drivermansuffix__),
.BR rendition (__drivermansuffix__),
.BR savage (__drivermansuffix__),
@@ -2194,8 +2195,6 @@ Display drivers:
.BR trident (__drivermansuffix__),
.BR tseng (__drivermansuffix__),
.BR vesa (__drivermansuffix__),
-.BR vga (__drivermansuffix__),
-.BR via (__drivermansuffix__),
.BR vmware (__drivermansuffix__).
.PP
Input drivers:
commit bd147e6f4b03f344c967c88fd433877b14fe1912
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Mon Dec 1 16:08:55 2008 -0800
Remove hack to only load font modules if magic strings appear in font path
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 819ad95..1430cda 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -481,12 +481,9 @@ static XF86ConfModulePtr
configureModuleSection (void)
{
char **elist, **el;
- /* Find the list of extension modules. */
+ /* Find the list of extension & font modules. */
const char *esubdirs[] = {
"extensions",
- NULL
- };
- const char *fsubdirs[] = {
"fonts",
NULL
};
@@ -505,28 +502,6 @@ configureModuleSection (void)
xfree(elist);
}
- /* Process list of font backends separately to include only required ones */
- elist = LoaderListDirs(fsubdirs, NULL);
- if (elist) {
- for (el = elist; *el; el++) {
- XF86LoadPtr module;
-
- module = xf86confcalloc(1, sizeof(XF86LoadRec));
- module->load_name = *el;
-
- /* Add only those font backends which are referenced by fontpath */
- /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
- if (defaultFontPath && (
- (strcmp(*el, "freetype") == 0 &&
- strstr(defaultFontPath, "/TTF")) ||
- (strcmp(*el, "type1") == 0 &&
- strstr(defaultFontPath, "/Type1"))))
- ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
- (glp)ptr->mod_load_lst, (glp)module);
- }
- xfree(elist);
- }
-
return ptr;
}
commit 5f3f14179edf48aad518f6f707bfdc37c27267c6
Author: Jay Cotton <jay.cotton at sun.com>
Date: Mon Dec 1 16:06:09 2008 -0800
Sun bug 6618220: Xorg server core dump in xf86RandRModeRefresh(NULL)
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6618220>
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 79d3017..2d1ec5d 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -74,7 +74,7 @@ xf86RandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
*rotations = RR_Rotate_0;
- for (mode = scrp->modes; ; mode = mode->next)
+ for (mode = scrp->modes; mode != NULL ; mode = mode->next)
{
int refresh = xf86RandRModeRefresh (mode);
More information about the xorg-commit
mailing list