From: ritsuka <damiog@gmail.com>
Date: Sun, 1 Feb 2015 16:55:58 +0000 (+0000)
Subject: [merged] Add a default font directory for fontconfig to use when there isn't a config... 
X-Git-Tag: 0.10.1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78fc8ecf71dbcf2fd478e83aa770c97708053551;p=handbrake

[merged] Add a default font directory for fontconfig to use when there isn't a configuration file available. Move the font cache to the user directory.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6859 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index b527731ec..0bf942179 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -86,7 +86,9 @@ FONTCONFIG.CONFIGURE.extra += \
     LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
     LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
     --with-fcpath=/usr/X11/lib/X11/fontconfig \
-    --with-cache-dir=/usr/X11/var/cache/fontconfig
+    --with-cache-dir=~/Library/Caches/fontconfig \
+    --with-default-fonts=/Library/Fonts \
+    --with-add-fonts=/System/Library/Fonts,~/Library/Fonts
 else ifeq (linux,$(BUILD.system))
 FONTCONFIG.CONFIGURE.extra += \
     --with-fcpath=/etc/fonts \