vdr-1.7.27 fails on compile against fontconfig-2.9.0

Message ID 1787092639.20120502220838@websitec.de
State New

Commit Message

Joerg Bornkessel May 2, 2012, 8:08 p.m. UTC
  Hallo Klaus,

included a small patch to fix compile problems with fontconfig-2.9.0
Error Message:

vdr: fcmatch.c:850: IA__FcFontSort: Assertion `result != ((void *)0)' failed.


this diff resolve the compile problem,
backwards compatible to fontconfig-2.8.0

iam noticed the patch first time on
IRC #gentoo-vdr
submitted by negril
don't know, if he has written the patch or if he found the patch
somewhere in the wilderness...
May be the patch writer will give i sign here to catch the credits

Yust to informe you, befor vdr-2.0 is available ;)


Joerg Bornkessel May 3, 2012, 8:23 p.m. UTC | #1
> this diff resolve the compile problem,



diff --git a/font.c b/font.c
index 706a017..72c5ec3 100644
--- a/font.c
+++ b/font.c
@@ -482,7 +482,8 @@  cString cFont::GetFontFileName(const char *FontName)
      FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
      FcConfigSubstitute(NULL, pat, FcMatchPattern);
-     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
+     FcResult fresult;
+     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult);
      if (fontset) {
         for (int i = 0; i < fontset->nfont; i++) {
             FcBool scalable;