vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Jul 5 19:08:44 2014 +0200| [653751837bf36c9d87b2eb7196b2a4d0d7f9fb1c] | committer: Felix Paul Kühne
Contribs: update fontconfig to 2.11.1 (cherry picked from commit a73187b79497f67cb3208189baabc4ade78ee5af) Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=653751837bf36c9d87b2eb7196b2a4d0d7f9fb1c --- contrib/src/fontconfig/SHA512SUMS | 2 +- contrib/src/fontconfig/fontconfig-noxml2.patch | 61 +++++++++++++++--------- contrib/src/fontconfig/fontconfig-win32.patch | 41 ++++++++-------- contrib/src/fontconfig/rules.mak | 2 +- 4 files changed, 60 insertions(+), 46 deletions(-) diff --git a/contrib/src/fontconfig/SHA512SUMS b/contrib/src/fontconfig/SHA512SUMS index 97023fc..be10c43 100644 --- a/contrib/src/fontconfig/SHA512SUMS +++ b/contrib/src/fontconfig/SHA512SUMS @@ -1 +1 @@ -d8886b3bb40790591120ae7701efa7430dcb8c171eaa9bac3c42fe62cb0c9646c66aded49a8683a4299e2dbeda90dbf4ca09bb53075f9c089f95097135142cb6 fontconfig-2.10.2.tar.gz +a3eecb35a59c2f83e7fec1238ff288978643a1b2a2a7bff7b07bb62b2ccd48aa7a6b5b164472f019efd390e9eea5391313c070dcbd680a2e1227ea8ec125e28b fontconfig-2.11.1.tar.gz diff --git a/contrib/src/fontconfig/fontconfig-noxml2.patch b/contrib/src/fontconfig/fontconfig-noxml2.patch index 0f35e99..b5a3ee4 100644 --- a/contrib/src/fontconfig/fontconfig-noxml2.patch +++ b/contrib/src/fontconfig/fontconfig-noxml2.patch @@ -1,5 +1,6 @@ ---- 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 +diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c +--- fontconfig/src/fcxml.c 2014-07-06 00:38:32.773443543 +0200 ++++ fontconfig.new/src/fcxml.c 2014-07-05 21:11:51.171349523 +0200 @@ -23,6 +23,8 @@ */ @@ -9,8 +10,8 @@ #include <fcntl.h> #include <stdarg.h> #include <dirent.h> -@@ -58,6 +60,8 @@ - #undef STRICT +@@ -56,6 +58,8 @@ + #include <mbstring.h> #endif +#endif @@ -18,15 +19,31 @@ static void FcExprDestroy (FcExpr *e); -@@ -71,6 +75,7 @@ - free (test); +@@ -86,6 +90,7 @@ + FcRuleDestroy (n); } +#if 0 static FcExpr * FcExprCreateInteger (FcConfig *config, int i) { -@@ -179,7 +184,7 @@ +@@ -132,6 +137,7 @@ + } + return m; + } ++#endif + + static void + FcExprMatrixFreeShallow (FcExprMatrix *m) +@@ -156,6 +162,7 @@ + free (m); + } + ++#if 0 + static FcExpr * + FcExprCreateMatrix (FcConfig *config, const FcExprMatrix *matrix) + { +@@ -240,7 +247,7 @@ } return e; } @@ -35,7 +52,7 @@ static void FcExprDestroy (FcExpr *e) { -@@ -255,6 +260,7 @@ +@@ -323,6 +330,7 @@ free (e); } @@ -43,7 +60,7 @@ typedef enum _FcElement { FcElementNone, FcElementFontconfig, -@@ -2373,6 +2379,7 @@ +@@ -2973,6 +2981,7 @@ const FcChar8 *bs = *((FcChar8 **) b); return FcStrCmp (as, bs); } @@ -51,7 +68,7 @@ static FcBool FcConfigParseAndLoadDir (FcConfig *config, -@@ -2380,6 +2387,9 @@ +@@ -2980,6 +2989,9 @@ const FcChar8 *dir, FcBool complain) { @@ -61,15 +78,7 @@ DIR *d; struct dirent *e; FcBool ret = FcTrue; -@@ -2589,3 +2599,4 @@ - #define __fcxml__ - #include "fcaliastail.h" - #undef __fcxml__ -+#endif -diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c ---- fontconfig/src/fcxml.c 2009-08-13 16:08:49.000000000 +0200 -+++ fontconfig.new/src/fcxml.c 2009-08-19 00:03:35.000000000 +0200 -@@ -2850,6 +2850,7 @@ +@@ -3056,6 +3068,7 @@ bail0: return ret || !complain; } @@ -77,7 +86,7 @@ diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c #ifdef _WIN32 pfnGetSystemWindowsDirectory pGetSystemWindowsDirectory = NULL; -@@ -2861,7 +2862,10 @@ +@@ -3067,7 +3080,10 @@ const FcChar8 *name, FcBool complain) { @@ -88,9 +97,15 @@ diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c XML_Parser p; FcChar8 *filename; int fd; ---- fontconfig/src/fcinit.c 2010-04-27 15:31:41.000000000 +0200 -+++ fontconfig.new/src/fcinit.c 2010-04-27 15:35:42.000000000 +0200 -@@ -34,11 +34,16 @@ +@@ -3210,3 +3226,4 @@ + #define __fcxml__ + #include "fcaliastail.h" + #undef __fcxml__ ++#endif +diff -ruN fontconfig/src/fcinit.c fontconfig.new/src/fcinit.c +--- fontconfig/src/fcinit.c 2014-07-06 00:38:32.773443543 +0200 ++++ fontconfig.new/src/fcinit.c 2014-07-04 22:37:41.036255327 +0200 +@@ -44,11 +44,16 @@ config = FcConfigCreate (); if (!config) goto bail0; diff --git a/contrib/src/fontconfig/fontconfig-win32.patch b/contrib/src/fontconfig/fontconfig-win32.patch index 36d3211..b20014d 100644 --- a/contrib/src/fontconfig/fontconfig-win32.patch +++ b/contrib/src/fontconfig/fontconfig-win32.patch @@ -1,24 +1,3 @@ -diff -ruN fontconfig/src/fcint.h fontconfig.good/src/fcint.h ---- fontconfig/src/Makefile.in 2009-06-24 21:05:27.000000000 +0200 -+++ fontconfig.good/src/Makefile.in 2009-07-03 00:13:38.000000000 +0200 -@@ -664,7 +664,6 @@ - # gcc import library install/uninstall - - @OS_WIN32_TRUE@install-libtool-import-lib: --@OS_WIN32_TRUE@ $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir) - @OS_WIN32_TRUE@ $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def - - @OS_WIN32_TRUE@uninstall-libtool-import-lib: ---- fontconfig/src/Makefile.am 2009-03-18 22:02:22.000000000 +0100 -+++ fontconfig.good/src/Makefile.am 2009-07-03 00:12:50.000000000 +0200 -@@ -30,7 +30,6 @@ - # gcc import library install/uninstall - - install-libtool-import-lib: -- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir) - $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def - - uninstall-libtool-import-lib: --- fontconfig/src/fcinit.c 2009-06-06 00:59:27.000000000 +0200 +++ fontconfig.good/src/fcinit.c 2009-07-13 14:58:37.000000000 +0200 @@ -24,6 +24,7 @@ @@ -41,3 +20,23 @@ diff -ruN fontconfig/src/fcint.h fontconfig.good/src/fcint.h goto bail1; return config; +--- fontconfig-2.11.1/src/Makefile.in.orig 2014-07-04 22:34:00.932627043 +0200 ++++ fontconfig-2.11.1/src/Makefile.in 2014-07-04 22:35:40.630938711 +0200 +@@ -838,7 +838,6 @@ + + @OS_WIN32_TRUE@install-libtool-import-lib: libfontconfig.la + @OS_WIN32_TRUE@ $(MKDIR_P) $(DESTDIR)$(libdir) +-@OS_WIN32_TRUE@ $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a + @OS_WIN32_TRUE@ $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def + + @OS_WIN32_TRUE@uninstall-libtool-import-lib: +--- fontconfig-2.11.1/src/Makefile.am.orig 2014-07-04 22:34:00.932627043 +0200 ++++ fontconfig-2.11.1/src/Makefile.am 2014-07-04 22:37:05.362334747 +0200 +@@ -33,7 +33,6 @@ + + install-libtool-import-lib: libfontconfig.la + $(MKDIR_P) $(DESTDIR)$(libdir) +- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a + $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def + + uninstall-libtool-import-lib: diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak index db77444..0430c8c 100644 --- a/contrib/src/fontconfig/rules.mak +++ b/contrib/src/fontconfig/rules.mak @@ -1,6 +1,6 @@ # fontconfig -FONTCONFIG_VERSION := 2.10.2 +FONTCONFIG_VERSION := 2.11.1 FONTCONFIG_URL := https://www.freedesktop.org/software/fontconfig/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz PKGS += fontconfig _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
