]> git.sesse.net Git - vlc/commitdiff
libbluray: depend on fontconfig as necessary
authorSean McGovern <gseanmcg@gmail.com>
Thu, 29 Jan 2015 01:17:19 +0000 (20:17 -0500)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 29 Jan 2015 12:08:31 +0000 (13:08 +0100)
This is a new requirement for libbluray 0.7.0.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
contrib/src/bluray/rules.mak

index 1f1b24bd136ec2b3dee9d203a148508367fa5472..e914c3425f1b1ff0f3763f911f383d74374aeb9e 100644 (file)
@@ -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))