From: Oleg Oshmyan <chortos@inbox.lv>
Date: Fri, 10 Mar 2017 19:53:33 +0000 (+0200)
Subject: Actually set Fontconfig configuration path (#611)
X-Git-Tag: 1.1.0~650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe8b106dc881aa1e7e0c6f0b57f21795b98afa3;p=handbrake

Actually set Fontconfig configuration path (#611)

Option --with-fcpath does not exist and never did.
We had a patch that added it, but the patch has been removed.
Use the standard option instead.
---

diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index 2423ccc27..d585b3191 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -91,13 +91,13 @@ ifeq (darwin,$(BUILD.system))
 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-baseconfigdir=/usr/X11/lib/X11/fontconfig \
     --with-cache-dir=~/Library/Caches/fontconfig \
     --with-default-fonts=/Library/Fonts \
     --with-add-fonts=/System/Library/Fonts,/Library/Fonts,~/Library/Fonts
 else ifeq (linux,$(BUILD.system))
 FONTCONFIG.CONFIGURE.extra += \
-    --with-fcpath=/etc/fonts \
+    --with-baseconfigdir=/etc/fonts \
     --with-cache-dir=/var/cache/fontconfig
 endif