contrib: fix freetype dependencies

[vlc] / contrib / src / ass / rules.mak

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index e9470e37e0d85133335d43e28fbd3dde6b7e76a1..a8b87764301af920dd9c0a031b9bab1b4d086b5d 100644 (file)
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -1,6 +1,6 @@
 # ASS
-ASS_VERSION := 0.10.1
-ASS_URL := http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.gz
+ASS_VERSION := 0.11.2
+ASS_URL := https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
 
 PKGS += ass
 ifeq ($(call need_pkg,"libass"),)
@@ -11,9 +11,19 @@ ifdef HAVE_ANDROID
 WITH_FONTCONFIG = 0
 WITH_HARFBUZZ = 0
 else
+ifdef HAVE_IOS
+WITH_FONTCONFIG = 0
+WITH_HARFBUZZ = 1
+else
+ifdef HAVE_WINRT
+WITH_FONTCONFIG = 0
+WITH_HARFBUZZ = 1
+else
 WITH_FONTCONFIG = 1
 WITH_HARFBUZZ = 1
 endif
+endif
+endif
 
 $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
        $(call download,$(ASS_URL))
@@ -22,9 +32,8 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
 
 libass: libass-$(ASS_VERSION).tar.gz .sum-ass
        $(UNPACK)
-ifdef HAVE_MACOSX
        $(APPLY) $(SRC)/ass/ass-macosx.patch
-endif
+       $(UPDATE_AUTOCONFIG)
        $(MOVE)
 
 DEPS_ass = freetype2 $(DEPS_freetype2) fribidi
@@ -44,7 +53,6 @@ ASS_CONF += --disable-harfbuzz
 endif
 
 .ass: libass
-       $(UPDATE_AUTOCONFIG)
        cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(ASS_CONF)
        cd $< && $(MAKE) install
        touch $@