Revision: 33898
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33898
Author: damien78
Date: 2010-12-27 10:29:17 +0100 (Mon, 27 Dec 2010)
Log Message:
-----------
OSX 10.4 i386 libs: update freetype to 2.4.4
Modified Paths:
--------------
trunk/lib/darwin-8.x.i386/README
trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftconfig.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftheader.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftmodule.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftoption.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftstdlib.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/freetype.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftbbox.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftbdf.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftbitmap.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftcache.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftchapters.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/fterrdef.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/fterrors.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftglyph.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftgzip.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftimage.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftincrem.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftlist.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftlzw.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftmac.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftmm.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftmodapi.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftotval.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftoutln.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftpfr.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftrender.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftsizes.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftsnames.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftstroke.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftsynth.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftsystem.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/fttrigon.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/fttypes.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftwinfnt.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftxf86.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/t1tables.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ttnameid.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/tttables.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/tttags.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ttunpat.h
trunk/lib/darwin-8.x.i386/freetype/include/ft2build.h
trunk/lib/darwin-8.x.i386/freetype/lib/libfreetype.a
Added Paths:
-----------
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftadvanc.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftcid.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftgasp.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftgxval.h
trunk/lib/darwin-8.x.i386/freetype/include/freetype/ftlcdfil.h
Removed Paths:
-------------
trunk/lib/darwin-8.x.i386/freetype/include/freetype/internal/
Modified: trunk/lib/darwin-8.x.i386/README
===================================================================
--- trunk/lib/darwin-8.x.i386/README 2010-12-27 09:19:57 UTC (rev 33897)
+++ trunk/lib/darwin-8.x.i386/README 2010-12-27 09:29:17 UTC (rev 33898)
@@ -1,3 +1,4 @@
+freetype (version 2.4.4)
lcms (version 1.19)
tiff (version 3.9.2)
ffmpeg (version 0.6.1)
@@ -14,6 +15,9 @@
The following configuration parameters were used to build the libs:
+FREETYPE:
+./configure --build=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386
-march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -march=prescott -isysroot
/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386
-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+
LCMS:
./configure --disable-shared --build=i386-apple-darwin8.11.0 CC="gcc-4.0"
CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot
/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386
-mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-mmacosx-version-min=10.4"
CPPFLAGS="-I/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/jpeg/include
-I/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/tiff/include"
LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot
/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
-L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/jpeg/lib
-L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/tiff/lib"
Modified: trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftconfig.h
===================================================================
--- trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftconfig.h
2010-12-27 09:19:57 UTC (rev 33897)
+++ trunk/lib/darwin-8.x.i386/freetype/include/freetype/config/ftconfig.h
2010-12-27 09:29:17 UTC (rev 33898)
@@ -4,7 +4,7 @@
/* */
/* ANSI-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 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, */
@@ -35,7 +35,6 @@
/* */
/*************************************************************************/
-
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
@@ -43,6 +42,7 @@
#include FT_CONFIG_OPTIONS_H
#include FT_CONFIG_STANDARD_LIBRARY_H
+
FT_BEGIN_HEADER
@@ -126,19 +126,86 @@
/* */
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
( defined( __MWERKS__ ) && defined( macintosh ) )
+ /* no Carbon frameworks for 64bit 10.4.x */
+#include "AvailabilityMacros.h"
+#if defined( __LP64__ ) && \
+ ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
+#define DARWIN_NO_CARBON 1
+#else
#define FT_MACINTOSH 1
#endif
+#elif defined( __SC__ ) || defined( __MRC__ )
+ /* Classic MacOS compilers */
+#include "ConditionalMacros.h"
+#if TARGET_OS_MAC
+#define FT_MACINTOSH 1
+#endif
+#endif
+
+
/*************************************************************************/
/* */
- /* IntN types */
+ /* <Section> */
+ /* basic_types */
/* */
- /* Used to guarantee the size of some specific integers. */
+ /*************************************************************************/
+
+
+ /*************************************************************************/
/* */
- typedef signed short FT_Int16;
+ /* <Type> */
+ /* FT_Int16 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 16bit signed integer type. */
+ /* */
+ typedef signed short FT_Int16;
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_UInt16 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 16bit unsigned integer type. */
+ /* */
typedef unsigned short FT_UInt16;
+ /* */
+
+
+ /* 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;
@@ -153,6 +220,7 @@
#error "no 32bit type found -- please check your configuration files"
#endif
+
/* look up an integer type that is at least 32 bits */
#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
@@ -201,24 +269,19 @@
#elif defined( __GNUC__ )
- /* GCC provides the "long long" type */
+ /* GCC provides the `long long' type */
#define FT_LONG64
#define FT_INT64 long long int
#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
-#define FT_BEGIN_STMNT do {
-#define FT_END_STMNT } while ( 0 )
-#define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
-
-
/*************************************************************************/
/* */
/* A 64-bit data type will create compilation problems if you compile */
- /* in strict ANSI mode. To avoid them, we disable their use if */
- /* __STDC__ is defined. You can however ignore this rule by */
- /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */
+ /* in strict ANSI mode. To avoid them, we disable its use if __STDC__ */
+ /* is defined. You can however ignore this rule by defining the */
+ /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */
/* */
#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
@@ -233,6 +296,115 @@
#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
+#define FT_BEGIN_STMNT do {
+#define FT_END_STMNT } while ( 0 )
+#define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
+
+
+#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER
+ /* Provide assembler fragments for performance-critical functions. */
+ /* These must be defined `static __inline__' with GCC. */
+
+#if defined( __CC_ARM ) || defined( __ARMCC__ ) /* RVCT */
+#define FT_MULFIX_ASSEMBLER FT_MulFix_arm
+
+ /* documentation is in freetype.h */
+
+ static __inline FT_Int32
+ FT_MulFix_arm( FT_Int32 a,
+ FT_Int32 b )
+ {
+ register FT_Int32 t, t2;
+
+
+ __asm
+ {
+ smull t2, t, b, a /* (lo=t2,hi=t) = a*b */
+ mov a, t, asr #31 /* a = (hi >> 31) */
+ add a, a, #0x8000 /* a += 0x8000 */
+ adds t2, t2, a /* t2 += a */
+ adc t, t, #0 /* t += carry */
+ mov a, t2, lsr #16 /* a = t2 >> 16 */
+ orr a, a, t, lsl #16 /* a |= t << 16 */
+ }
+ return a;
+ }
+
+#endif /* __CC_ARM || __ARMCC__ */
+
+
+#ifdef __GNUC__
+
+#if defined( __arm__ ) && !defined( __thumb__ ) && \
+ !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+#define FT_MULFIX_ASSEMBLER FT_MulFix_arm
+
+ /* documentation is in freetype.h */
+
+ static __inline__ FT_Int32
+ FT_MulFix_arm( FT_Int32 a,
+ FT_Int32 b )
+ {
+ register FT_Int32 t, t2;
+
+
+ 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 */
+ "adds %1, %1, %0\n\t" /* %1 += %0 */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
