Commit 25128f37 authored by Naohiro KORIYAMA's avatar Naohiro KORIYAMA Committed by Felix Paul Kühne

contrib: libass added fontconfig font search paths for OS X.

On OS X, fontconfig searches font only from /System/Library/Fonts, so this patch adds more search paths to its initialization.
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 6bad0899ef262508992233fb12c35578f10165d5)
parent 0401bdcd
--- libass/libass/ass_fontconfig.c 2011-09-01 23:26:35.000000000 +0200
+++ libass-fixed/libass/ass_fontconfig.c 2012-09-01 14:34:17.000000000 +0200
@@ -442,6 +442,11 @@
"file found, using fallback.");
FcConfigDestroy(priv->config);
priv->config = FcInitLoadConfig();
+#ifdef __APPLE__
+ FcConfigAppFontAddDir(priv->config, "~/Library/Fonts");
+ FcConfigAppFontAddDir(priv->config, "/Library/Fonts");
+ FcConfigAppFontAddDir(priv->config, "/Network/Library/Fonts");
+#endif
rc++;
}
if (rc && update) {
......@@ -14,6 +14,9 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/ass/ass-macosx.patch
endif
$(MOVE)
DEPS_ass = freetype2 $(DEPS_freetype2) fontconfig $(DEPS_fontconfig) fribidi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment