[vlc-devel] commit: Patch libass on Win32 to avoid Using FcParseAndLoad ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug 13 10:39:58 2009 +0200| [8fa33bb50922ea24522e982782f29a796b233d7e] | committer: Jean-Baptiste Kempf 

Patch libass on Win32 to avoid Using FcParseAndLoad

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8fa33bb50922ea24522e982782f29a796b233d7e
---

 extras/contrib/src/Makefile                   |    3 +++
 extras/contrib/src/Patches/libass-win32.patch |   13 +++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5616867..78a4b7d 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -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
index 0000000..64c3633
--- /dev/null
+++ b/extras/contrib/src/Patches/libass-win32.patch
@@ -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.");