diff options
author | Damiano Galassi <[email protected]> | 2017-01-18 10:47:13 +0100 |
---|---|---|
committer | Damiano Galassi <[email protected]> | 2017-01-18 12:11:12 +0100 |
commit | 81550230adc2359d7ec4f5cff6a5c960b7df7e6e (patch) | |
tree | 6cc1e547017c494c4e54156054d597eb321c8ced /contrib/libass/module.defs | |
parent | 922db9bec26e1def4c8ba60afb2147cc06ec524d (diff) |
disable fontconfig on macOS
Diffstat (limited to 'contrib/libass/module.defs')
-rw-r--r-- | contrib/libass/module.defs | 27 |
1 files changed, 18 insertions, 9 deletions
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 |