[xorg-commit-diffs] xc/lib/font/FreeType/module Imakefile, 1.1.4.2,
1.1.4.3 ft2build.h, 1.1.4.1, 1.1.4.2 ftheader.h, 1.1.4.1,
1.1.4.2 ftmodule.c, 1.1.4.1, 1.1.4.2 ftoption.h, 1.1.4.1,
1.1.4.2 ftstdlib.h, 1.1.4.1, 1.1.4.2
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:15:12 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/lib/font/FreeType/module
In directory pdx:/home/eich/tstbuild/xc/lib/font/FreeType/module
Modified Files:
Tag: XORG-CURRENT
Imakefile ft2build.h ftheader.h ftmodule.c ftoption.h
ftstdlib.h
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/module/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile 5 Mar 2004 13:39:31 -0000 1.1.4.2
+++ b/Imakefile 15 Apr 2004 10:15:08 -0000 1.1.4.3
@@ -1,16 +1,40 @@
XCOMM $XFree86: xc/lib/font/FreeType/module/Imakefile,v 1.16 2003/11/05 16:58:35 tsi Exp $
-FT2SOURCEDIR = $(TOP)/extras/freetype2/src
FT2INCDIR = $(TOP)/extras/freetype2/include
+FT2SOURCEDIR = $(TOP)/extras/freetype2/src
+
+/*#define BuildFreetypeDlModule NO*/
+
+#if !defined(BuildFreetypeDlModule)
+# define BuildFreetypeDlModule (HasFreetype2 && HasDlopen)
+#endif
+
+#if !HasFreetype2
+INTERNALDEFINES = -DUSE_INTERNAL_FREETYPE
+#endif
+
+#if !BuildFreetypeDlModule
+EXTRADEFINES = Freetype2BuildDefines -DFONTMODULE
+# else
+# undef MakeDllModules
+# define MakeDllModules YES
+#endif
+
+
+DEFINES = $(EXTRADEFINES) -DXFREE86_FT2 $(INTERNALDEFINES)
#define IHaveModules
#include <Server.tmpl>
-DEFINES = -DFONTMODULE Freetype2BuildDefines -DXFREE86_FT2
-INCLUDES = -I. -I.. -I$(FONTINCSRC) -I../../include -I$(XINCLUDESRC) \
- -I$(SERVERSRC)/include \
- -I$(FT2INCDIR) \
+#if BuildFreetypeDlModule
+
+FT2INCLUDES = $(FREETYPE2INCLUDES)
+EXTLIB = $(FREETYPE2LIB)
+
+#else
+
+FT2INCLUDES = -I$(FT2INCDIR) \
-I$(FT2SOURCEDIR)/base \
-I$(FT2SOURCEDIR)/gzip \
-I$(FT2SOURCEDIR)/raster \
@@ -23,8 +47,7 @@
-I$(FT2SOURCEDIR)/pshinter \
-I$(FT2SOURCEDIR)/autohint \
-I$(FT2SOURCEDIR)/bdf \
- -I$(FT2SOURCEDIR)/pcf \
- -I$(INCLUDESRC)
+ -I$(FT2SOURCEDIR)/pcf
FT2SRCS = ftbase.c ftinit.c ftglyph.c ftbbox.c ftsystem.c fttype1.c ftxf86.c \
ftgzip.c raster.c sfnt.c truetype.c cff.c type1.c \
@@ -34,6 +57,10 @@
ftgzip.o raster.o sfnt.o truetype.o cff.o type1.o \
psaux.o psnames.o pshinter.o autohint.o \
ftbdf.o bdf.o pcf.o
+#endif
+
+INCLUDES = -I. -I.. -I$(FONTINCSRC) -I../../include -I$(XINCLUDESRC) \
+ -I$(SERVERSRC)/include $(FT2INCLUDES) -I$(INCLUDESRC)
SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c $(FT2SRCS) ftmodule.c
OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o $(FT2OBJS) ftmodule.o
@@ -43,6 +70,7 @@
LinkSourceFile(fttools.c,..)
LinkSourceFile(xttcap.c,..)
+#if !BuildFreetypeDlModule
LinkSourceFile(ftbase.c,$(FT2SOURCEDIR)/base)
LinkSourceFile(ftinit.c,$(FT2SOURCEDIR)/base)
LinkSourceFile(ftglyph.c,$(FT2SOURCEDIR)/base)
@@ -64,11 +92,19 @@
LinkSourceFile(ftbdf.c,$(FT2SOURCEDIR)/base)
LinkSourceFile(bdf.c,$(FT2SOURCEDIR)/bdf)
LinkSourceFile(pcf.c,$(FT2SOURCEDIR)/pcf)
+#endif
ModuleObjectRule()
+
+#if !BuildFreetypeDlModule
LibraryModuleTarget(freetype,$(OBJS))
InstallLibraryModule(freetype,$(MODULEDIR),fonts)
+InstallDriverSDKLibraryModule(freetype,$(DRIVERSDKMODULEDIR),fonts)
+#else
+DepDynamicModuleTarget(Concat3(lib,freetype,.so), $(OBJS), $(OBJS) $(EXTLIB))
+InstallDynamicModule(Concat3(lib,freetype,.so),$(MODULEDIR),fonts)
+InstallDriverSDKDynamicModule(Concat3(lib,freetype,.so),$(DRIVERSDKMODULEDIR),fonts)
+#endif
DependTarget()
-InstallDriverSDKLibraryModule(freetype,$(DRIVERSDKMODULEDIR),fonts)
Index: ft2build.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/module/ft2build.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ft2build.h 5 Mar 2004 13:39:31 -0000 1.1.4.1
+++ b/ft2build.h 15 Apr 2004 10:15:08 -0000 1.1.4.2
@@ -19,6 +19,7 @@
/* $XFree86: xc/lib/font/FreeType/ft2build.h,v 1.3 2002/10/01 00:02:10 alanh Exp $ */
+/* $XdotOrg$ */
/*************************************************************************/
/* */
/* This file corresponds to the default "ft2build.h" file for */
@@ -29,11 +30,14 @@
/* */
/*************************************************************************/
-
#ifndef __FT2_BUILD_GENERIC_H__
#define __FT2_BUILD_GENERIC_H__
-#include "ftheader.h"
+# if defined (FONTMODULE)
+# include "ftheader.h"
+# else
+#include <freetype/config/ftheader.h>
+# endif
#endif /* __FT2_BUILD_GENERIC_H__ */
Index: ftheader.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/module/ftheader.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ftheader.h 5 Mar 2004 13:39:31 -0000 1.1.4.1
+++ b/ftheader.h 15 Apr 2004 10:15:08 -0000 1.1.4.2
@@ -282,7 +282,7 @@
/* A macro used in #include statements to name the file containing */
/* the module management API of FreeType 2. */
/* */
-#define FT_MODULE_H <freetype/ftmodule.h>
+#define FT_MODULE_H <freetype/ftmodapi.h>
/*************************************************************************/
@@ -510,7 +510,7 @@
/* */
#define FT_TRIGONOMETRY_H <freetype/fttrigon.h>
-#define FT_STROKER_H <freetype/ftstroker.h>
+#define FT_STROKER_H <freetype/ftstroke.h>
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
@@ -524,6 +524,8 @@
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
+#define FT_TRUETYPE_UNPATENTED_H <freetype/ttunpat.h>
+
/* now include internal headers definitions from <freetype/internal/...> */
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
Index: ftmodule.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/module/ftmodule.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ftmodule.c 26 Nov 2003 22:48:40 -0000 1.1.4.1
+++ b/ftmodule.c 15 Apr 2004 10:15:09 -0000 1.1.4.2
@@ -43,7 +43,7 @@
MODULEVENDORSTRING " & the After X-TT Project",
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
2, 1, 0,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,
Index: ftoption.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/module/ftoption.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ftoption.h 5 Mar 2004 13:39:31 -0000 1.1.4.1
+++ b/ftoption.h 15 Apr 2004 10:15:09 -0000 1.1.4.2
@@ -5,7 +5,7 @@
/* */
/* User-selectable configuration macros (specification only). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* Modified for XFree86. */
@@ -84,16 +84,16 @@
/* by FreeType to speed up some computations. However, this will create */
/* some problems when compiling the library in strict ANSI mode. */
/* */
- /* For this reason, the use of 64-bit ints is normally disabled when */
+ /* For this reason, the use of 64-bit integers is normally disabled when */
/* the __STDC__ macro is defined. You can however disable this by */
- /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64. */
+ /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here. */
/* */
- /* For most compilers, this will only create compilation warnings */
- /* when building the library. */
+ /* For most compilers, this will only create compilation warnings when */
+ /* building the library. */
/* */
/* ObNote: The compiler-specific 64-bit integers are detected in the */
- /* file "ftconfig.h" either statically, or through Autoconf */
- /* on platforms that support it. */
+ /* file "ftconfig.h" either statically or through the */
+ /* `configure' script on supported platforms. */
/* */
#undef FT_CONFIG_OPTION_FORCE_INT64
@@ -103,11 +103,11 @@
/* Gzip-compressed file support. */
/* */
/* FreeType now handles font files that have been compressed with the */
- /* 'gzip' program. This is mostly used to parse many of the PCF files */
- /* that come with XFree86. The implementation uses 'zlib' to */
+ /* 'gzip' program. This is mostly used to parse many of the PCF files */
+ /* that come with XFree86. The implementation uses `zlib' to */
/* partially uncompress the file on the fly (see src/base/ftgzip.c). */
/* */
- /* Define this macro if you want to enable this "feature". Note that */
+ /* Define this macro if you want to enable this "feature". Note that */
/* this will however force you to link the zlib to any program that */
/* also uses FreeType. */
/* */
@@ -120,17 +120,17 @@
/* */
/* This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined. */
/* It allows FreeType's "ftgzip" component to link to the system's */
- /* installation of the ZLib library. This is useful on systems like */
+ /* installation of the ZLib library. This is useful on systems like */
/* Unix or VMS where it generally is already available. */
/* */
/* If you let it undefined, the component will use its own copy */
- /* of the zlib sources instead. These have been modified to be */
+ /* of the zlib sources instead. These have been modified to be */
/* included directly within the component and *not* export external */
- /* function names. This allows you to link any program with FreeType */
+ /* function names. This allows you to link any program with FreeType */
/* _and_ ZLib without linking conflicts. */
/* */
- /* do not #undef this macro here, since the build system might */
- /* define for certain configurations */
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
/* */
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
@@ -170,6 +170,9 @@
/* will be later automatically defined as `extern return_type' to */
/* allow normal compilation. */
/* */
+ /* Do not #undef these macros here since the build system might define */
+ /* them for certain configurations only. */
+ /* */
/* #define FT_EXPORT(x) extern x */
/* #define FT_EXPORT_DEF(x) x */
@@ -219,12 +222,25 @@
/*************************************************************************/
/* */
+ /* Support for Mac fonts */
+ /* */
+ /* Define this macro if you want support for outline fonts in Mac */
+ /* format (mac dfont, mac resource, macbinary containing a mac */
+ /* resource) on non-Mac platforms. */
+ /* */
+ /* Note that the `FOND' resource isn't checked. */
+ /* */
+#define FT_CONFIG_OPTION_MAC_FONTS
+
+
+ /*************************************************************************/
+ /* */
/* Allow the use of FT_Incremental_Interface to load typefaces that */
/* contain no glyph data, but supply it via a callback function. */
/* This allows FreeType to be used with the PostScript language, using */
/* the GhostScript interpreter. */
/* */
-/* #define FT_CONFIG_OPTION_INCREMENTAL */
+/* #define FT_CONFIG_OPTION_INCREMENTAL */
/*************************************************************************/
@@ -232,7 +248,7 @@
/* The size in bytes of the render pool used by the scan-line converter */
/* to do all of its work. */
/* */
- /* This must be greater than 4kByte. */
+ /* This must be greater than 4KByte. */
/* */
#define FT_RENDER_POOL_SIZE 16384L
@@ -261,8 +277,11 @@
/* */
/* Don't define any of these macros to compile in `release' mode! */
/* */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
+ /* Do not #undef these macros here since the build system might define */
+ /* them for certain configurations only. */
+ /* */
+/* #define FT_DEBUG_LEVEL_ERROR */
+/* #define FT_DEBUG_LEVEL_TRACE */
/*************************************************************************/
@@ -275,10 +294,12 @@
/* should define FT_DEBUG_MEMORY here. */
/* */
/* Note that the memory debugger is only activated at runtime when */
- /* when the _environment_ variable "FT_DEBUG_MEMORY" is also defined! */
+ /* when the _environment_ variable "FT2_DEBUG_MEMORY" is defined also! */
/* */
-/* #define FT_DEBUG_MEMORY */
-
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
+ /* */
+/* #define FT_DEBUG_MEMORY */
/*************************************************************************/
@@ -378,14 +399,26 @@
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
- /* do not #undef this macro here, since the build system might */
- /* define for certain configurations */
+ /* Do not #undef this macro here, since the build system might */
+ /* define it for certain configurations only. */
/* */
/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
/*************************************************************************/
/* */
+ /* Define TT_CONFIG_OPTION_UNPATENTED_HINTING (in addition to */
+ /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER) to compile the unpatented */
+ /* work-around hinting system. Note that for the moment, the algorithm */
+ /* is only used when selected at runtime through the parameter tag */
+ /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */
+ /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived */
+ /* */
+#define TT_CONFIG_OPTION_UNPATENTED_HINTING
+
+
+ /*************************************************************************/
+ /* */
/* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
/* bytecode interpreter with a huge switch statement, rather than a call */
/* table. This results in smaller and faster code for a number of */
@@ -473,21 +506,21 @@
/* */
/*
- * the FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
- * improvements to the auto-hinter contributed by David Chester. They will
- * most likely disappear completely in the next release. For now, you should
- * always keep them defined
+ * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
+ * improvements to the auto-hinter contributed by David Chester. They will
+ * most likely disappear completely in the next release. For now, you
+ * should always keep them defined.
*
*/
#define FT_CONFIG_OPTION_CHESTER_HINTS
#ifdef FT_CONFIG_OPTION_CHESTER_HINTS
-# define FT_CONFIG_CHESTER_SMALL_F
-# define FT_CONFIG_CHESTER_ASCENDER
-# define FT_CONFIG_CHESTER_SERIF
-# define FT_CONFIG_CHESTER_STEM
-# define FT_CONFIG_CHESTER_BLUE_SCALE
+#define FT_CONFIG_CHESTER_SMALL_F
+#define FT_CONFIG_CHESTER_ASCENDER
+#define FT_CONFIG_CHESTER_SERIF
+#define FT_CONFIG_CHESTER_STEM
+#define FT_CONFIG_CHESTER_BLUE_SCALE
#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */
Index: ftstdlib.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/module/ftstdlib.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ftstdlib.h 5 Mar 2004 13:39:31 -0000 1.1.4.1
+++ b/ftstdlib.h 15 Apr 2004 10:15:09 -0000 1.1.4.2
@@ -13,15 +13,17 @@
#include <ctype.h>
-#define ft_isalnum isalnum
-#define ft_isupper isupper
-#define ft_islower islower
-#define ft_xdigit isxdigit
+#define ft_isalnum isalnum
+#define ft_isupper isupper
+#define ft_islower islower
+#define ft_isdigit isdigit
+#define ft_isxdigit isxdigit
#include <string.h>
#define ft_strlen strlen
+#define ft_strcat strcat
#define ft_strcmp strcmp
#define ft_strncmp strncmp
#define ft_memcpy memcpy
More information about the xorg-commit-diffs
mailing list