diff options
| author | Oleg Oshmyan <[email protected]> | 2017-03-12 18:31:36 +0200 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2017-03-12 10:31:36 -0600 |
| commit | bd78a82b032a48d9f382c56ddc72529a047c0893 (patch) | |
| tree | 37610a430682e02e25a23c2c4aca6e1d9efa5aaf /contrib/libass | |
| parent | 3a4beb186fcb6b6000f12cd421afcc2e0922528a (diff) | |
Remove Fontconfig on Windows (#610)
* Remove Fontconfig on Windows
Let libass use its DirectWrite font provider backend instead of Fontconfig.
This eliminates Fontconfig's font cache generation delay that occurred
at the start of an encode after a system font was (un)installed or when
HandBrake was installed and used to burn text subtitles for the first time.
* Remove LibHB's dependency on Fontconfig when it's not used
Diffstat (limited to 'contrib/libass')
| -rw-r--r-- | contrib/libass/module.defs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs index 820171443..0d9ca099a 100644 --- a/contrib/libass/module.defs +++ b/contrib/libass/module.defs @@ -1,6 +1,6 @@ __deps__ := YASM FREETYPE FRIBIDI HARFBUZZ -ifneq ($(BUILD.system),darwin) +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) __deps__ += FONTCONFIG endif @@ -17,7 +17,7 @@ LIBASS.CONFIGURE.extra = \ FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \ FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \ -ifneq ($(BUILD.system),darwin) +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) # Tell configure where to find our version of fontconfig LIBASS.CONFIGURE.extra += \ --enable-fontconfig \ @@ -39,7 +39,3 @@ ifneq (1,$(BUILD.cross)) LIBASS.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" endif endif - -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) - LIBASS.CONFIGURE.extra += --disable-directwrite -endif |