From 9e382b6be0e81397f18ec0b733a2e88dc3465a33 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 2 Sep 2013 09:05:37 +0200 Subject: fontconfig libX11 mesa pixman git update 2 Sep 2013 libX11 commit 215ce6a67863de7acfd6dd3562b4fd97ef87b411 pixman commit 02906e57bd801e20b3094ca348fad563c6b5a922 fontconfig commit d2bb1a8381ba50dce79a487cd82087ca57fdcb68 mesa commit da33347131ff88a3b7979aea2031ce6f34319ed0 --- fontconfig/README | 10 ++++++++-- fontconfig/configure.ac | 2 +- fontconfig/fontconfig/fontconfig.h | 2 +- fontconfig/src/fccfg.c | 15 +++++++++++++++ libX11/nls/en_US.UTF-8/Compose.pre | 8 ++++++++ mesalib/src/mesa/main/texformat.c | 18 ++++++++---------- pixman/pixman/pixman-fast-path.c | 2 +- 7 files changed, 42 insertions(+), 15 deletions(-) diff --git a/fontconfig/README b/fontconfig/README index abaf506b8..06f862b21 100644 --- a/fontconfig/README +++ b/fontconfig/README @@ -1,12 +1,18 @@ Fontconfig Font configuration and customization library - Version 2.10.94 (2.11 RC4) - 2013-08-29 + Version 2.10.95 (2.11 RC5) + 2013-08-31 Check INSTALL for compilation and installation instructions. Report bugs to https://bugs.freedesktop.org in the fontconfig module. +2.10.95 (2.11 RC5) + +Akira TAGOH (2): + Fix a typo + Fix a crash + 2.10.94 (2.11 RC4) Akira TAGOH (25): diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 12d414938..952e73766 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library dnl version. This same version number must appear in fontconfig/fontconfig.h dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from fontconfig.h -AC_INIT([fontconfig], [2.10.94], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig]) +AC_INIT([fontconfig], [2.10.95], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig]) AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index 9a667022b..079177d4c 100644 --- a/fontconfig/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig/fontconfig.h @@ -52,7 +52,7 @@ typedef int FcBool; #define FC_MAJOR 2 #define FC_MINOR 10 -#define FC_REVISION 94 +#define FC_REVISION 95 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index b88095bc6..6377fd7c6 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -1500,6 +1500,7 @@ FcConfigSubstituteWithPat (FcConfig *config, FcPatternElt **elt = NULL, *e; int i, nobjs; FcBool retval = FcTrue; + FcTest **tst = NULL; if (!config) { @@ -1557,6 +1558,12 @@ FcConfigSubstituteWithPat (FcConfig *config, retval = FcFalse; goto bail1; } + tst = (FcTest **) malloc (SIZEOF_VOID_P * nobjs); + if (!tst) + { + retval = FcFalse; + goto bail1; + } if (FcDebug () & FC_DBG_EDIT) { @@ -1570,6 +1577,7 @@ FcConfigSubstituteWithPat (FcConfig *config, { elt[i] = NULL; value[i] = NULL; + tst[i] = NULL; } for (; r; r = r->next) { @@ -1598,7 +1606,10 @@ FcConfigSubstituteWithPat (FcConfig *config, e = NULL; /* different 'kind' won't be the target of edit */ if (!elt[object] && kind == r->u.test->kind) + { elt[object] = e; + tst[object] = r->u.test; + } /* * If there's no such field in the font, * then FcQualAll matches while FcQualAny does not @@ -1646,6 +1657,8 @@ FcConfigSubstituteWithPat (FcConfig *config, * Evaluate the list of expressions */ l = FcConfigValues (p, p_pat,kind, r->u.edit->expr, r->u.edit->binding); + if (tst[object] && (tst[object]->kind == FcMatchFont || kind == FcMatchPattern)) + elt[object] = FcPatternObjectFindElt (p, tst[object]->object); switch (FC_OP_GET_OP (r->u.edit->op)) { case FcOpAssign: @@ -1748,6 +1761,8 @@ bail1: free (elt); if (value) free (value); + if (tst) + free (tst); return retval; } diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index ab8237643..a741332dd 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -618,6 +618,10 @@ XCOMM Part 3 : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS + : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 + : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 + : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 + : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 : "Ð" ETH # LATIN CAPITAL LETTER ETH : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE @@ -739,6 +743,10 @@ XCOMM Part 3 : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 : "ð" eth # LATIN SMALL LETTER ETH : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index c2f925723..d3aa47736 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -239,11 +239,9 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, * 1D ARRAY textures in S3TC format. */ if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) { - if (ctx->Extensions.EXT_texture_compression_s3tc || - ctx->Extensions.ANGLE_texture_compression_dxt) + if (ctx->Mesa_DXTn) RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1); - if (ctx->Extensions.TDFX_texture_compression_FXT1) - RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1); + RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1); } RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888); RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888); @@ -252,11 +250,9 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, case GL_COMPRESSED_RGBA_ARB: /* We don't use texture compression for 1D and 1D array textures. */ if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) { - if (ctx->Extensions.EXT_texture_compression_s3tc || - ctx->Extensions.ANGLE_texture_compression_dxt) + if (ctx->Mesa_DXTn) RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */ - if (ctx->Extensions.TDFX_texture_compression_FXT1) - RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1); + RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1); } RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888); RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888); @@ -553,12 +549,14 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; case GL_COMPRESSED_SRGB_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1); + if (ctx->Mesa_DXTn) + RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1); RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8); RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; case GL_COMPRESSED_SRGB_ALPHA_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */ + if (ctx->Mesa_DXTn) + RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8); RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; diff --git a/pixman/pixman/pixman-fast-path.c b/pixman/pixman/pixman-fast-path.c index 2608268d9..5d52b4a57 100644 --- a/pixman/pixman/pixman-fast-path.c +++ b/pixman/pixman/pixman-fast-path.c @@ -2489,7 +2489,7 @@ fail: FUNC, "Allocation failure or bad matrix, skipping rendering\n"); iter->get_scanline = _pixman_iter_get_scanline_noop; - iter->fini = bilinear_cover_iter_fini; + iter->fini = NULL; } #define IMAGE_FLAGS \ -- cgit v1.2.3