[vlc-commits] libass doesn't need fontconfig on android

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu May 31 13:58:27 2012 -0400| [691e604cd61e5285e69faa6f99647f6bcea817ef] | committer: Rafaël Carré

libass doesn't need fontconfig on android

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=691e604cd61e5285e69faa6f99647f6bcea817ef
---

 contrib/src/ass/rules.mak |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 8e6dae4..360c15c 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -7,6 +7,12 @@ ifeq ($(call need_pkg,"libass"),)
 PKGS_FOUND += ass
 endif
 
+ifdef HAVE_ANDROID
+WITH_FONTCONFIG = 0
+else
+WITH_FONTCONFIG = 1
+endif
+
 $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
 	$(call download,$(ASS_URL))
 
@@ -16,10 +22,18 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
 	$(UNPACK)
 	$(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
 
 .ass: libass
-	#$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-enca
+	$(UPDATE_AUTOCONFIG)
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(ASS_CONF)
 	cd $< && $(MAKE) install
 	touch $@