vlc | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Mon Nov 23 
11:00:23 2015 +0100| [c1678d6a45eaf9d13f49a35db67bfdb5effa7a61] | committer: 
Felix Paul Kühne

contrib/harfbuzz: explicitly enable CoreText support on Darwin

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

 contrib/src/harfbuzz/rules.mak |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 59a8ec4..26a1267 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -7,6 +7,12 @@ ifeq ($(call need_pkg,"harfbuzz"),)
 PKGS_FOUND += harfbuzz
 endif
 
+HARFBUZZCONF = --with-icu=no --with-glib=no --with-fontconfig=no
+
+#ifdef HAVE_DARWIN_OS
+HARFBUZZCONF += --with-coretext=yes
+#endif
+
 $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
        $(call download,$(HARFBUZZ_URL))
 
@@ -23,6 +29,6 @@ DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 
 .harfbuzz: harfbuzz
        cd $< && env NOCONFIGURE=1 sh autogen.sh
-       cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS)" ./configure $(HOSTCONF) 
--with-icu=no --with-glib=no --with-fontconfig=no
+       cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS)" ./configure $(HOSTCONF) 
$(HARFBUZZCONF)
        cd $< && $(MAKE) install
        touch $@

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to