Patch libass on Win32 to avoid Using FcParseAndLoad
authorJean-Baptiste Kempf <jb@videolan.org>
Thu, 13 Aug 2009 08:39:58 +0000 (10:39 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 13 Aug 2009 08:39:58 +0000 (10:39 +0200)
extras/contrib/src/Makefile
extras/contrib/src/Patches/libass-win32.patch [new file with mode: 0644]

index 5616867..78a4b7d 100644 (file)
@@ -2510,6 +2510,9 @@ libass-$(ASS_VERSION).tar.bz2:
 
 libass:
        $(GIT) clone $(ASS_GIT)
+ifdef HAVE_WIN32
+       (cd $@; patch -p1 < ../Patches/libass-win32.patch)
+endif
        (cd $@; autoreconf -ivf)
 
 .libass: libass
diff --git a/extras/contrib/src/Patches/libass-win32.patch b/extras/contrib/src/Patches/libass-win32.patch
new file mode 100644 (file)
index 0000000..64c3633
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
+index 006be97..a4a680f 100644
+--- a/libass/ass_fontconfig.c
++++ b/libass/ass_fontconfig.c
+@@ -449,7 +449,7 @@ FCInstance *fontconfig_init(ASS_Library *library,
+     }
+     priv->config = FcConfigCreate();
+-    rc = FcConfigParseAndLoad(priv->config, (unsigned char *) config, FcTrue);
++    rc = 0;//FcConfigParseAndLoad(priv->config, (unsigned char *) config, FcTrue);
+     if (!rc) {
+         ass_msg(library, MSGL_WARN, "No usable fontconfig configuration "
+                 "file found, using fallback.");