24 # Except as contained in this notice, the name of a copyright holder |
24 # Except as contained in this notice, the name of a copyright holder |
25 # shall not be used in advertising or otherwise to promote the sale, use |
25 # shall not be used in advertising or otherwise to promote the sale, use |
26 # or other dealings in this Software without prior written authorization |
26 # or other dealings in this Software without prior written authorization |
27 # of the copyright holder. |
27 # of the copyright holder. |
28 |
28 |
29 diff -urp -x '*~' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c |
29 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c |
30 --- hw/xfree86/common/xf86Init.c 2006-12-21 10:50:46.000000000 -0800 |
30 --- hw/xfree86/common/xf86Init.c 2006-11-30 17:40:10.000000000 -0800 |
31 +++ hw/xfree86/common/xf86Init.c 2006-12-21 14:22:33.881433000 -0800 |
31 +++ hw/xfree86/common/xf86Init.c 2007-07-30 18:34:21.833819000 -0700 |
32 @@ -103,6 +103,7 @@ static void xf86PrintMarkers(void); |
32 @@ -103,6 +103,7 @@ static void xf86PrintMarkers(void); |
33 static void xf86PrintDefaultModulePath(void); |
33 static void xf86PrintDefaultModulePath(void); |
34 static void xf86PrintDefaultLibraryPath(void); |
34 static void xf86PrintDefaultLibraryPath(void); |
35 static void xf86RunVtInit(void); |
35 static void xf86RunVtInit(void); |
36 +static void sunLogInfo(void); |
36 +static void sunLogInfo(void); |
126 + } |
126 + } |
127 + fclose(pkginfo); |
127 + fclose(pkginfo); |
128 + } |
128 + } |
129 + } |
129 + } |
130 +} |
130 +} |
|
131 diff -urp -x '*~' -x '*.orig' hw/xfree86/loader/loadmod.c hw/xfree86/loader/loadmod.c |
|
132 --- hw/xfree86/loader/loadmod.c 2007-04-16 09:37:51.000000000 -0700 |
|
133 +++ hw/xfree86/loader/loadmod.c 2007-07-30 18:34:21.915061000 -0700 |
|
134 @@ -869,7 +869,7 @@ doLoadModule(const char *module, const c |
|
135 for (cim = compiled_in_modules; *cim; cim++) |
|
136 if (!strcmp (module, *cim)) |
|
137 { |
|
138 - xf86MsgVerb(X_INFO, 0, "Module already built-in\n"); |
|
139 + xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module); |
|
140 return (ModuleDescPtr) 1; |
|
141 } |
|
142 |
|
143 @@ -1310,6 +1310,15 @@ LoaderErrorMsg(const char *name, const c |
|
144 default: |
|
145 msg = "unknown error"; |
|
146 } |
|
147 +#ifdef SUNSOFT |
|
148 + /* We don't ship fbdev in Solaris, xtsol is only required on Trusted (TX) |
|
149 + systems, so it's not an error if either of them are not found */ |
|
150 + if ( (errmaj == LDR_NOENT) && |
|
151 + ((strcmp(modname, "xtsol") == 0) || (strcmp(modname, "fbdev") == 0))) |
|
152 + { |
|
153 + type = X_INFO; |
|
154 + } |
|
155 +#endif |
|
156 if (name) |
|
157 xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n", |
|
158 name, modname, msg, errmin); |