vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Apr 8 11:39:45 2017 +0200| [da097de0def497c5b8b4f4420385c50db7d410ac] | committer: Jean-Baptiste Kempf
Contribs: update fontconfig to 2.12.1 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=da097de0def497c5b8b4f4420385c50db7d410ac --- contrib/src/fontconfig/SHA512SUMS | 2 +- contrib/src/fontconfig/fontconfig-noxml2.patch | 18 +++++++++++++----- contrib/src/fontconfig/rules.mak | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/contrib/src/fontconfig/SHA512SUMS b/contrib/src/fontconfig/SHA512SUMS index be10c43..5d9d889 100644 --- a/contrib/src/fontconfig/SHA512SUMS +++ b/contrib/src/fontconfig/SHA512SUMS @@ -1 +1 @@ -a3eecb35a59c2f83e7fec1238ff288978643a1b2a2a7bff7b07bb62b2ccd48aa7a6b5b164472f019efd390e9eea5391313c070dcbd680a2e1227ea8ec125e28b fontconfig-2.11.1.tar.gz +0959a80522e09551e49ec7b2383b7dfb319d4e1c058ad0b55bb35d3f675acbb7ff08c9c30a8798b731070687f84dd3d2ff7e28aafac6ecfa9d3f85c5847c0955 fontconfig-2.12.1.tar.gz diff --git a/contrib/src/fontconfig/fontconfig-noxml2.patch b/contrib/src/fontconfig/fontconfig-noxml2.patch index b5a3ee4..ae28ea7 100644 --- a/contrib/src/fontconfig/fontconfig-noxml2.patch +++ b/contrib/src/fontconfig/fontconfig-noxml2.patch @@ -102,13 +102,12 @@ diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c #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 (); +--- fontconfig-2.12.1/src/fcinit.c.orig 2017-04-08 11:38:02.488354178 +0200 ++++ fontconfig-2.12.1/src/fcinit.c 2017-04-08 11:38:52.072351969 +0200 +@@ -45,11 +45,16 @@ if (!config) goto bail0; + FcConfigSetSysRoot (config, sysroot); - if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS)) + char path[MAX_PATH + 8]; + GetWindowsDirectory( path, MAX_PATH + 1 ); @@ -123,3 +122,12 @@ diff -ruN fontconfig/src/fcinit.c fontconfig.new/src/fcinit.c if (!FcConfigAddCacheDir (config, (FcChar8 *)dir)) goto bail1; return config; +@@ -193,7 +202,7 @@ + FcCacheFini (); + FcDefaultFini (); + FcObjectFini (); +- FcConfigPathFini (); ++// FcConfigPathFini (); + } + + /* diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak index 0da125f..725846c 100644 --- a/contrib/src/fontconfig/rules.mak +++ b/contrib/src/fontconfig/rules.mak @@ -1,6 +1,6 @@ # fontconfig -FONTCONFIG_VERSION := 2.11.1 +FONTCONFIG_VERSION := 2.12.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
