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

Redact a few mentions of speedo font support.

This commit is contained in:
Adam Jackson 2006-05-03 17:50:10 +00:00
parent b9a9cf6185
commit fc91ca069d
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-05-03 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Configure.c:
* hw/xfree86/utils/xorgcfg/text-mode.c:
* hw/xfree86/utils/xorgconfig/xorgconfig.c:
Redact a few mentions of speedo font support.
2006-05-02 Matthieu Herrb <matthieu.herrb@laas.fr> 2006-05-02 Matthieu Herrb <matthieu.herrb@laas.fr>
* render/mitri.c: * render/mitri.c:

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

@ -649,9 +649,7 @@ configureModuleSection (void)
(strcmp(*el, "freetype") == 0 && (strcmp(*el, "freetype") == 0 &&
strstr(defaultFontPath, "/TTF")) || strstr(defaultFontPath, "/TTF")) ||
(strcmp(*el, "type1") == 0 && (strcmp(*el, "type1") == 0 &&
strstr(defaultFontPath, "/Type1")) || strstr(defaultFontPath, "/Type1"))))
(strcmp(*el, "speedo") == 0 &&
strstr(defaultFontPath, "/Speedo"))))
ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem( ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
(glp)ptr->mod_load_lst, (glp)module); (glp)ptr->mod_load_lst, (glp)module);
} }

4
hw/xfree86/utils/xorgcfg/text-mode.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.6 2005/12/08 17:54:40 kem Exp $ */ /* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.7 2006/04/18 17:28:44 spyderous Exp $ */
/* /*
* Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
* *
@ -321,7 +321,7 @@ WriteXF86Config(void)
if (newconfig) { if (newconfig) {
if (XF86Config->conf_modules == NULL) { if (XF86Config->conf_modules == NULL) {
static char *modules[] = {"extmod", "glx", "dri", "dbe", static char *modules[] = {"extmod", "glx", "dri", "dbe",
"record", "xtrap", "type1", "speedo"}; "record", "xtrap", "type1"};
XF86LoadPtr load; XF86LoadPtr load;
int i; int i;

12
hw/xfree86/utils/xorgconfig/xorgconfig.c
View File

@ -87,14 +87,13 @@
* - Fix seg.fault problem on Solaris. * - Fix seg.fault problem on Solaris.
* - Add modestring "1400x1050"(for ATI Mobile-Rage). * - Add modestring "1400x1050"(for ATI Mobile-Rage).
* - Add videomemory 8192, 16384, 32768, 65536, 131072 and 262144. * - Add videomemory 8192, 16384, 32768, 65536, 131072 and 262144.
* - Load "speedo" module.
* - Ready to DRI. * - Ready to DRI.
* - Load xtt module instead of freetype module. * - Load xtt module instead of freetype module.
* - Add font path "/TrueType/" and "/freefont/". * - Add font path "/TrueType/" and "/freefont/".
* Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
*/ */
/* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.19 2005/11/08 06:33:30 jkj Exp $ */ /* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.20 2006/04/18 17:28:44 spyderous Exp $ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "xorg-server.h" # include "xorg-server.h"
@ -1948,11 +1947,6 @@ static char *XF86Config_firstchunk_text =
#else #else
"# Load \"type1\"\n" "# Load \"type1\"\n"
#endif #endif
#ifdef HAS_SPEEDO
" Load \"speedo\"\n"
#else
"# Load \"speedo\"\n"
#endif
" Load \"freetype\"\n" " Load \"freetype\"\n"
"# Load \"xtt\"\n" "# Load \"xtt\"\n"
"\n" "\n"
@ -1981,8 +1975,8 @@ static char *XF86Config_firstchunk_text =
"# \n" "# \n"
#if 0 #if 0
"# If you don't have a floating point coprocessor and emacs, Mosaic or other\n" "# If you don't have a floating point coprocessor and emacs, Mosaic or other\n"
"# programs take long to start up, try moving the Type1 and Speedo directory\n" "# programs take long to start up, try moving the Type1 directory\n"
"# to the end of this list (or comment them out).\n" "# to the end of this list (or comment it out).\n"
#endif #endif
"# \n" "# \n"
"\n"; "\n";