[xorg-commit-diffs] xc/extras/freetype2 vms_make.com, 1.1, 1.1.2.1 ChangeLog, 1.1.4.1, 1.1.4.2 Jamfile, 1.1.4.1, 1.1.4.2 Jamfile.in, 1.1.4.1, 1.1.4.2 Jamrules, 1.1.4.1, 1.1.4.2 README, 1.1.4.1, 1.1.4.2 configure, 1.1.4.1, 1.1.4.2 .cvsignore, 1.1.1.1.2.1, NONE descrip.mms, 1.1, NONE install, 1.1, NONE

Egbert Eich xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:14:17 PDT 2004


Committed by: eich

Update of /cvs/xorg/xc/extras/freetype2
In directory pdx:/home/eich/tstbuild/xc/extras/freetype2

Modified Files:
      Tag: XORG-CURRENT
	ChangeLog Jamfile Jamfile.in Jamrules README configure 
Added Files:
      Tag: XORG-CURRENT
	vms_make.com 
Removed Files:
      Tag: XORG-CURRENT
	.cvsignore descrip.mms install 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	



Index: ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/ChangeLog,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/ChangeLog	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/ChangeLog	15 Apr 2004 10:14:12 -0000	1.1.4.2
@@ -1,188 +1,2429 @@
+2003-11-07  Werner Lemberg  <wl at gnu.org>
+
+
+	* Version 2.1.7 released.
+	=========================
+
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 7.
+
+	* builds/unix/ft2unix.h: Fix comments.
+
[...3040 lines suppressed...]
 2001-03-12  Werner Lemberg  <wl at gnu.org>
 
@@ -5180,7 +7561,7 @@
 	* src/cff/cffparse.c (cff_parse_font_matrix): Added logic to get
 	the units_per_EM from the FontMatrix.
 
-	(cff_parse_fixed_thousand): New function. Gets a real number from
+	(cff_parse_fixed_thousand): New function.  Gets a real number from
 	the CFF font, but multiplies by 1000 (this is to avoid rounding
 	errors when placing this real number into a 16.16 fixed number).
 
@@ -5294,7 +7675,7 @@
 	* src/cff/cffobjs.c, src/cff/cffobjs.h, src/cff/cffparse.c,
 	src/cff/cffdrivr.c, src/cff/cff.c, src/cff/cffload.c,
 	src/cff/cffgload.c, src/cff/cffgload.h: Changed to use
-	cffgload.{c,h} instead of t2gload.{c,h}.  All occurences of t2_
+	cffgload.{c,h} instead of t2gload.{c,h}.  All occurrences of t2_
 	(T2_) were replaced with cff_ (CFF_, respectively).
 
 	* src/cff/t2gload.h: Renamed cffgload.h.

Index: Jamfile
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/Jamfile,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/Jamfile	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/Jamfile	15 Apr 2004 10:14:12 -0000	1.1.4.2
@@ -1,21 +1,22 @@
-# FreeType 2 top Jamfile (c) 2001-2002 David Turner
+# FreeType 2 top Jamfile (c) 2001, 2002, 2003 David Turner
 #
 
 # The HDRMACRO is already defined in FTJam and is used to add
 # the content of certain macros to the list of included header
 # files.
 #
-# we can compile FreeType 2 with classic Jam however thanks to
+# We can compile FreeType 2 with classic Jam however thanks to
 # the following code
 #
 if ! $(JAM_TOOLSET)
 {
   rule HDRMACRO
   {
-    # nothing !!
+    # nothing
   }
 }
 
+
 # We need to invoke a SubDir rule if the FT2 source directory top is not the
 # current directory.  This allows us to build FreeType 2 as part of a larger
 # project easily.
@@ -25,71 +26,83 @@
   SubDir  FT2_TOP ;
 }
 
-#
-# The following macros define the include directory, the source directory
-# and the final library name (without library extensions). They can be
+
+# The following macros define the include directory, the source directory,
+# and the final library name (without library extensions).  They can be
 # replaced by other definitions when the library is compiled as part of
 # a larger project.
 #
 
-# name of FreeType include directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType include directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_INCLUDE_DIR ?= include ;
 
-# name of FreeType source directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType source directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_SRC_DIR ?= src ;
 
-# name of final library, without extension
+# Name of final library, without extension.
 #
 FT2_LIB ?= $(LIBPREFIX)freetype ;
 
 
-# define FT2_BUILD_INCLUDE to point to your build-specific directory
-# this is prepended to FT2_INCLUDE_DIR. This can be used to specify
+# Define FT2_BUILD_INCLUDE to point to your build-specific directory.
+# This is prepended to FT2_INCLUDE_DIR.  It can be used to specify
 # the location of a custom <ft2build.h> which will point to custom
-# versions of "ftmodule.h" and "ftoption.h", for example
+# versions of "ftmodule.h" and "ftoption.h", for example.
 #
 FT2_BUILD_INCLUDE ?= ;
 
-# the list of modules to compile on any given build of the library
-# by default, this will contain _all_ modules defined in FT2_SRC_DIR
+# The list of modules to compile on any given build of the library.
+# By default, this will contain _all_ modules defined in FT2_SRC_DIR.
 #
 # IMPORTANT: You'll need to change the content of "ftmodule.h" as well
 #            if you modify this list or provide your own.
 #
-FT2_COMPONENTS ?= gzip       # support for gzip-compressed files.
+FT2_COMPONENTS ?= gzip       # support for gzip-compressed files
                   autohint   # auto-hinter
                   base       # base component (public APIs)
                   bdf        # BDF font driver
                   cache      # cache sub-system
                   cff        # CFF/CEF font driver
-                  cid        # Postscript CID-keyed font driver
+                  cid        # PostScript CID-keyed font driver
                   pcf        # PCF font driver
                   pfr        # PFR/TrueDoc font driver
-                  psaux      # Common Postscript routines module
-                  pshinter   # Postscript hinter module
-                  psnames    # Postscript names handling
-                  raster     # Monochrome rasterizer
-                  smooth     # Anti-aliased rasterizer
+                  psaux      # common PostScript routines module
+                  pshinter   # PostScript hinter module
+                  psnames    # PostScript names handling
+                  raster     # monochrome rasterizer
+                  smooth     # anti-aliased rasterizer
                   sfnt       # SFNT-based format support routines
                   truetype   # TrueType font driver
-                  type1      # Postscript Type 1 font driver
-                  type42     # Postscript Type 42 (embedded TrueType) driver
+                  type1      # PostScript Type 1 font driver
+                  type42     # PostScript Type 42 (embedded TrueType) driver
                   winfonts   # Windows FON/FNT font driver
                   ;
 
 
-# don't touch
+# Don't touch.
 #
 FT2_INCLUDE  = $(FT2_BUILD_INCLUDE)
                [ FT2_SubDir $(FT2_INCLUDE_DIR) ] ;
 
 FT2_SRC      = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
 
-# only used by FreeType developers
+# Location of API Reference Documentation
+#
+if $(DOC_DIR)
+{
+  DOC_DIR = $(DOCDIR:T) ;
+}
+else
+{
+  DOC_DIR = docs/reference ;
+}
+
+
+# Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
@@ -104,11 +117,12 @@
 
 
 # Uncomment the following line if you want to build individual source files
-# for each FreeType 2 module. this is only useful during development, and
-# is better defined as an environment variable anyway !
+# for each FreeType 2 module.  This is only useful during development, and
+# is better defined as an environment variable anyway!
 #
 # FT2_MULTI = true ;
 
+
 # The file <freetype/config/ftheader.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to
 # record these definitions.
@@ -116,17 +130,26 @@
 HDRMACRO  [ FT2_SubDir  include freetype config ftheader.h ] ;
 HDRMACRO  [ FT2_SubDir  include freetype internal internal.h ] ;
 
+
 # Now include the Jamfile in "freetype2/src", used to drive the compilation
 # of each FreeType 2 component and/or module.
 #
 SubInclude  FT2_TOP $(FT2_SRC_DIR) ;
 
 
-# tests files (hinter debugging). only used by FreeType developers
+# Test files (hinter debugging).  Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
   SubInclude FT2_TOP tests ;
 }
 
+actions RefDoc
+{
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.5 --output=$(DOC_DIR)  $(FT2_INCLUDE)/freetype/*.h  $(FT2_INCLUDE)/freetype/config/*.h  $(FT2_INCLUDE)/freetype/cache/*.h
+}
+
+RefDoc  refdoc ;
+
+
 # end of top Jamfile

Index: Jamfile.in
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/Jamfile.in,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/Jamfile.in	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/Jamfile.in	15 Apr 2004 10:14:12 -0000	1.1.4.2
@@ -1,21 +1,22 @@
-# FreeType 2 top Jamfile (c) 2001-2002 David Turner
+# FreeType 2 top Jamfile (c) 2001, 2002, 2003 David Turner
 #
 
 # The HDRMACRO is already defined in FTJam and is used to add
 # the content of certain macros to the list of included header
 # files.
 #
-# we can compile FreeType 2 with classic Jam however thanks to
+# We can compile FreeType 2 with classic Jam however thanks to
 # the following code
 #
 if ! $(JAM_TOOLSET)
 {
   rule HDRMACRO
   {
-    # nothing !!
+    # nothing
   }
 }
 
+
 # We need to invoke a SubDir rule if the FT2 source directory top is not the
 # current directory.  This allows us to build FreeType 2 as part of a larger
 # project easily.
@@ -25,71 +26,71 @@
   SubDir  FT2_TOP ;
 }
 
-#
-# The following macros define the include directory, the source directory
-# and the final library name (without library extensions). They can be
+
+# The following macros define the include directory, the source directory,
+# and the final library name (without library extensions).  They can be
 # replaced by other definitions when the library is compiled as part of
 # a larger project.
 #
 
-# name of FreeType include directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType include directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_INCLUDE_DIR ?= include ;
 
-# name of FreeType source directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType source directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_SRC_DIR ?= src ;
 
-# name of final library, without extension
+# Name of final library, without extension.
 #
 FT2_LIB ?= $(LIBPREFIX)freetype ;
 
 
-# define FT2_BUILD_INCLUDE to point to your build-specific directory
-# this is prepended to FT2_INCLUDE_DIR. This can be used to specify
+# Define FT2_BUILD_INCLUDE to point to your build-specific directory.
+# This is prepended to FT2_INCLUDE_DIR.  It can be used to specify
 # the location of a custom <ft2build.h> which will point to custom
-# versions of "ftmodule.h" and "ftoption.h", for example
+# versions of "ftmodule.h" and "ftoption.h", for example.
 #
 FT2_BUILD_INCLUDE ?= ;
 
-# the list of modules to compile on any given build of the library
-# by default, this will contain _all_ modules defined in FT2_SRC_DIR
+# The list of modules to compile on any given build of the library.
+# By default, this will contain _all_ modules defined in FT2_SRC_DIR.
 #
 # IMPORTANT: You'll need to change the content of "ftmodule.h" as well
 #            if you modify this list or provide your own.
 #
-FT2_COMPONENTS ?= gzip       # support for gzip-compressed files.
+FT2_COMPONENTS ?= gzip       # support for gzip-compressed files
                   autohint   # auto-hinter
                   base       # base component (public APIs)
                   bdf        # BDF font driver
                   cache      # cache sub-system
                   cff        # CFF/CEF font driver
-                  cid        # Postscript CID-keyed font driver
+                  cid        # PostScript CID-keyed font driver
                   pcf        # PCF font driver
                   pfr        # PFR/TrueDoc font driver
-                  psaux      # Common Postscript routines module
-                  pshinter   # Postscript hinter module
-                  psnames    # Postscript names handling
-                  raster     # Monochrome rasterizer
-                  smooth     # Anti-aliased rasterizer
+                  psaux      # common PostScript routines module
+                  pshinter   # PostScript hinter module
+                  psnames    # PostScript names handling
+                  raster     # monochrome rasterizer
+                  smooth     # anti-aliased rasterizer
                   sfnt       # SFNT-based format support routines
                   truetype   # TrueType font driver
-                  type1      # Postscript Type 1 font driver
-                  type42     # Postscript Type 42 (embedded TrueType) driver
+                  type1      # PostScript Type 1 font driver
+                  type42     # PostScript Type 42 (embedded TrueType) driver
                   winfonts   # Windows FON/FNT font driver
                   ;
 
 
-# don't touch
+# Don't touch.
 #
 FT2_INCLUDE  = $(FT2_BUILD_INCLUDE)
                [ FT2_SubDir $(FT2_INCLUDE_DIR) ] ;
 
 FT2_SRC      = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
 
-# only used by FreeType developers
+# Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
@@ -103,13 +104,13 @@
 HDRS += $(FT2_INCLUDE) ;
 
 
-#SubDirHdr += $(FT2_INCLUDE) ;
-
 # Uncomment the following line if you want to build individual source files
-# for each FreeType 2 module.
+# for each FreeType 2 module.  This is only useful during development, and
+# is better defined as an environment variable anyway!
 #
 # FT2_MULTI = true ;
 
+
 # The file <freetype/config/ftheader.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to
 # record these definitions.
@@ -117,13 +118,14 @@
 HDRMACRO  [ FT2_SubDir  include freetype config ftheader.h ] ;
 HDRMACRO  [ FT2_SubDir  include freetype internal internal.h ] ;
 
+
 # Now include the Jamfile in "freetype2/src", used to drive the compilation
 # of each FreeType 2 component and/or module.
 #
 SubInclude  FT2_TOP $(FT2_SRC_DIR) ;
 
 
-# tests files (hinter debugging). only used by FreeType developers
+# Test files (hinter debugging).  Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {

Index: Jamrules
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/Jamrules,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/Jamrules	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/Jamrules	15 Apr 2004 10:14:12 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-# FreeType 2 JamRules (c) 2001 David Turner
+# FreeType 2 JamRules (c) 2001, 2002, 2003 David Turner
 #
 # This file contains the Jam rules needed to build the FreeType 2 library.
 # It is shared by all Jamfiles and is included only once in the build
@@ -6,7 +6,7 @@
 #
 
 
-# call SubDirHdrs on a list of directories
+# Call SubDirHdrs on a list of directories.
 #
 rule AddSubDirHdrs
 {

Index: README
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/README,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/README	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/README	15 Apr 2004 10:14:13 -0000	1.1.4.2
@@ -1,39 +1,36 @@
-
   Special notes to Unix users
   ===========================
 
-  Please   read  the  file   "docs/UPGRADE.UNX",  it   contains  important
-  information  regarding  the  installation  of  FreeType on Unix systems,
+  Please  read  the file  "docs/UPGRADE.UNX".   It contains  important
+  information regarding the installation  of FreeType on Unix systems,
   especially GNU based operating systems like GNU/Linux.
 
-  FreeType 2's library is called `libfreetype', FreeType 1's library
+  FreeType 2's  library is called `libfreetype',  FreeType 1's library
   is called `libttf'.  They are *not* compatible!
 
 
-  FreeType 2.1.4
+  FreeType 2.1.7
   ==============
 
-  Please   read  the  docs/CHANGES   file,  it   contains  IMPORTANT
-  INFORMATION.
+  Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION.
 
-  Read  the  files "docs/INSTALL"  for installation instructions.
+  Read the files "docs/INSTALL" for installation instructions.
 
-  Note  that the  FreeType 2  documentation  is now  available as  a
+  Note  that  the FreeType  2  documentation  is  now available  as  a
   separate package from our sites.  See:
 
-    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.4.tar.bz2
-    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.4.tar.gz
-    ftp://ftp.freetype.org/pub/freetype2/ftdoc214.zip
+    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.7.tar.bz2
+    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.7.tar.gz
+    ftp://ftp.freetype.org/pub/freetype2/ftdoc216.zip
 
 
-  Reports
-  =======
-
-  Please  report  bugs  by  e-mail to  `devel at freetype.org'.   Don't
-  forget to send  a detailed explanation of the  problem -- there is
-  nothing worse  than receiving a  terse message that only  says "it
-  doesn't work".
+  Bugs
+  ====
 
+  Please report bugs by  e-mail to `devel at freetype.org'.  Don't forget
+  to send  a detailed explanation of  the problem --  there is nothing
+  worse  than receiving  a terse  message that  only says  "it doesn't
+  work".
 
 
   Enjoy!

Index: configure
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/configure,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/configure	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/configure	15 Apr 2004 10:14:13 -0000	1.1.4.2
@@ -46,11 +46,13 @@
 # build a dummy Makefile if we are not building in the source tree
 
 if test "$abs_curr_dir" != "$abs_ft2_dir"; then
-  echo "OBJ_DIR=$abs_curr_dir"          > Makefile
-  echo "TOP_DIR=$abs_ft2_dir"          >> Makefile
-  echo "OBJ_BUILD=$abs_curr_dir"       >> Makefile
-  echo "LIBTOOL=$abs_curr_dir/libtool" >> Makefile
-  echo "include $abs_ft2_dir/Makefile" >> Makefile
+  mkdir reference
+  echo "TOP_DIR=$abs_ft2_dir"             > Makefile
+  echo "OBJ_DIR=$abs_curr_dir"           >> Makefile
+  echo "OBJ_BUILD=$abs_curr_dir"         >> Makefile
+  echo "DOC_DIR=$abs_curr_dir/reference" >> Makefile
+  echo "LIBTOOL=$abs_curr_dir/libtool"   >> Makefile
+  echo "include $abs_ft2_dir/Makefile"   >> Makefile
 fi
 
 # call make

--- .cvsignore DELETED ---

--- descrip.mms DELETED ---

--- install DELETED ---




More information about the xorg-commit-diffs mailing list