Get rid of the type1 font module.
It is completely replaced by freetype these days.
This commit is contained in:
parent
76bf3cd7b8
commit
13949f9972
|
@ -48,7 +48,6 @@
|
||||||
"\tLoad\t\"dbe\"\n" \
|
"\tLoad\t\"dbe\"\n" \
|
||||||
"\tLoad\t\"glx\"\n" \
|
"\tLoad\t\"glx\"\n" \
|
||||||
"\tLoad\t\"freetype\"\n" \
|
"\tLoad\t\"freetype\"\n" \
|
||||||
"\tLoad\t\"type1\"\n" \
|
|
||||||
"\tLoad\t\"record\"\n" \
|
"\tLoad\t\"record\"\n" \
|
||||||
"\tLoad\t\"dri\"\n" \
|
"\tLoad\t\"dri\"\n" \
|
||||||
"EndSection\n\n"
|
"EndSection\n\n"
|
||||||
|
|
|
@ -119,7 +119,6 @@ static ModuleDefault ModuleDefaults[] = {
|
||||||
{.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
|
{.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
|
||||||
{.name = "glx", .toLoad = TRUE, .load_opt=NULL},
|
{.name = "glx", .toLoad = TRUE, .load_opt=NULL},
|
||||||
{.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
|
{.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
|
||||||
{.name = "type1", .toLoad = TRUE, .load_opt=NULL},
|
|
||||||
{.name = "record", .toLoad = TRUE, .load_opt=NULL},
|
{.name = "record", .toLoad = TRUE, .load_opt=NULL},
|
||||||
{.name = "dri", .toLoad = TRUE, .load_opt=NULL},
|
{.name = "dri", .toLoad = TRUE, .load_opt=NULL},
|
||||||
{.name = NULL, .toLoad = FALSE, .load_opt=NULL}
|
{.name = NULL, .toLoad = FALSE, .load_opt=NULL}
|
||||||
|
|
|
@ -40,8 +40,7 @@ extsmodule_LTLIBRARIES = librecord.la \
|
||||||
$(XTRAPMOD)
|
$(XTRAPMOD)
|
||||||
|
|
||||||
fontsmoduledir = $(moduledir)/fonts
|
fontsmoduledir = $(moduledir)/fonts
|
||||||
fontsmodule_LTLIBRARIES = libfreetype.la \
|
fontsmodule_LTLIBRARIES = libfreetype.la
|
||||||
libtype1.la
|
|
||||||
|
|
||||||
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
|
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
|
||||||
INCLUDES = @XORG_INCS@ \
|
INCLUDES = @XORG_INCS@ \
|
||||||
|
@ -104,9 +103,6 @@ libshadow_la_SOURCES = shmodule.c
|
||||||
libfreetype_la_LDFLAGS = -avoid-version
|
libfreetype_la_LDFLAGS = -avoid-version
|
||||||
libfreetype_la_SOURCES = ftmodule.c
|
libfreetype_la_SOURCES = ftmodule.c
|
||||||
|
|
||||||
libtype1_la_LDFLAGS = -avoid-version
|
|
||||||
libtype1_la_SOURCES = type1mod.c
|
|
||||||
|
|
||||||
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
|
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
|
||||||
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
|
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -1,75 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to
|
|
||||||
* deal in the Software without restriction, including without limitation the
|
|
||||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
* sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
||||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* Except as contained in this notice, the name of the XFree86 Project shall
|
|
||||||
* not be used in advertising or otherwise to promote the sale, use or other
|
|
||||||
* dealings in this Software without prior written authorization from the
|
|
||||||
* XFree86 Project.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
|
||||||
#include <xorg-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "misc.h"
|
|
||||||
|
|
||||||
#include <X11/fonts/fontmod.h>
|
|
||||||
#include "xf86Module.h"
|
|
||||||
|
|
||||||
static MODULESETUPPROTO(type1Setup);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the module data function that is accessed when loading
|
|
||||||
* libtype1 as a module.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static XF86ModuleVersionInfo VersRec =
|
|
||||||
{
|
|
||||||
"type1",
|
|
||||||
MODULEVENDORSTRING,
|
|
||||||
MODINFOSTRING1,
|
|
||||||
MODINFOSTRING2,
|
|
||||||
XORG_VERSION_CURRENT,
|
|
||||||
1, 0, 2,
|
|
||||||
ABI_CLASS_FONT, /* Font module */
|
|
||||||
ABI_FONT_VERSION,
|
|
||||||
MOD_CLASS_FONT,
|
|
||||||
{0,0,0,0} /* signature, to be patched into the file by a tool */
|
|
||||||
};
|
|
||||||
|
|
||||||
_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
|
|
||||||
|
|
||||||
extern void Type1RegisterFontFileFunctions(void);
|
|
||||||
|
|
||||||
FontModule type1Module = {
|
|
||||||
Type1RegisterFontFileFunctions,
|
|
||||||
"Type1",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
static pointer
|
|
||||||
type1Setup(pointer module, pointer opts, int *errmaj, int *errmin)
|
|
||||||
{
|
|
||||||
type1Module.module = module;
|
|
||||||
LoadFont(&type1Module);
|
|
||||||
|
|
||||||
/* Need a non-NULL return */
|
|
||||||
return (pointer)1;
|
|
||||||
}
|
|
|
@ -700,10 +700,10 @@ The standard name is case\-sensitive, and does not include the \(lqlib\(rq
|
||||||
prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
|
prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
|
||||||
.PP
|
.PP
|
||||||
.RS 7
|
.RS 7
|
||||||
Example: the Type 1 font rasteriser can be loaded with the following entry:
|
Example: the FreeType font rasteriser can be loaded with the following entry:
|
||||||
.PP
|
.PP
|
||||||
.RS 4
|
.RS 4
|
||||||
.B "Load \*qtype1\*q"
|
.B "Load \*qfreetype\*q"
|
||||||
.RE
|
.RE
|
||||||
.RE
|
.RE
|
||||||
.TP 7
|
.TP 7
|
||||||
|
|
Loading…
Reference in New Issue
Block a user