Commit ac288cfa authored by Sean McGovern's avatar Sean McGovern Committed by Jean-Baptiste Kempf

libbluray: depend on fontconfig as necessary

This is a new requirement for libbluray 0.7.0.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 21c4f629ce6ed85dd1a4bd9133d7e44b17a61e9a)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 95182667
......@@ -10,6 +10,20 @@ 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 \
......@@ -17,6 +31,12 @@ BLURAY_CONF = --disable-examples \
--enable-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))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment