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 /libhb | |
| 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 'libhb')
| -rw-r--r-- | libhb/module.defs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index 8ea828bfa..616fcb323 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,8 +1,12 @@ -__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \ +__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \ LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \ LIBXML2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \ HARFBUZZ LIBOPUS +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) + __deps__ += FONTCONFIG +endif + $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.GCC,LIBHB)) @@ -122,7 +126,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - ass avcodec avformat avfilter avutil avresample dvdnav dvdread fontconfig \ + ass avcodec avformat avfilter avutil avresample dvdnav dvdread \ freetype mp3lame samplerate swscale vpx theora vorbis vorbisenc ogg \ x264 xml2 bluray jansson harfbuzz opus, \ $(CONTRIB.build/)lib/lib$(n).a ) |