[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33897] trunk/lib/darwin-9.x.universal: OSX 10.5 libs: update freetype to 2.4.4
Damien Plisson
damien.plisson at yahoo.fr
Mon Dec 27 10:19:57 CET 2010
Revision: 33897
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33897
Author: damien78
Date: 2010-12-27 10:19:57 +0100 (Mon, 27 Dec 2010)
Log Message:
-----------
OSX 10.5 libs: update freetype to 2.4.4
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/README
trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftconfig.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftmodule.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftoption.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftstdlib.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/freetype.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftcache.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/fterrdef.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftglyph.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftimage.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftincrem.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftlcdfil.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftlist.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftmodapi.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftoutln.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftrender.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftsnames.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftstroke.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftsystem.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/fttypes.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ftxf86.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/ttnameid.h
trunk/lib/darwin-9.x.universal/freetype/include/freetype/tttables.h
trunk/lib/darwin-9.x.universal/freetype/include/ft2build.h
trunk/lib/darwin-9.x.universal/freetype/lib/libfreetype.a
Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README 2010-12-27 09:01:57 UTC (rev 33896)
+++ trunk/lib/darwin-9.x.universal/README 2010-12-27 09:19:57 UTC (rev 33897)
@@ -3,7 +3,6 @@
Current status is:
Done for all arches (i386, x86_64, ppc, ppc64):
-freetype (version 2.3.9)
sdl (version 1.2.14)
gettext (version 10.5, libiconv included as dylib in OSX from 10.3.9)
jpeg (version 6b)
@@ -14,6 +13,7 @@
tiff (version 3.9.2)
ppc64 missing:
+freetype (version 2.4.4)
lcms (version 1.19)
openexr (version 1.4.0a)
samplerate (version 0.1.7)
@@ -57,9 +57,12 @@
./configure --prefix=/Volumes/Daten250GB/bf-blender/LIB_Sources/fftw-3.2.2Leo64/build CC="gcc-4.2" --enable-sse2 CFLAGS="-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller" CFLAGS="-arch x86_64" CXXFLAGS="-arch x86_64" OBJCFLAGS="-arch x86_64" OBJCXXFLAGS="-arch x86_64" LDFLAGS="-arch x86_64"
Freetype:
+./configure --build=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
-./configure CC="gcc-4.2" CFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" CXXFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" OBJCFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" OBJCXXFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" LDFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64"
+./configure --build=i386-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+./configure --disable-shared --build=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+
SDL:
./configure CC="gcc-4.2" CFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" CXXFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" OBJCFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" OBJCXXFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64" LDFLAGS="-arch i386 -arch x86_64 -arch ppc -arch ppc64"
Modified: trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftconfig.h
===================================================================
--- trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftconfig.h 2010-12-27 09:01:57 UTC (rev 33896)
+++ trunk/lib/darwin-9.x.universal/freetype/include/freetype/config/ftconfig.h 2010-12-27 09:19:57 UTC (rev 33897)
@@ -1,11 +1,10 @@
-/* ftconfig.h. Generated from ftconfig.in by configure. */
/***************************************************************************/
/* */
-/* ftconfig.in */
+/* ftconfig.h */
/* */
-/* UNIX-specific configuration file (specification only). */
+/* ANSI-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2010 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -32,9 +31,10 @@
/* contains system-specific files that are always included first when */
/* building the library. */
/* */
+ /* This ANSI version should stay in `include/freetype/config'. */
+ /* */
/*************************************************************************/
-
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
@@ -58,11 +58,6 @@
/*************************************************************************/
-#define HAVE_UNISTD_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_STDINT_H 1
-
-
/* There are systems (like the Texas Instruments 'C54x) where a `char' */
/* has 16 bits. ANSI C says that sizeof(char) is always 1. Since an */
/* `int' has 16 bits also for this system, sizeof(int) gives 1 which */
@@ -76,22 +71,6 @@
#endif
-#define FT_USE_AUTOCONF_SIZEOF_TYPES 1
-#ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
-
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 8
-#define FT_SIZEOF_INT SIZEOF_INT
-#define FT_SIZEOF_LONG SIZEOF_LONG
-
-#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
-
- /* Following cpp computation of the bit length of int and long */
- /* is copied from default include/freetype/config/ftconfig.h. */
- /* If any improvement is required for this file, it should be */
- /* applied to the original header file for the builders that */
- /* does not use configure script. */
-
/* The size of an `int' type. */
#if FT_UINT_MAX == 0xFFFFUL
#define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
@@ -115,9 +94,7 @@
#error "Unsupported size of `long' type!"
#endif
-#endif /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
-
/* Preferred alignment of data */
#define FT_ALIGNMENT 8
@@ -168,29 +145,73 @@
#endif
- /* Fix compiler warning with sgi compiler */
-#if defined( __sgi ) && !defined( __GNUC__ )
-#if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 )
-#pragma set woff 3505
-#endif
-#endif
+ /*************************************************************************/
+ /* */
+ /* <Section> */
+ /* basic_types */
+ /* */
+ /*************************************************************************/
/*************************************************************************/
/* */
- /* IntN types */
+ /* <Type> */
+ /* FT_Int16 */
/* */
- /* Used to guarantee the size of some specific integers. */
+ /* <Description> */
+ /* A typedef for a 16bit signed integer type. */
/* */
- typedef signed short FT_Int16;
+ typedef signed short FT_Int16;
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_UInt16 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 16bit unsigned integer type. */
+ /* */
typedef unsigned short FT_UInt16;
-#if FT_SIZEOF_INT == 4
+ /* */
+
+ /* this #if 0 ... #endif clause is for documentation purposes */
+#if 0
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_Int32 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 32bit signed integer type. The size depends on */
+ /* the configuration. */
+ /* */
+ typedef signed XXX FT_Int32;
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_UInt32 */
+ /* */
+ /* A typedef for a 32bit unsigned integer type. The size depends on */
+ /* the configuration. */
+ /* */
+ typedef unsigned XXX FT_UInt32;
+
+ /* */
+
+#endif
+
+#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
+
typedef signed int FT_Int32;
typedef unsigned int FT_UInt32;
-#elif FT_SIZEOF_LONG == 4
+#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
typedef signed long FT_Int32;
typedef unsigned long FT_UInt32;
@@ -201,12 +222,12 @@
/* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= 4
+#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
typedef int FT_Fast;
typedef unsigned int FT_UFast;
-#elif FT_SIZEOF_LONG >= 4
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list