diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 15:51:12 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 15:51:12 +0000 |
| commit | bcc6d7d390083c6c8ce04b2078ee2904399b8435 (patch) | |
| tree | 726bce9e5cc0d9391a0cf64aa3758b84bab92b48 | |
| parent | a82c9eb5984d7bac69980a52ecac8bbc032802e1 (diff) | |
Update freetype to version 2.5.0.1 when building it from 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
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | gyp/freetype.gyp | 4 | ||||
| -rw-r--r-- | gyp/images.gyp | 3 | ||||
| -rw-r--r-- | third_party/freetype/include_overrides/freetype/config/ftmodule.h | 37 | ||||
| -rw-r--r-- | third_party/freetype/include_overrides/freetype/config/ftoption.h (renamed from third_party/freetype/config/ftoption.h) | 0 |
5 files changed, 43 insertions, 3 deletions
@@ -12,7 +12,7 @@ deps = { # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279) # 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/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/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3", "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b", diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index 8800674f6f..91c92b7522 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -79,12 +79,11 @@ # auxiliary modules (optional) '../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/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ - '../third_party/freetype', + '../third_party/freetype/include_overrides', '../third_party/externals/freetype/internal', '../third_party/externals/freetype/builds', '../third_party/externals/freetype/include', @@ -95,6 +94,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ + '../third_party/freetype/include_overrides', '../third_party/externals/freetype/include', ], }, diff --git a/gyp/images.gyp b/gyp/images.gyp index 76df7d178e..6d3b009f63 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -136,6 +136,9 @@ 'android_deps.gyp:gif', 'android_deps.gyp:png', ], + 'export_dependent_settings': [ + 'android_deps.gyp:png' + ], },{ #else if skia_os != android 'sources!': [ '../src/images/SkImageRef_ashmem.h', diff --git a/third_party/freetype/include_overrides/freetype/config/ftmodule.h b/third_party/freetype/include_overrides/freetype/config/ftmodule.h new file mode 100644 index 0000000000..445c3b6ac4 --- /dev/null +++ b/third_party/freetype/include_overrides/freetype/config/ftmodule.h @@ -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 */ diff --git a/third_party/freetype/config/ftoption.h b/third_party/freetype/include_overrides/freetype/config/ftoption.h index 0894625216..0894625216 100644 --- a/third_party/freetype/config/ftoption.h +++ b/third_party/freetype/include_overrides/freetype/config/ftoption.h |