[vlc-commits] contrib: harfbuzz: remove outdated conf

Steve Lhomme git at videolan.org
Fri May 18 17:50:42 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May 18 17:39:33 2018 +0200| [12b9ba58634a51a70da6d6e312374aa9453cd863] | committer: Steve Lhomme

contrib: harfbuzz: remove outdated conf

Everything is off by default with cmake.

We don't use freetype either so don't depend on it.

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

 contrib/src/harfbuzz/rules.mak | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 3ccdcc7ca5..45e6e94a2f 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -7,8 +7,6 @@ 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
@@ -24,8 +22,6 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
 	$(MOVE)
 
-DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
-
 .harfbuzz: harfbuzz toolchain.cmake
 	cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \
 		-DBUILD_SHARED_LIBS:BOOL=OFF \



More information about the vlc-commits mailing list