From f543ceaca6820260f15a4eff86938214cf43c7d2 Mon Sep 17 00:00:00 2001
From: marha
Date: Mon, 21 May 2012 09:10:35 +0200
Subject: fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar
2012
---
fontconfig/conf.d/50-user.conf | 7 +-
fontconfig/doc/fontconfig-user.sgml | 47 +-
fontconfig/fonts.conf.in | 4 +
fontconfig/fonts.dtd | 10 +-
fontconfig/src/fccfg.c | 78 ++-
fontconfig/src/fcinit.c | 20 +-
fontconfig/src/fcint.h | 11 +
fontconfig/src/fcstr.c | 5 +-
fontconfig/src/fcxml.c | 344 +++++++-----
mesalib/configure.ac | 4 +-
mesalib/docs/news.html | 8 +
mesalib/docs/relnotes-8.0.3.html | 319 ++++++++++++
mesalib/src/glsl/ast_to_hir.cpp | 577 ++++++++++-----------
mesalib/src/glsl/opt_dead_code_local.cpp | 149 +++++-
mesalib/src/mesa/SConscript | 1 +
mesalib/src/mesa/main/compiler.h | 6 -
mesalib/src/mesa/main/context.c | 3 +
mesalib/src/mesa/main/format_unpack.c | 4 +-
mesalib/src/mesa/main/imports.h | 57 +-
mesalib/src/mesa/main/macros.h | 10 +-
mesalib/src/mesa/main/mtypes.h | 6 +
mesalib/src/mesa/main/pack.c | 220 ++++----
mesalib/src/mesa/main/pixeltransfer.c | 10 +-
mesalib/src/mesa/main/readpix.c | 12 +-
mesalib/src/mesa/main/shaderapi.c | 29 +-
mesalib/src/mesa/main/texobj.c | 3 +-
mesalib/src/mesa/main/uniform_query.cpp | 2 +
mesalib/src/mesa/program/prog_execute.c | 20 +-
mesalib/src/mesa/sources.mak | 1 +
.../src/mesa/state_tracker/st_cb_bufferobjects.c | 3 +
mesalib/src/mesa/state_tracker/st_context.c | 2 +-
mesalib/src/mesa/state_tracker/st_context.h | 1 -
mesalib/src/mesa/state_tracker/st_draw.c | 181 +------
mesalib/src/mesa/state_tracker/st_extensions.c | 2 +-
mesalib/src/mesa/state_tracker/st_program.c | 23 +
mesalib/src/mesa/state_tracker/st_program.h | 4 +
mesalib/src/mesa/vbo/vbo.h | 6 +
mesalib/src/mesa/vbo/vbo_exec_array.c | 43 +-
mesalib/src/mesa/vbo/vbo_primitive_restart.c | 233 +++++++++
pixman/configure.ac | 5 +-
pixman/demos/Makefile.am | 2 +
xorg-server/Xi/exevents.c | 270 +---------
xorg-server/Xi/extinit.c | 7 +-
xorg-server/Xi/xiproperty.c | 2 +-
xorg-server/Xi/xiselectev.c | 8 +-
xorg-server/dix/devices.c | 12 +-
xorg-server/dix/enterleave.c | 239 +++++++++
xorg-server/dix/enterleave.h | 5 +
xorg-server/dix/getevents.c | 25 +-
xorg-server/dix/ptrveloc.c | 3 +-
xorg-server/hw/xquartz/X11Application.m | 24 +-
xorg-server/hw/xquartz/console_redirect.c | 14 +
xorg-server/hw/xquartz/quartz.c | 6 +
xorg-server/include/exevents.h | 7 -
xorg-server/include/globals.h | 4 +
xorg-server/include/ptrveloc.h | 15 +-
xorg-server/include/xkbsrv.h | 3 -
xorg-server/test/xi2/protocol-common.h | 4 +-
.../test/xi2/protocol-xipassivegrabdevice.c | 7 +-
xorg-server/test/xi2/protocol-xiquerydevice.c | 16 +-
xorg-server/test/xi2/protocol-xiquerypointer.c | 7 +-
xorg-server/test/xi2/protocol-xiqueryversion.c | 8 +-
xorg-server/test/xi2/protocol-xiselectevents.c | 1 +
xorg-server/test/xi2/protocol-xisetclientpointer.c | 1 +
xorg-server/test/xi2/protocol-xiwarppointer.c | 1 +
xorg-server/xkeyboard-config/symbols/fr | 18 +-
66 files changed, 2000 insertions(+), 1179 deletions(-)
create mode 100644 mesalib/docs/relnotes-8.0.3.html
create mode 100644 mesalib/src/mesa/vbo/vbo_primitive_restart.c
diff --git a/fontconfig/conf.d/50-user.conf b/fontconfig/conf.d/50-user.conf
index 3f8901296..2f1040898 100644
--- a/fontconfig/conf.d/50-user.conf
+++ b/fontconfig/conf.d/50-user.conf
@@ -2,6 +2,9 @@
- ~/.fonts.conf.d
- ~/.fonts.conf
+ fontconfig/conf.d
+ fontconfig/fonts.conf
+
+ ~/.fonts.conf.d
+ ~/.fonts.conf
diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml
index 22d2ad355..c6ab856bb 100644
--- a/fontconfig/doc/fontconfig-user.sgml
+++ b/fontconfig/doc/fontconfig-user.sgml
@@ -37,6 +37,8 @@
&confdir;/fonts.conf
&confdir;/fonts.dtd
&confdir;/conf.d
+ $XDG_CONFIG_HOME/fontconfig/conf.d
+ $XDG_CONFIG_HOME/fontconfig/fonts.conf
~/.fonts.conf.d
~/.fonts.conf
@@ -299,21 +301,22 @@ following structure:
This is the top level element for a font configuration and can contain
<dir>, <cachedir>, <include>, <match> and <alias> elements in any order.
- <dir>
+ <dir prefix="default">
This element contains a directory name which will be scanned for font files
-to include in the set of available fonts.
+to include in the set of available fonts. If 'prefix' is set to "xdg", the value in the XDG_DATA_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details.
- <cachedir>
+ <cachedir prefix="default">
This element contains a directory name that is supposed to be stored or read
the cache of font information. If multiple elements are specified in
the configuration file, the directory that can be accessed first in the list
will be used to store the cache files. If it starts with '~', it refers to
-a directory in the users home directory. The default directory is ``~/.fontconfig''
-and it contains the cache files named ``<hash value>-<architecture>.cache-<version'',
+a directory in the users home directory. If 'prefix' is set to "xdg", the value in the XDG_CACHE_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details.
+The default directory is ``$XDG_CACHE_HOME/fontconfig'' and it contains the cache files
+named ``<hash value>-<architecture>.cache-<version'',
where <version> is the font configureation file
version number (currently 3).
- <include ignore_missing="no">
+ <include ignore_missing="no" prefix="default">
This element contains the name of an additional configuration file or
directory. If a directory, every file within that directory starting with an
ASCII digit (U+0030 - U+0039) and ending with the string ``.conf'' will be processed in sorted order. When
@@ -321,7 +324,7 @@ the XML datatype is traversed by FcConfigParse, the contents of the file(s)
will also be incorporated into the configuration by passing the filename(s) to
FcConfigLoadAndParse. If 'ignore_missing' is set to "yes" instead of the
default "no", a missing file or directory will elicit no warning message from
-the library.
+the library. If 'prefix' is set to "xdg", the value in the XDG_CONFIG_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details.
<config>
This element provides a place to consolidate additional configuration
@@ -564,20 +567,20 @@ This is an example of a system-wide configuration file
</match>
<!--
- Names not including any well known alias are given 'sans'
+ Names not including any well known alias are given 'sans-serif'
-->
<match target="pattern">
- <test qual="all" name="family" mode="not_eq">sans</test>
- <test qual="all" name="family" mode="not_eq">serif</test>
- <test qual="all" name="family" mode="not_eq">monospace</test>
- <edit name="family" mode="append_last"><string>sans</string></edit>
+ <test qual="all" name="family" mode="not_eq"><string>sans-serif</string></test>
+ <test qual="all" name="family" mode="not_eq"><string>serif</string></test>
+ <test qual="all" name="family" mode="not_eq"><string>monospace</string></test>
+ <edit name="family" mode="append_last"><string>sans-serif</string></edit>
</match>
<!--
Load per-user customization file, but don't complain
if it doesn't exist
-->
-<include ignore_missing="yes">~/.fonts.conf</include>
+<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
<!--
Load local customization files, but don't complain
@@ -630,18 +633,18 @@ This is an example of a system-wide configuration file
User configuration file
This is an example of a per-user configuration file that lives in
-~/.fonts.conf
+$XDG_CONFIG_HOME/fontconfig/fonts.conf
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- ~/.fonts.conf for per-user font configuration -->
+<!-- $XDG_CONFIG_HOME/fontconfig/fonts.conf for per-user font configuration -->
<fontconfig>
<!--
Private font directory
-->
-<dir>~/.fonts</dir>
+<dir prefix="xdg">fonts</dir>
<!--
use rgb sub-pixel ordering to improve glyph appearance on
@@ -677,20 +680,20 @@ format. The master fonts.conf file references this directory in an
is a DTD that describes the format of the configuration files.
-~/.fonts.conf.d
+$XDG_CONFIG_HOME/fontconfig/conf.d and ~/.fonts.conf.d
is the conventional name for a per-user directory of (typically
auto-generated) configuration files, although the
-actual location is specified in the global fonts.conf file.
+actual location is specified in the global fonts.conf file. please note that ~/.fonts.conf.d is deprecated now. it will not be read by default in the future version.
-~/.fonts.conf
+$XDG_CONFIG_HOME/fontconfig/fonts.conf and ~/.fonts.conf
is the conventional location for per-user font configuration, although the
-actual location is specified in the global fonts.conf file.
+actual location is specified in the global fonts.conf file. please note that ~/.fonts.conf is deprecated now. it will not be read by default in the future version.
- ~/.fontconfig/*.cache-*
+$XDG_CACHE_HOME/fontconfig/*.cache-* and ~/.fontconfig/*.cache-*
is the conventional repository of font information that isn't found in the
-per-directory caches. This file is automatically maintained by fontconfig.
+per-directory caches. This file is automatically maintained by fontconfig. please note that ~/.fontconfig/*.cache-* is deprecated now. it will not be read by default in the future version.
Environment variables
diff --git a/fontconfig/fonts.conf.in b/fontconfig/fonts.conf.in
index 8f9fb8823..6a8753d01 100644
--- a/fontconfig/fonts.conf.in
+++ b/fontconfig/fonts.conf.in
@@ -25,6 +25,8 @@
@FC_DEFAULT_FONTS@
@FC_FONTPATH@
+ fonts
+
~/.fonts
@FC_CACHEDIR@
+ fontconfig
+
~/.fontconfig
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd
index 255367cf5..782e59244 100644
--- a/fontconfig/fonts.dtd
+++ b/fontconfig/fonts.dtd
@@ -12,7 +12,9 @@
Add a directory that provides fonts
-->
-
+
-
+
+
+
+
+
+Changes
+The full set of changes can be viewed by using the following GIT command:
+
+
+ git log mesa-8.0.2..mesa-8.0.3
+
+
+Alban Browaeys (1):
+
+ - dri/i915: Fix off-by-one in i830 clip region size.
+
+
+Alex Deucher (2):
+
+ - r200: fix fog coordinate emit
+ - radeon: fix fog coordinate emit
+
+
+Alexander von Gluck (4):
+
+ - llvmpipe: fix symbol conflict on Haiku
+ - svga: fix typedef conflicts on Haiku
+ - mesa: Don't use newlocale on Haiku
+ - glsl: Don't use newlocale on Haiku
+
+
+Anuj Phogat (4):
+
+ - mesa: fix issues with texture border and array textures
+ - mesa: Fix valid texture target test in _mesa_GetTexLevelParameteriv()
+ - mesa: Fix the cause of piglit test fbo-array failure
+ - intel: Fix a case when mapping large texture fails
+
+
+Brian Paul (17):
+
+ - mesa: add a couple fast-paths to fast_read_rgba_pixels_memcpy()
+ - mesa/gdi: remove wmesa_set_renderbuffer_funcs() function
+ - mesa/gdi: remove clear_color() function
+ - mesa: bump version to 8.0.2 in configs/default
+ - swrast: include s_fragprog.h to silence warnings
+ - mesa: remove LSB-first pixel packing check in glReadPixels
+ - mesa: fix error in _mesa_format_matches_format_and_type() for RGB888
+ - mesa: add BGR888 code in _mesa_format_matches_format_and_type()
+ - vbo: fix node_attrsz[] usage in vbo_bind_vertex_list()
+ - mesa: add missing texture integer test in glTexSubImage()
+ - mesa: add missing return after _mesa_error() in update_array()
+ - glsl: propagate MaxUnrollIterations to the optimizer's loop unroller
+ - st/mesa: set MaxUnrollIterations = 255
+ - st/mesa: no-op glCopyPixels if source region is out of bounds
+ - mesa: do more teximage error checking for generic compressed formats
+ - mesa: fix/add error check in _mesa_ColorMaterial()
+ - mesa: fix glMaterial / dlist bug
+
+
+Chad Versace (3):
+
+ - glsl: Fix Android build
+ - main: Fix memory leak in _mesa_make_extension_string()
+ - intel: Disable ARB_framebuffer_object in ES contexts
+
+
+Chris Wilson (1):
+
+ - i830: Compute initial number of vertices from remaining batch space
+
+
+Dave Airlie (4):
+
+ - mesa/format_unpack: add LUMINANCE 8/16 UINT/INT
+ - glx/drisw: avoid segfaults when we fail to get visual
+ - drisw: fix image stride calculation for 16-bit.
+ - intel: fix TFP at 16-bpp
+
+
+Dylan Noblesmith (7):
+
+ - intel: fix null dereference processing HiZ buffer
+ - util: fix undefined behavior
+ - util: fix uninitialized table
+ - egl: fix uninitialized values
+ - st/vega: fix uninitialized values
+ - egl-static: fix printf warning
+ - i965: fix typo
+
+
+Eric Anholt (19):
+
+ - i965/fs: Jump from discard statements to the end of the program when done.
+ - intel: Fix rendering from textures after RenderTexture().
+ - mesa: Fix handling of glCopyBufferSubData() for src == dst.
+ - i965/fs: Move GL_CLAMP handling to coordinate setup.
+ - i965/fs: Implement GL_CLAMP behavior on texture rectangles on gen6+.
+ - mesa: Fix push/pop of multisample coverage invert.
+ - mesa: Include the multisample enables under GL_MULTISAMPLE_BIT attrib as well.
+ - mesa: Fix display list handling for GL_ARB_draw_instanced.
+ - mesa: Fix display lists for draw_elements_base_vertex with draw_instanced.
+ - mesa: Add missing error check for first < 0 in glDrawArraysInstanced().
+ - i915: Fix piglit fbo-nodepth-test on i830.
+ - intel: Return success when asked to allocate a 0-width/height renderbuffer.
+ - mesa: Throw error on glGetActiveUniform inside Begin/End.
+ - i965/vs: Fix up swizzle for dereference_array of matrices.
+ - glsl: Fix indentation of switch code.
+ - glsl: Let the constructor figure out the types of switch-related expressions.
+ - glsl: Reject non-scalar switch expressions.
+ - glsl: Fix assertion failure on handling switch on uint expressions.
+ - mesa: Check for framebuffer completeness before looking at the rb.
+
+
+Eugeni Dodonov (1):
+
+ - intel: add PCI IDs for Ivy Bridge GT2 server variant
+
+
+Han Shen(沈涵) (1):
+
+ - bin/mklib: remove '-m32' for arm linux
+
+
+Ian Romanick (1):
+
+ - mesa: Bump version number to 8.0.3
+
+
+Jakob Bornecrantz (1):
+
+ - docs: Add 8.0.2 md5sums
+
+
+Jeremy Huddleston (7):
+
+ - darwin: Eliminate a pthread mutex leak
+ - darwin: Fix an error message
+ - darwin: Make reported errors more user-friendly
+ - darwin: Use ASL for logging
+ - darwin: Unlock our mutex before destroying it
+ - darwin: Eliminate a possible race condition while destroying a surface
+ - darwin: Address a build failure on Leopard and earlier OS versions
+
+
+Jon TURNEY (1):
+
+ - Have __glImageSize handle format GL_DEPTH_STENCIL_NV the same way as the server does
+
+
+Jonas Maebe (2):
+
+ - glapi: Correct size of allocated _glapi_table struct
+ - apple: Fix a use after free
+
+
+Jordan Justen (1):
+
+ - mesa: Add primitive restart support to glArrayElement
+
+
+Kenneth Graunke (12):
+
+ - i965: Actually upload sampler state pointers for the VS unit on Gen6.
+ - i965/fs: Fix FB writes that tried to use the non-existent m16 register.
+ - vbo: Remove pedantic warning about 'end' beind out of bounds.
+ - vbo: Ignore invalid element ranges which are outside VBO bounds.
+ - vbo: Rework checking of 'end' against _MaxElement.
+ - vbo: Eliminate short-circuiting in invalid-start case.
+ - i965: Fix GPU hangs in the dummy fragment shader.
+ - i965: Make the dummy fragment shader work in SIMD16 mode.
+ - drirc: Add force_glsl_extensions_warn workaround for Unigine Heaven.
+ - i965: Avoid explicit accumulator operands in SIMD16 mode on Gen7.
+ - intel: Remove pointless software fallback for glBitmap on Gen6.
+ - glsl: Fix broken constant expression handling for <, <=, >, and >=.
+
+
+Kurt Roeckx (2):
+
+ - i915: Compute maximum number of verts using the actual batchbuffer size.
+ - i915: Fix i830 polygon stipple from PBOs.
+
+
+Marek Olšák (5):
+
+ - r300g/swtcl: don't print an error when getting ClipVertex
+ - r300g/swtcl: don't enter u_vbuf_mgr
+ - r300g/swtcl: don't expose shader subroutine support
+ - r300g/swtcl: fix polygon offset
+ - r300g/swtcl: fix crash when back color is present in vertex shader
+
+
+Mathias Fröhlich (1):
+
+ - glsl: Avoid excessive loop unrolling.
+
+
+Matt Turner (1):
+
+ - Remove -ffast-math from default CFLAGS
+
+
+Paul Berry (1):
+
+ - i915: Initialize swrast_texture_image structure fields.
+
+
+Roland Scheidegger (1):
+
+ - mesa: check_index_bounds off-by-one fix
+
+
+Tom Stellard (2):
+
+ - r300/compiler: Clear loop registers in vertex shaders w/o loops
+ - r300/compiler: Copy all instruction attributes during local transfoms
+
+
+Vinson Lee (5):
+
+ - mesa: Fix memory leak in _mesa_get_uniform_location.
+ - linker: Fix memory leak in count_uniform_size::visit_field.
+ - swrast: Fix memory leaks in blit_linear.
+ - ir_to_mesa: Fix uninitialized member in add_uniform_to_shader.
+ - mesa: Fix memory leak in generate_mipmap_compressed.
+
+
+Yuanhan Liu (2):
+
+ - i915: set SPRITE_POINT_ENABLE bit correctly
+ - i965: fix wrong cube/3D texture layout
+
+
+