3 files changed, 41 insertions, 11 deletions
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
new file mode 100644
index 000000000..a723180b8
--- /dev/null
+++ b/contrib/harfbuzz/module.defs
@@ -0,0 +1,25 @@
+__deps__ := FONTCONFIG FREETYPE
+$(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
+$(eval $(call import.CONTRIB.defs,HARFBUZZ))
+
+HARFBUZZ.FETCH.url = http://download.handbrake.fr/handbrake/contrib/harfbuzz-1.2.6.tar.bz2
+HARFBUZZ.FETCH.url += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.6.tar.bz2
+HARFBUZZ.FETCH.md5 = 9f4b6831c86135faef011e991f59f77f
+
+# Tell configure where to find our versions of freetype and fontconfig
+HARFBUZZ.CONFIGURE.extra = \
+    --with-fontconfig=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
+endif
+
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    HARFBUZZ.CONFIGURE.extra += --with-directwrite=no --with-glib=no \
+        --with-gobject=no --with-cairo=no --with-icu=no --with-graphite=no \
+        --with-uniscribe=no
+endif
diff --git a/contrib/harfbuzz/module.rules b/contrib/harfbuzz/module.rules
new file mode 100644
index 000000000..dab4f1d1c
--- /dev/null
+++ b/contrib/harfbuzz/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,HARFBUZZ))
+$(eval $(call import.CONTRIB.rules,HARFBUZZ))
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 48a3d4fc1..a13491b76 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -1,19 +1,14 @@
-__deps__ := FONTCONFIG FREETYPE FRIBIDI
+__deps__ := YASM FONTCONFIG FREETYPE FRIBIDI HARFBUZZ
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
-LIBASS.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libass-0.12.3.tar.gz
-LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.12.3/libass-0.12.3.tar.gz
-LIBASS.FETCH.md5 =  648ee785f966c69d4b5d50948e509d93
+LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.13.2.tar.gz
+LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.13.2/libass-0.13.2.tar.gz
+LIBASS.FETCH.md5 = b4d82616bb18e8e954b18746a105a3b8
 
-# TODO: libass >= 0.13.0
-#LIBASS.FETCH.url = https://github.com/libass/libass/releases/download/0.13.0/libass-0.13.0.tar.gz
-#LIBASS.FETCH.md5 = 44290519105b3779b8b25813a25a9914
-
-# Disable as many external dependencies as I can get away with
-# and tell configure where to find our version of freetype
+# Tell configure where to find our versions of freetype and fontconfig
 LIBASS.CONFIGURE.extra = \
-    --disable-png --disable-enca --disable-harfbuzz \
+    --enable-asm --enable-fontconfig --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" \
@@ -24,3 +19,11 @@ LIBASS.CONFIGURE.extra += \
     FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \
     FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
 endif
+
+ifeq ($(BUILD.system),darwin)
+    LIBASS.CONFIGURE.extra += --disable-coretext
+endif
+
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    LIBASS.CONFIGURE.extra += --disable-directwrite
+endif