Contribs: Don't patch libass, but patch fontconfig for xml

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 78a4b7d5ace4c6541cbbb1f7f6043225ca2825b4..56168671dddedd4582a3dded8b8ff33d414c658b 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2510,9 +2510,6 @@ 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/fontconfig-noxml2.patch b/extras/contrib/src/Patches/fontconfig-noxml2.patch
index 29d892623a990666aee323cddedcb9d796f9029c..0de3550f8b7b36adccc3c9fb3023297f37346b8b 100644 (file)
--- a/extras/contrib/src/Patches/fontconfig-noxml2.patch
+++ b/extras/contrib/src/Patches/fontconfig-noxml2.patch
@@ -1,19 +1,5 @@
-diff -ruN fontconfig.new/src/fcinit.c fontconfig/src/fcinit.c
---- fontconfig.new/src/fcinit.c        2009-07-25 21:55:10.000000000 +0200
-+++ fontconfig/src/fcinit.c    2009-07-25 21:58:05.000000000 +0200
-@@ -68,7 +68,8 @@
-     if (!config)
-       return FcFalse;
-     
--    if (!FcConfigParseAndLoad (config, 0, FcTrue))
-+//    if (!FcConfigParseAndLoad (config, 0, FcTrue))
-+    if (1)
-     {
-       FcConfigDestroy (config);
-       return FcInitFallbackConfig ();
-diff -ruN fontconfig.new/src/fcxml.c fontconfig/src/fcxml.c
---- fontconfig.new/src/fcxml.c 2009-07-25 21:55:10.000000000 +0200
-+++ fontconfig/src/fcxml.c     2009-07-25 21:56:37.000000000 +0200
+--- fontconfig/src/fcxml.c     2009-08-13 16:07:13.000000000 +0200
++++ fontconfig.new/src/fcxml.c 2009-08-13 16:05:41.000000000 +0200
 @@ -23,6 +23,8 @@
   */
  
@@ -57,7 +43,25 @@ diff -ruN fontconfig.new/src/fcxml.c fontconfig/src/fcxml.c
  typedef enum _FcElement {
      FcElementNone,
      FcElementFontconfig,
-@@ -2589,3 +2595,4 @@
+@@ -2373,6 +2379,7 @@
+     const FcChar8    *bs = *((FcChar8 **) b);
+     return FcStrCmp (as, bs);
+ }
++#endif
+ 
+ static FcBool
+ FcConfigParseAndLoadDir (FcConfig     *config,
+@@ -2380,6 +2387,9 @@
+                        const FcChar8  *dir,
+                        FcBool         complain)
+ {
++    return FcFalse;
++}
++#if 0
+     DIR                   *d;
+     struct dirent   *e;
+     FcBool        ret = FcTrue;
+@@ -2589,3 +2599,4 @@
  #define __fcxml__
  #include "fcaliastail.h"
  #undef __fcxml__

diff --git a/extras/contrib/src/Patches/libass-win32.patch b/extras/contrib/src/Patches/libass-win32.patch
deleted file mode 100644 (file)
index 64c3633..0000000
--- a/extras/contrib/src/Patches/libass-win32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.");