vlc | branch: master | Edward Wang <[email protected]> | Sun Aug 12 
20:15:35 2012 -0400| [4bea14e2a98be2b49e958986e25e9994977c201e] | committer: 
Rafaël Carré

contrib: disable harfbuzz on Android

For consistency with 691e604cd61e5285e69faa6f99647f6bcea817ef, libass doesn't 
need harfbuzz on Android. (It doesn't build anyway.)

Signed-off-by: Rafaël Carré <[email protected]>

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

 contrib/src/ass/rules.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 2d1099d..fa6f6d0 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -9,11 +9,11 @@ endif
 
 ifdef HAVE_ANDROID
 WITH_FONTCONFIG = 0
+WITH_HARFBUZZ = 0
 else
 WITH_FONTCONFIG = 1
-endif
-
 WITH_HARFBUZZ = 1
+endif
 
 $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
        $(call download,$(ASS_URL))

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to