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

(cherry picked from commit bd78a82b032a48d9f382c56ddc72529a047c0893)

diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 8201714439b82d406285345afbea309a4dd070ce..0d9ca099a27fc1e8bc1f4a8d8d4c065478f5176a 100644 (file)
--- 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

diff --git a/libhb/module.defs b/libhb/module.defs
index 8ea828bfa34af791a091b72f5f9afa81a79c57dc..616fcb323db6715dd7b45e2c13e6310589faab69 100644 (file)
--- 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 )

diff --git a/make/include/main.defs b/make/include/main.defs
index a2ca1ded858887ffe1ab40ebdbdcfc6766993399..07bdd31cb238dfef2fe0bb1925fae41b4bafaf0f 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -41,10 +41,6 @@ ifneq ($(HAS.bz2),1)
 endif
 endif
 
-ifneq (,$(filter $(BUILD.system),cygwin mingw))
-    MODULES += contrib/fontconfig
-endif
-
 ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
     MODULES += contrib/freetype
     MODULES += contrib/fribidi

diff --git a/test/module.defs b/test/module.defs
index 5f19ebecc9187e7843df3f0d5d077cff94aa7a61..1202a657f60606c88654c538d2f900bef57f0c3d 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -19,7 +19,7 @@ TEST.GCC.l = \
         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
         bluray freetype xml2 bz2 z jansson harfbuzz opus
 
-ifneq ($(BUILD.system),darwin)
+ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
     TEST.GCC.l += fontconfig
 endif