disable fontconfig on macOS

2 files changed, 34 insertions, 16 deletions

diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
index f252c0417..07415f3f3 100644
--- a/contrib/harfbuzz/module.defs
+++ b/contrib/harfbuzz/module.defs
@@ -1,4 +1,9 @@
-__deps__ := FONTCONFIG FREETYPE
+__deps__ := FREETYPE
+
+ifneq ($(BUILD.system),darwin)
+    __deps__ += FONTCONFIG
+endif
+
 $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,HARFBUZZ))
 
@@ -6,16 +11,20 @@ HARFBUZZ.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/harfbuz
 HARFBUZZ.FETCH.url    += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.0.tar.bz2
 HARFBUZZ.FETCH.sha256  = b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d
 
-# Tell configure where to find our versions of freetype and fontconfig
+# Tell configure where to find our version of freetype
 HARFBUZZ.CONFIGURE.extra = \
-    --with-fontconfig=yes --with-freetype=yes \
+    --with-freetype=yes \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
-    FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
 
-ifeq ($(BUILD.system),darwin)
-    HARFBUZZ.CONFIGURE.extra += --with-coretext=no --with-glib=no
+ifneq ($(BUILD.system),darwin)
+	# Tell configure where to find our version of fontconfig
+	HARFBUZZ.CONFIGURE.extra += \
+	    --with-fontconfig=yes \
+	    FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
+	    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+else
+    HARFBUZZ.CONFIGURE.extra += --with-coretext=yes --with-fontconfig=no --with-glib=no
 endif
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 0b68ff058..820171443 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -1,4 +1,9 @@
-__deps__ := YASM FONTCONFIG FREETYPE FRIBIDI HARFBUZZ
+__deps__ := YASM FREETYPE FRIBIDI HARFBUZZ
+
+ifneq ($(BUILD.system),darwin)
+    __deps__ += FONTCONFIG
+endif
+
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
@@ -6,13 +11,21 @@ LIBASS.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libass-0.
 LIBASS.FETCH.url    += https://github.com/libass/libass/releases/download/0.13.2/libass-0.13.2.tar.gz
 LIBASS.FETCH.sha256  = 8baccf663553b62977b1c017d18b3879835da0ef79dc4d3b708f2566762f1d5e
 
-# Tell configure where to find our versions of freetype and fontconfig
+# Tell configure where to find our version of freetype
 LIBASS.CONFIGURE.extra = \
-    --enable-asm --enable-fontconfig --enable-harfbuzz \
+    --enable-asm --enable-harfbuzz \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
-    FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+
+ifneq ($(BUILD.system),darwin)
+    # Tell configure where to find our version of fontconfig
+    LIBASS.CONFIGURE.extra += \
+        --enable-fontconfig \
+        FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
+        FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+else
+    LIBASS.CONFIGURE.extra += --disable-fontconfig
+endif
 
 ifneq ($(BUILD.system),linux)
     LIBASS.CONFIGURE.extra += \
@@ -27,10 +40,6 @@ ifneq (1,$(BUILD.cross))
     endif
 endif
 
-ifeq ($(BUILD.system),darwin)
-    LIBASS.CONFIGURE.extra += --disable-coretext
-endif
-
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     LIBASS.CONFIGURE.extra += --disable-directwrite
 endif