[vlc-commits] contrib: make sure freetype depends on zlib

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Sat Sep  6 18:09:58 2014 +0200| [e72c10bf1fb6d4a820695936bacaa86d7c49fde0] | committer: Jean-Baptiste Kempf

contrib: make sure freetype depends on zlib

(cherry picked from commit 8f6f849be5322de77a5acc0a6d8e1fe978000573)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/freetype2/rules.mak |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/freetype2/rules.mak b/contrib/src/freetype2/rules.mak
index bbbf05b..9f5ad23 100644
--- a/contrib/src/freetype2/rules.mak
+++ b/contrib/src/freetype2/rules.mak
@@ -15,10 +15,13 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.gz:
 
 freetype: freetype-$(FREETYPE2_VERSION).tar.gz .sum-freetype2
 	$(UNPACK)
+	$(call pkg_static, "builds/unix/freetype2.in")
 	$(MOVE)
 
+DEPS_freetype = zlib $(DEPS_zlib)
+
 .freetype2: freetype
 	sed -i.orig s/-ansi// $</builds/unix/configure
-	cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --without-png $(HOSTCONF)
+	cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --with-zlib=yes --without-png $(HOSTCONF)
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@