[vlc-devel] [PATCH] libbluray: depend on fontconfig as necessary

[Sean McGovern]

This is a new requirement for libbluray 0.7.0.
---
 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 332864f..d0710a2 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_WINRT
+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))
 
-- 
1.7.9.2