vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Mar 27 20:49:47 2017 +0300| [b1228330915ca11634a3086957752495666df71b] | committer: Rémi Denis-Courmont
fontconfig: require version 2.11 (fixes #3314) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1228330915ca11634a3086957752495666df71b --- configure.ac | 2 +- contrib/src/fontconfig/rules.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 02c2a27..9042e59 100644 --- a/configure.ac +++ b/configure.ac @@ -3171,7 +3171,7 @@ if test "${enable_freetype}" != "no"; then dnl fontconfig support AS_IF([test "${enable_fontconfig}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "darwin"], [ - PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [ + PKG_CHECK_MODULES(FONTCONFIG, [fontconfig >= 2.11], [ have_fontconfig="yes" ], [ AC_MSG_WARN([${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType.]) diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak index 1a8319b..0da125f 100644 --- a/contrib/src/fontconfig/rules.mak +++ b/contrib/src/fontconfig/rules.mak @@ -4,7 +4,7 @@ FONTCONFIG_VERSION := 2.11.1 FONTCONFIG_URL := https://www.freedesktop.org/software/fontconfig/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz PKGS += fontconfig -ifeq ($(call need_pkg,"fontconfig >= 2.10.92"),) +ifeq ($(call need_pkg,"fontconfig >= 2.11"),) PKGS_FOUND += fontconfig endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
