Skip to content

Commit

Permalink
Add fontconfig to linux DEPS for embedded builds (reland)
Browse files Browse the repository at this point in the history
We'll use this in-tree fontconfig when "embedded=1" is set in GYP_DEFINES.

This was reverted pending license checker changes (landed as r127213003).

Relanding with the following changes from the third_party HOWTO:
  - Added OWNERS file
  - Updated .gitignore

BUG=318315

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244318 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
spang@chromium.org committed Jan 11, 2014
1 parent 98746fb commit d412cf4
Show file tree
Hide file tree
Showing 21 changed files with 6,925 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ v8.log
/third_party/ffmpeg
/third_party/findbugs
/third_party/flac
/third_party/fontconfig/src
/third_party/freetype
/third_party/freetype2/src
/third_party/gles2_conform
Expand Down
4 changes: 4 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,10 @@ deps_os = {
Var("chromium_git") +
"/external/liblouis.git@3c2daee56250162e5a75830871601d74328d39f5",

# Used for embedded builds. CrOS & Linux use the system version.
"src/third_party/fontconfig/src":
Var("chromium_git") + "/external/fontconfig.git" +
"@4f944971dac3c0bbc6fdd3bf3123e3c8378a3acb",
},
"android": {
"src/third_party/android_tools":
Expand Down
3 changes: 3 additions & 0 deletions third_party/fontconfig/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
spang@chromium.org
rjkroege@chromium.org
spang@chromium.org
20 changes: 20 additions & 0 deletions third_party/fontconfig/README.chromium
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Name: fontconfig
URL: http://www.freedesktop.org/wiki/Software/fontconfig/
Version: 2.11.0
License: MIT
License File: src/COPYING
Security Critical: yes

Description:
Fontconfig is a library for configuring and customizing font access.

Modifications:
- None

To import a new snapshot of fontconfig:
- Checkout the latest release tag: git checkout 2.11.0
- Change the DEPS entry to the newly checked out commit.
- Update generated files:
./autogen.sh --enable-libxml2 && make
rsync -R $(git ls-files --others '*.h' '*/*.h') ../include
- Update this README to reflect the new version number.
62 changes: 62 additions & 0 deletions third_party/fontconfig/fontconfig.gyp
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

{
'targets': [
{
'target_name': 'fontconfig',
'type': '<(component)',
'dependencies' : [
'../zlib/zlib.gyp:zlib',
'../../build/linux/system.gyp:freetype2',
'../libxml/libxml.gyp:libxml',
],
'defines': [
'HAVE_CONFIG_H',
'FC_CACHEDIR="/var/cache/fontconfig"',
'FONTCONFIG_PATH="/etc/fonts"',
],
'sources': [
'src/src/fcarch.h',
'src/src/fcatomic.c',
'src/src/fcblanks.c',
'src/src/fccache.c',
'src/src/fccfg.c',
'src/src/fccharset.c',
'src/src/fccompat.c',
'src/src/fcdbg.c',
'src/src/fcdefault.c',
'src/src/fcdir.c',
'src/src/fcformat.c',
'src/src/fcfreetype.c',
'src/src/fcfs.c',
'src/src/fchash.c',
'src/src/fcinit.c',
'src/src/fclang.c',
'src/src/fclist.c',
'src/src/fcmatch.c',
'src/src/fcmatrix.c',
'src/src/fcname.c',
'src/src/fcobjs.c',
'src/src/fcpat.c',
'src/src/fcserialize.c',
'src/src/fcstat.c',
'src/src/fcstr.c',
'src/src/fcxml.c',
'src/src/ftglue.h',
'src/src/ftglue.c',
],
'include_dirs': [
'src',
'include',
'include/src',
],
'direct_dependent_settings': {
'include_dirs': [
'src',
],
},
},
],
}
Loading

0 comments on commit d412cf4

Please sign in to comment.