contrib: ass: remove useless condition

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

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 8e6dae4579fed97993d7fdb223d91ba865582ef6..a8b87764301af920dd9c0a031b9bab1b4d086b5d 100644 (file)
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -1,12 +1,30 @@
 # ASS
-ASS_VERSION := 0.10.0
-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"),)
 PKGS_FOUND += ass
 endif
 
+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))
 
@@ -14,12 +32,27 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
 
 libass: libass-$(ASS_VERSION).tar.gz .sum-ass
        $(UNPACK)
+       $(APPLY) $(SRC)/ass/ass-macosx.patch
+       $(UPDATE_AUTOCONFIG)
        $(MOVE)
 
-DEPS_ass = freetype2 $(DEPS_freetype2) fontconfig $(DEPS_fontconfig) fribidi
+DEPS_ass = freetype2 $(DEPS_freetype2) fribidi
+
+ASS_CONF=--disable-enca
+
+ifneq ($(WITH_FONTCONFIG), 0)
+DEPS_ass += fontconfig $(DEPS_fontconfig)
+else
+ASS_CONF += --disable-fontconfig
+endif
+
+ifneq ($(WITH_HARFBUZZ), 0)
+DEPS_ass += harfbuzz $(DEPS_harfbuzz)
+else
+ASS_CONF += --disable-harfbuzz
+endif
 
 .ass: libass
-       #$(RECONF)
-       cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-enca
+       cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(ASS_CONF)
        cd $< && $(MAKE) install
        touch $@