AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update freetype to version 2.5.0.1 when building it from source.

Browse Source 
R=bungeman@google.com

Review URL: https://codereview.chromium.org/19625006

git-svn-id: http://skia.googlecode.com/svn/trunk@10273 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-07-23 15:51:12 +00:00
parent a82c9eb598
commit bcc6d7d390
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -12,7 +12,7 @@ deps = {
# (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279) # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279)
# NOTE: Angle has been reverted to http://angleproject.googlecode.com/svn/trunk@1268 # NOTE: Angle has been reverted to http://angleproject.googlecode.com/svn/trunk@1268
"third_party/externals/angle" : "https://chromium.googlesource.com/external/angleproject.git@e574e26f48223a6718feab841b4a7720785b497a", "third_party/externals/angle" : "https://chromium.googlesource.com/external/angleproject.git@e574e26f48223a6718feab841b4a7720785b497a",
"third_party/externals/freetype" : "https://android.googlesource.com/platform/external/freetype.git@android-4.2.2_r1.2", "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
"third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@e5179456241c17cb6cdd106e4744882d32081df5", "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@e5179456241c17cb6cdd106e4744882d32081df5",
"third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3", "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3",
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b", "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b",

4
gyp/freetype.gyp
View File

@ -79,12 +79,11 @@
# auxiliary modules (optional) # auxiliary modules (optional)
'../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module
'../third_party/externals/freetype/src/psaux/psaux.c', # PostScript Type 1 parsing
'../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module
'../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support
], ],
'include_dirs': [ 'include_dirs': [
'../third_party/freetype', '../third_party/freetype/include_overrides',
'../third_party/externals/freetype/internal', '../third_party/externals/freetype/internal',
'../third_party/externals/freetype/builds', '../third_party/externals/freetype/builds',
'../third_party/externals/freetype/include', '../third_party/externals/freetype/include',
@ -95,6 +94,7 @@
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'../third_party/freetype/include_overrides',
'../third_party/externals/freetype/include', '../third_party/externals/freetype/include',
], ],
}, },

3
gyp/images.gyp
View File

@ -136,6 +136,9 @@
'android_deps.gyp:gif', 'android_deps.gyp:gif',
'android_deps.gyp:png', 'android_deps.gyp:png',
], ],
'export_dependent_settings': [
'android_deps.gyp:png'
],
},{ #else if skia_os != android },{ #else if skia_os != android
'sources!': [ 'sources!': [
'../src/images/SkImageRef_ashmem.h', '../src/images/SkImageRef_ashmem.h',

37
third_party/freetype/include_overrides/freetype/config/ftmodule.h vendored Normal file
View File

@ -0,0 +1,37 @@
/*
* This file registers the FreeType modules compiled into the library.
*
* If you use GNU make, this file IS NOT USED! Instead, it is created in
* the objects directory (normally `<topdir>/objs/') based on information
* from `<topdir>/modules.cfg'.
*
* Please read `docs/INSTALL.ANY' and `docs/CUSTOMIZE' how to compile
* FreeType without GNU make.
*
*/
FT_USE_MODULE( FT_Module_Class, autofit_module_class )
FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
FT_USE_MODULE( FT_Module_Class, psnames_module_class )
FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
/*
FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
FT_USE_MODULE( FT_Module_Class, psaux_module_class )
FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
*/
/* EOF */

0
third_party/freetype/config/ftoption.h → third_party/freetype/include_overrides/freetype/config/ftoption.h vendored
View File