From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 8 Oct 2006 13:01:14 +0000 (+0000)
Subject: Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
X-Git-Tag: 0.9.7~426
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=774a2730873f30542adb83f35e7c5b81e52c2f4a;p=libass

Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
and warn that these are beta versions and not supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2
---

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index cc97250..6850215 100644
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -175,8 +175,12 @@ fc_instance_t* fontconfig_init(const char* dir, const char* family, const char*
 	if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse)
 	{
 		mp_msg(MSGT_GLOBAL, MSGL_INFO, "[ass] Updating font cache\n");
+		if (FcGetVersion() >= 20390 && FcGetVersion() < 20400)
+			mp_msg(MSGT_GLOBAL, MSGL_WARN,
+			       "[ass] beta versions of fontconfig are not supported\n"
+			       "      update before reporting any bugs\n");
 		// FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir()
-		if (FcGetVersion() < 20400) {
+		if (FcGetVersion() < 20390) {
 			FcFontSet* fcs;
 			FcStrSet* fss;
 			fcs = FcFontSetCreate();