vlc | branch: master | Sean McGovern <[email protected]> | Wed Jan 28 20:17:19 2015 -0500| [21c4f629ce6ed85dd1a4bd9133d7e44b17a61e9a] | committer: Jean-Baptiste Kempf
libbluray: depend on fontconfig as necessary This is a new requirement for libbluray 0.7.0. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21c4f629ce6ed85dd1a4bd9133d7e44b17a61e9a --- contrib/src/bluray/rules.mak | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index 1f1b24b..e914c34 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -10,12 +10,32 @@ ifeq ($(call need_pkg,"libbluray >= 0.5.0"),) PKGS_FOUND += bluray endif +ifdef HAVE_ANDROID +WITH_FONTCONFIG = 0 +else +ifdef HAVE_IOS +WITH_FONTCONFIG = 0 +else +ifdef HAVE_WIN32 +WITH_FONTCONFIG = 0 +else +WITH_FONTCONFIG = 1 +endif +endif +endif + DEPS_bluray = libxml2 $(DEPS_libxml2) freetype2 $(DEPS_freetype2) BLURAY_CONF = --disable-examples \ --with-libxml2 \ --enable-bdjava +ifneq ($(WITH_FONTCONFIG), 0) +DEPS_bluray += fontconfig $(DEPS_fontconfig) +else +BLURAY_CONF += --without-fontconfig +endif + $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2: $(call download,$(BLURAY_URL)) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
