[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33839] trunk/lib/darwin-8.0.0-powerpc: update freetype for OS X 10.4 PPC to 2.4.4

Stefan Gartner stefang at aon.at
Tue Dec 21 20:50:24 CET 2010


Revision: 33839
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33839
Author:   sgefant
Date:     2010-12-21 20:50:24 +0100 (Tue, 21 Dec 2010)

Log Message:
-----------
update freetype for OS X 10.4 PPC to 2.4.4

Modified Paths:
--------------
    trunk/lib/darwin-8.0.0-powerpc/README
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftconfig.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftoption.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftstdlib.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/freetype.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftcache.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/fterrdef.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftglyph.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftimage.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftincrem.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftlcdfil.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftlist.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftmodapi.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftoutln.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftrender.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftsnames.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftstroke.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftsystem.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/fttypes.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ftxf86.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/ttnameid.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/tttables.h
    trunk/lib/darwin-8.0.0-powerpc/freetype/lib/libfreetype.a

Modified: trunk/lib/darwin-8.0.0-powerpc/README
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/README	2010-12-21 18:55:49 UTC (rev 33838)
+++ trunk/lib/darwin-8.0.0-powerpc/README	2010-12-21 19:50:24 UTC (rev 33839)
@@ -11,6 +11,7 @@
 flac 1.2.1
 sndfile 1.0.21
 opencollada (svn rev 775)
+freetype (2.4.4)
 
 The following configuration parameters were used to build the libs:
 
@@ -64,3 +65,6 @@
 patch the OpenCollada Sconstruct file with opencollada/collada_OSXbuild.patch
 patch the OpenCollada source files with jesterKing patch: http://code.google.com/p/opencollada/issues/detail?id=117
 python scons.py -j 2  RELEASE=1 PCRENATIVE=0 XMLPARSER=libxmlnative NOVALIDATION=1
+
+FreeType:
+CC="gcc-4.0" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" ./configure --disable-shared --prefix=$HOME/src/blender2.5/lib/darwin-8.0.0-powerpc/freetype

Modified: trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftconfig.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftconfig.h	2010-12-21 18:55:49 UTC (rev 33838)
+++ trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftconfig.h	2010-12-21 19:50:24 UTC (rev 33839)
@@ -76,11 +76,11 @@
 #endif
 
 
-#define FT_USE_AUTOCONF_SIZEOF_TYPES 1
+/* #undef FT_USE_AUTOCONF_SIZEOF_TYPES */
 #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
 
 #define SIZEOF_INT 4
-#define SIZEOF_LONG 8
+#define SIZEOF_LONG 4
 #define FT_SIZEOF_INT  SIZEOF_INT
 #define FT_SIZEOF_LONG SIZEOF_LONG
 
@@ -299,7 +299,7 @@
     register FT_Int32  t, t2;
 
 
-    asm __volatile__ (
+    __asm__ __volatile__ (
       "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
       "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
       "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
@@ -314,7 +314,7 @@
 
 #endif /* __arm__ && !__thumb__ */
 
-#if defined( i386 )
+#if defined( __i386__ )
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
 
   static __inline__ FT_Int32

Modified: trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftoption.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftoption.h	2010-12-21 18:55:49 UTC (rev 33838)
+++ trunk/lib/darwin-8.0.0-powerpc/freetype/include/freetype/config/ftoption.h	2010-12-21 19:50:24 UTC (rev 33839)
@@ -4,7 +4,8 @@
 /*                                                                         */
 /*    User-selectable configuration macros (specification only).           */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by       */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,   */
+/*            2010 by                                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -85,9 +86,9 @@
   /*                                                                       */
   /* This macro has no impact on the FreeType API, only on its             */
   /* _implementation_.  For example, using FT_RENDER_MODE_LCD when calling */
-  /* FT_Render_Glyph still generates a bitmap that is 3 times larger than  */
-  /* the original size; the difference will be that each triplet of        */
-  /* subpixels has R=G=B.                                                  */
+  /* FT_Render_Glyph still generates a bitmap that is 3 times wider than   */
+  /* the original size in case this macro isn't defined; however, each     */
+  /* triplet of subpixels has R=G=B.                                       */
   /*                                                                       */
   /* This is done to allow FreeType clients to run unmodified, forcing     */
   /* them to display normal gray-level anti-aliased glyphs.                */
@@ -312,10 +313,11 @@
   /*                                                                       */
   /* 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.                                          */
+  /* This is required by clients supporting document formats which         */
+  /* supply font data incrementally as the document is parsed, such        */
+  /* as the Ghostscript interpreter for the PostScript language.           */
   /*                                                                       */
-/* #define FT_CONFIG_OPTION_INCREMENTAL */
+#define FT_CONFIG_OPTION_INCREMENTAL
 
 
   /*************************************************************************/
@@ -396,7 +398,21 @@
 #undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* Position Independent Code                                             */
+  /*                                                                       */
+  /*   If this macro is set (which is _not_ the default), FreeType2 will   */
+  /*   avoid creating constants that require address fixups.  Instead the  */
+  /*   constants will be moved into a struct and additional intialization  */
+  /*   code will be used.                                                  */
+  /*                                                                       */
+  /*   Setting this macro is needed for systems that prohibit address      */
+  /*   fixups, such as BREW.                                               */
+  /*                                                                       */
+/* #define FT_CONFIG_OPTION_PIC */
 
+
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
@@ -439,7 +455,7 @@
   /* does not contain any glyph name though.                               */
   /*                                                                       */
   /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftnames.h'.                                                 */
+  /* `freetype/ftsnames.h'.                                                */
   /*                                                                       */
 #define TT_CONFIG_OPTION_SFNT_NAMES
 
@@ -457,6 +473,7 @@
 #define TT_CONFIG_CMAP_FORMAT_8
 #define TT_CONFIG_CMAP_FORMAT_10
 #define TT_CONFIG_CMAP_FORMAT_12
+#define TT_CONFIG_CMAP_FORMAT_13
 #define TT_CONFIG_CMAP_FORMAT_14
 
 
@@ -471,8 +488,7 @@
   /*************************************************************************/
   /*                                                                       */
   /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile   */
-  /* a bytecode interpreter in the TrueType driver.  Note that there are   */
-  /* important patent issues related to the use of the interpreter.        */
+  /* a bytecode interpreter in the TrueType driver.                        */
   /*                                                                       */
   /* By undefining this, you will only compile the code necessary to load  */
   /* TrueType glyphs without hinting.                                      */
@@ -480,17 +496,20 @@
   /*   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_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/
   /*                                                                       */
   /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
   /* of the TrueType bytecode interpreter is used that doesn't implement   */
-  /* any of the patented opcodes and algorithms.  Note that the            */
-  /* TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored* if you define  */
-  /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words, either define  */
-  /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER or                              */
+  /* any of the patented opcodes and algorithms.  The patents related to   */
+  /* TrueType hinting have expired worldwide since May 2010; this option   */
+  /* is now deprecated.                                                    */
+  /*                                                                       */
+  /* Note that the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored*  */
+  /* if you define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words,  */
+  /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or                */
   /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time.    */
   /*                                                                       */
   /* This macro is only useful for a small number of font files (mostly    */
@@ -527,7 +546,7 @@
   /*     ...                                                               */
   /*   }                                                                   */
   /*                                                                       */
-#define TT_CONFIG_OPTION_UNPATENTED_HINTING
+/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
 
 
   /*************************************************************************/
@@ -674,6 +693,27 @@
 
 
   /*
+   *  To detect legacy cache-lookup call from a rogue client (<= 2.1.7),
+   *  we restrict the number of charmaps in a font.  The current API of
+   *  FTC_CMapCache_Lookup() takes cmap_index & charcode, but old API

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list