]> granicus.if.org Git - handbrake/commitdiff
Actually set Fontconfig configuration path (#611)
authorOleg Oshmyan <chortos@inbox.lv>
Fri, 10 Mar 2017 19:53:33 +0000 (21:53 +0200)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Fri, 10 Mar 2017 19:53:33 +0000 (12:53 -0700)
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.

contrib/fontconfig/module.defs

index 2423ccc278e9bf530fa337c99d5b8357a69d52de..d585b3191d11878de2d5f2aae699d39563fe01cf 100644 (file)
@@ -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