From c81020559f329a516191927222b3698ba7370aca Mon Sep 17 00:00:00 2001
From: marha
Date: Sun, 22 Dec 2013 12:51:45 +0100
Subject: libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver
pixman xkeyboard-config git update 22 Dec 2013
xserver commit a68df147421da21528b5be2d34678383922fa352
libxcb commit f653464554469b5767f1c99abced25a76bace047
libxcb/xcb-proto commit 4087fc682c5ceb849b74442e17a6b73176e5eecb
xkeyboard-config commit a224a636139d22e1dc7ca7d23782cd656e87bcf5
libX11 commit 3d69b0a83e62f8f6fbdd952fc49cdbdf8825e1e6
libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854
libXext commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb
libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a
libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman commit 945ab7a6f3eb6241f07e8f094dc0e647d1f10d9d
xextproto commit 3f355f138d6df57e067458a20f47307883048adb
randrproto commit e7526e6b5fe0966929cda10b2ded0258413744db
glproto commit f84853d97d5749308992412a215fa518b6536eb3
mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b
xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4
libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63
libxtrans commit 2c0a7840a28ae696e80e73157856d7a049fdf6c7
fontconfig commit 5c725f2f5829238d16116f782d00d8bb0defaf08
mesa commit 2efe7927d38983029784825fc4897e9b77aa237e
---
X11/xtrans/Xtransint.h | 4 -
X11/xtrans/Xtransutil.c | 14 +-
X11/xtrans/xtrans.m4 | 13 +-
fontconfig/autogen.sh | 9 +
fontconfig/conf.d/10-no-sub-pixel.conf | 2 +-
fontconfig/conf.d/30-metric-aliases.conf | 47 +-
fontconfig/configure.ac | 64 +-
fontconfig/m4/ac_check_symbol.m4 | 48 +
fontconfig/src/fccache.c | 2 +-
fontconfig/src/fcdefault.c | 4 +-
fontconfig/src/fcmatch.c | 5 +-
gl/configure.ac | 2 +-
gl/glxtokens.h | 2 +
libX11/include/X11/Xlib.h | 17 -
libX11/modules/om/generic/omGeneric.c | 2 +-
libX11/src/xlibi18n/lcStd.c | 10 -
libXft/src/xftglyphs.c | 6 +-
libXmu/src/ShapeWidg.c | 2 +-
libxcb/NEWS | 39 +-
libxcb/configure.ac | 2 +-
libxcb/src/Makefile.am | 6 +-
libxcb/src/c_client.py | 4 +-
libxcb/src/xcb.h | 20 +
libxcb/src/xcb_in.c | 12 +-
libxcb/xcb-proto/NEWS | 61 +
libxcb/xcb-proto/src/xinput.xml | 8 +-
libxcb/xcb-proto/src/xproto.xml | 2 +-
mesalib/Makefile.am | 2 +-
mesalib/configure.ac | 18 +-
mesalib/docs/GL3.txt | 12 +-
mesalib/docs/devinfo.html | 23 +-
mesalib/docs/index.html | 14 +
mesalib/docs/relnotes.html | 2 +
mesalib/docs/relnotes/10.0.1.html | 150 +++
mesalib/docs/relnotes/10.0.html | 76 +-
mesalib/docs/relnotes/10.1.html | 7 +-
mesalib/docs/relnotes/9.2.4.html | 3 +
mesalib/docs/relnotes/9.2.5.html | 120 ++
mesalib/docs/specs/MESA_texture_array.spec | 2 +-
.../specs/WL_create_wayland_buffer_from_image.spec | 101 ++
mesalib/docs/vmware-guest.html | 2 +-
mesalib/include/EGL/eglmesaext.h | 10 +
mesalib/include/GL/gl.h | 33 -
mesalib/include/GL/glext.h | 68 +-
mesalib/include/GL/internal/dri_interface.h | 9 +-
mesalib/include/HaikuGL/GLRenderer.h | 76 ++
mesalib/include/HaikuGL/GLView.h | 193 ++++
mesalib/include/HaikuGL/OpenGLKit.h | 10 +
mesalib/include/HaikuGL/README | 28 +
mesalib/m4/ax_check_compile_flag.m4 | 72 ++
mesalib/src/gallium/auxiliary/util/u_blitter.c | 286 +++--
mesalib/src/gallium/auxiliary/util/u_blitter.h | 13 +-
mesalib/src/gallium/auxiliary/util/u_clear.h | 7 +-
mesalib/src/gallium/auxiliary/util/u_framebuffer.c | 24 +
mesalib/src/gallium/auxiliary/util/u_framebuffer.h | 5 +
.../src/gallium/auxiliary/util/u_simple_shaders.c | 180 +++
.../src/gallium/auxiliary/util/u_simple_shaders.h | 14 +
mesalib/src/glsl/ast.h | 1 +
mesalib/src/glsl/ast_array_index.cpp | 8 +-
mesalib/src/glsl/ast_function.cpp | 86 +-
mesalib/src/glsl/ast_to_hir.cpp | 298 ++---
mesalib/src/glsl/ast_type.cpp | 3 +-
mesalib/src/glsl/builtin_functions.cpp | 37 +-
mesalib/src/glsl/builtin_variables.cpp | 50 +-
mesalib/src/glsl/glsl_lexer.ll | 2 +-
mesalib/src/glsl/glsl_parser.yy | 17 +-
mesalib/src/glsl/glsl_parser_extras.cpp | 24 +-
mesalib/src/glsl/glsl_parser_extras.h | 14 +-
mesalib/src/glsl/glsl_types.cpp | 5 +
mesalib/src/glsl/glsl_types.h | 6 +
mesalib/src/glsl/ir.cpp | 65 +-
mesalib/src/glsl/ir.h | 373 +++---
mesalib/src/glsl/ir_clone.cpp | 35 +-
mesalib/src/glsl/ir_constant_expression.cpp | 2 +-
mesalib/src/glsl/ir_function.cpp | 2 +-
mesalib/src/glsl/ir_hv_accept.cpp | 20 -
mesalib/src/glsl/ir_print_visitor.cpp | 27 +-
mesalib/src/glsl/ir_reader.cpp | 42 +-
mesalib/src/glsl/ir_set_program_inouts.cpp | 35 +-
mesalib/src/glsl/ir_validate.cpp | 47 +-
mesalib/src/glsl/link_atomics.cpp | 20 +-
mesalib/src/glsl/link_functions.cpp | 10 +-
mesalib/src/glsl/link_interface_blocks.cpp | 12 +-
mesalib/src/glsl/link_uniform_initializers.cpp | 6 +-
mesalib/src/glsl/link_uniforms.cpp | 20 +-
mesalib/src/glsl/link_varyings.cpp | 98 +-
mesalib/src/glsl/linker.cpp | 173 +--
mesalib/src/glsl/loop_analysis.cpp | 196 +++-
mesalib/src/glsl/loop_analysis.h | 93 +-
mesalib/src/glsl/loop_controls.cpp | 127 +--
mesalib/src/glsl/loop_unroll.cpp | 318 ++++--
mesalib/src/glsl/lower_clip_distance.cpp | 18 +-
mesalib/src/glsl/lower_instructions.cpp | 4 +-
mesalib/src/glsl/lower_named_interface_blocks.cpp | 21 +-
mesalib/src/glsl/lower_output_reads.cpp | 2 +-
mesalib/src/glsl/lower_packed_varyings.cpp | 21 +-
mesalib/src/glsl/lower_ubo_reference.cpp | 2 +-
.../glsl/lower_variable_index_to_cond_assign.cpp | 2 +-
mesalib/src/glsl/opt_array_splitting.cpp | 4 +-
mesalib/src/glsl/opt_constant_folding.cpp | 4 +-
mesalib/src/glsl/opt_constant_propagation.cpp | 4 +-
mesalib/src/glsl/opt_constant_variable.cpp | 4 +-
mesalib/src/glsl/opt_copy_propagation.cpp | 4 +-
mesalib/src/glsl/opt_copy_propagation_elements.cpp | 4 +-
mesalib/src/glsl/opt_cse.cpp | 2 +-
mesalib/src/glsl/opt_dead_builtin_varyings.cpp | 22 +-
mesalib/src/glsl/opt_dead_code.cpp | 8 +-
mesalib/src/glsl/opt_dead_code_local.cpp | 2 +-
mesalib/src/glsl/opt_flip_matrices.cpp | 4 +-
mesalib/src/glsl/opt_function_inlining.cpp | 14 +-
mesalib/src/glsl/opt_structure_splitting.cpp | 4 +-
mesalib/src/glsl/opt_tree_grafting.cpp | 10 +-
mesalib/src/glsl/standalone_scaffolding.h | 2 +-
.../src/mapi/glapi/gen/ARB_clear_buffer_object.xml | 50 +
mesalib/src/mapi/glapi/gen/ARB_texture_view.xml | 23 +
mesalib/src/mapi/glapi/gen/Makefile.am | 1 +
mesalib/src/mapi/glapi/gen/gl_API.xml | 8 +-
mesalib/src/mapi/glapi/gen/gl_genexec.py | 1 +
mesalib/src/mapi/glapi/gen/gl_gentable.py | 2 +
mesalib/src/mesa/Makefile.am | 6 +-
mesalib/src/mesa/Makefile.sources | 1 +
mesalib/src/mesa/SConscript | 1 +
mesalib/src/mesa/drivers/common/driverfuncs.c | 3 +
mesalib/src/mesa/drivers/dri/common/dri_util.c | 26 +-
mesalib/src/mesa/drivers/dri/common/dri_util.h | 8 +-
.../src/mesa/drivers/dri/common/megadriver_stub.c | 126 ++
mesalib/src/mesa/drivers/dri/swrast/swrast.c | 39 +-
mesalib/src/mesa/main/attrib.c | 326 ++++--
mesalib/src/mesa/main/bufferobj.c | 406 ++++++-
mesalib/src/mesa/main/bufferobj.h | 59 +-
mesalib/src/mesa/main/clear.c | 31 +-
mesalib/src/mesa/main/colortab.c | 20 +-
mesalib/src/mesa/main/condrender.c | 4 +-
mesalib/src/mesa/main/context.c | 1 +
mesalib/src/mesa/main/convolve.c | 24 +-
mesalib/src/mesa/main/dd.h | 11 +
mesalib/src/mesa/main/dlist.c | 1074 ++++++-----------
mesalib/src/mesa/main/enable.c | 19 -
mesalib/src/mesa/main/extensions.c | 27 +-
mesalib/src/mesa/main/fbobject.c | 31 +-
mesalib/src/mesa/main/ff_fragment_shader.cpp | 16 +-
mesalib/src/mesa/main/get.c | 8 +-
mesalib/src/mesa/main/get_hash_params.py | 8 +-
mesalib/src/mesa/main/getstring.c | 2 -
mesalib/src/mesa/main/glformats.c | 12 +-
mesalib/src/mesa/main/imports.c | 14 +-
mesalib/src/mesa/main/mipmap.c | 8 +-
mesalib/src/mesa/main/mipmap.h | 4 +
mesalib/src/mesa/main/mtypes.h | 35 +-
mesalib/src/mesa/main/performance_monitor.c | 19 +
mesalib/src/mesa/main/performance_monitor.h | 3 +
mesalib/src/mesa/main/shader_query.cpp | 36 +-
mesalib/src/mesa/main/shaderapi.c | 2 +-
mesalib/src/mesa/main/shaderobj.h | 2 +-
mesalib/src/mesa/main/texgetimage.c | 3 +-
mesalib/src/mesa/main/teximage.c | 255 ++---
mesalib/src/mesa/main/teximage.h | 4 +
mesalib/src/mesa/main/texobj.c | 29 +-
mesalib/src/mesa/main/texparam.c | 75 +-
mesalib/src/mesa/main/texstorage.c | 36 +-
mesalib/src/mesa/main/texstore.c | 1 +
mesalib/src/mesa/main/textureview.c | 668 +++++++++++
mesalib/src/mesa/main/textureview.h | 43 +
mesalib/src/mesa/main/version.c | 1 -
mesalib/src/mesa/math/m_matrix.c | 13 +-
mesalib/src/mesa/program/ir_to_mesa.cpp | 63 +-
mesalib/src/mesa/program/prog_parameter.c | 3 +-
mesalib/src/mesa/program/program.c | 8 +
mesalib/src/mesa/program/program_parse_extra.c | 9 -
.../src/mesa/state_tracker/st_atom_framebuffer.c | 58 +-
mesalib/src/mesa/state_tracker/st_atom_sampler.c | 32 +-
.../src/mesa/state_tracker/st_cb_bufferobjects.c | 3 +
mesalib/src/mesa/state_tracker/st_cb_clear.c | 124 +-
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 19 +-
mesalib/src/mesa/state_tracker/st_cb_fbo.c | 97 +-
mesalib/src/mesa/state_tracker/st_cb_fbo.h | 10 +-
mesalib/src/mesa/state_tracker/st_cb_readpixels.c | 4 +-
mesalib/src/mesa/state_tracker/st_cb_texture.c | 10 +-
mesalib/src/mesa/state_tracker/st_context.h | 1 +
mesalib/src/mesa/state_tracker/st_extensions.c | 16 +-
mesalib/src/mesa/state_tracker/st_format.c | 6 +-
mesalib/src/mesa/state_tracker/st_format.h | 2 +-
mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 74 +-
mesalib/src/mesa/state_tracker/st_program.c | 9 +
mesalib/src/mesa/state_tracker/st_texture.h | 6 +
mesalib/src/mesa/swrast/s_texture.c | 7 +-
mesalib/src/mesa/tnl/t_vertex.c | 6 +-
mesalib/src/mesa/vbo/vbo_exec_api.c | 9 +-
mesalib/src/mesa/x86/rtasm/x86sse.c | 1203 --------------------
mesalib/src/mesa/x86/rtasm/x86sse.h | 256 -----
pixman/pixman/pixman-combine-float.c | 2 +-
pixman/pixman/pixman-combine32.c | 2 +-
pixman/pixman/pixman-general.c | 6 +-
pixman/test/blitters-test.c | 2 +-
pixman/test/composite.c | 11 -
xorg-server/Xext/panoramiX.c | 5 +-
xorg-server/Xext/panoramiXsrv.h | 1 +
xorg-server/Xext/shm.c | 34 +-
xorg-server/Xi/exevents.c | 6 +-
xorg-server/composite/compinit.c | 7 +-
xorg-server/composite/compoverlay.c | 5 +-
xorg-server/configure.ac | 75 +-
xorg-server/damageext/damageext.c | 389 ++++++-
xorg-server/damageext/damageextint.h | 3 +
xorg-server/dix/dispatch.c | 5 +-
xorg-server/dix/events.c | 2 +-
xorg-server/dix/window.c | 6 +-
xorg-server/dri3/dri3.c | 5 +
xorg-server/dri3/dri3_request.c | 5 +-
xorg-server/dri3/dri3_screen.c | 6 +
xorg-server/glx/Makefile.am | 4 +-
xorg-server/glx/glxcmds.c | 61 +
xorg-server/glx/glxdri2.c | 43 +-
xorg-server/glx/glxdricommon.c | 2 +-
xorg-server/glx/glxdriswrast.c | 11 +-
xorg-server/glx/glxext.c | 11 +-
xorg-server/glx/glxserver.h | 13 +-
xorg-server/glx/glxstubs.c | 50 -
xorg-server/glx/indirect_dispatch.c | 650 +++++++----
xorg-server/glx/indirect_dispatch_swap.c | 969 ++++++++++------
xorg-server/glx/indirect_program.c | 34 +-
xorg-server/glx/render2.c | 12 +-
xorg-server/glx/render2swap.c | 12 +-
xorg-server/hw/kdrive/ephyr/ephyr.c | 8 +-
xorg-server/hw/xfree86/common/xf86AutoConfig.c | 17 +-
xorg-server/hw/xfree86/common/xf86Config.c | 2 +-
xorg-server/hw/xfree86/common/xf86Helper.c | 7 +-
xorg-server/hw/xfree86/dri2/dri2ext.c | 5 +
xorg-server/hw/xquartz/GL/indirect.c | 26 +-
xorg-server/hw/xquartz/X11Controller.m | 8 +-
xorg-server/hw/xwin/Makefile.am | 2 +-
xorg-server/hw/xwin/glx/Makefile.am | 32 +-
xorg-server/hw/xwin/glx/gen_gl_wrappers.py | 766 ++++++++-----
xorg-server/hw/xwin/glx/glshim.c | 124 ++
xorg-server/hw/xwin/glx/glthunk.c | 87 ++
xorg-server/hw/xwin/glx/glwindows.h | 7 +-
xorg-server/hw/xwin/glx/glwrap.c | 146 ---
xorg-server/hw/xwin/glx/indirect.c | 30 +-
xorg-server/include/dix-config.h.in | 3 +
xorg-server/include/os.h | 3 +
xorg-server/include/protocol-versions.h | 8 +
xorg-server/miext/sync/misyncshm.c | 5 +-
xorg-server/os/osinit.c | 13 +-
xorg-server/os/utils.c | 24 +
xorg-server/present/present.c | 91 +-
xorg-server/present/present.h | 9 +
xorg-server/present/present_event.c | 10 +
xorg-server/present/present_priv.h | 7 +-
xorg-server/present/present_request.c | 5 +-
xorg-server/present/present_screen.c | 5 +
xorg-server/xfixes/region.c | 26 +
xorg-server/xkeyboard-config/rules/HDR | 1 +
xorg-server/xkeyboard-config/rules/Makefile.am | 11 +
.../xkeyboard-config/rules/base.extras.xml.in | 12 +-
.../xkeyboard-config/rules/base.lists.base.part | 54 +
xorg-server/xkeyboard-config/rules/base.lists.part | 42 +-
xorg-server/xkeyboard-config/rules/base.ml_s1.part | 1 +
xorg-server/xkeyboard-config/rules/base.o_s.part | 1 +
xorg-server/xkeyboard-config/rules/base.xml.in | 46 +-
.../xkeyboard-config/rules/evdev.lists.part | 1 +
xorg-server/xkeyboard-config/symbols/af | 10 +-
xorg-server/xkeyboard-config/symbols/altwin | 27 +-
xorg-server/xkeyboard-config/symbols/am | 4 +-
xorg-server/xkeyboard-config/symbols/apl | 65 +-
xorg-server/xkeyboard-config/symbols/ara | 127 +--
xorg-server/xkeyboard-config/symbols/at | 2 +-
xorg-server/xkeyboard-config/symbols/ba | 8 +-
xorg-server/xkeyboard-config/symbols/bd | 4 +-
xorg-server/xkeyboard-config/symbols/bg | 492 ++++----
xorg-server/xkeyboard-config/symbols/bt | 4 +-
xorg-server/xkeyboard-config/symbols/bw | 2 +-
xorg-server/xkeyboard-config/symbols/by | 6 +-
xorg-server/xkeyboard-config/symbols/ca | 16 +-
xorg-server/xkeyboard-config/symbols/capslock | 2 +-
xorg-server/xkeyboard-config/symbols/ch | 22 +-
xorg-server/xkeyboard-config/symbols/cn | 6 +-
xorg-server/xkeyboard-config/symbols/ctrl | 57 +-
xorg-server/xkeyboard-config/symbols/cz | 10 +-
xorg-server/xkeyboard-config/symbols/de | 18 +-
xorg-server/xkeyboard-config/symbols/dk | 6 +-
xorg-server/xkeyboard-config/symbols/ee | 4 +-
xorg-server/xkeyboard-config/symbols/es | 4 +-
xorg-server/xkeyboard-config/symbols/fo | 2 +-
xorg-server/xkeyboard-config/symbols/fr | 2 +
xorg-server/xkeyboard-config/symbols/gb | 16 +-
xorg-server/xkeyboard-config/symbols/ge | 2 +-
xorg-server/xkeyboard-config/symbols/gh | 18 +-
xorg-server/xkeyboard-config/symbols/group | 312 +++--
xorg-server/xkeyboard-config/symbols/hr | 8 +-
xorg-server/xkeyboard-config/symbols/hu | 3 +-
xorg-server/xkeyboard-config/symbols/ie | 4 +-
xorg-server/xkeyboard-config/symbols/il | 20 +-
xorg-server/xkeyboard-config/symbols/in | 148 +--
xorg-server/xkeyboard-config/symbols/inet | 212 ++--
xorg-server/xkeyboard-config/symbols/ir | 104 +-
xorg-server/xkeyboard-config/symbols/is | 12 +-
xorg-server/xkeyboard-config/symbols/it | 4 +-
xorg-server/xkeyboard-config/symbols/jp | 8 +
xorg-server/xkeyboard-config/symbols/ke | 10 +-
xorg-server/xkeyboard-config/symbols/keypad | 10 +-
xorg-server/xkeyboard-config/symbols/kh | 6 +-
xorg-server/xkeyboard-config/symbols/kr | 4 +-
xorg-server/xkeyboard-config/symbols/lt | 10 +-
xorg-server/xkeyboard-config/symbols/mao | 5 +-
xorg-server/xkeyboard-config/symbols/md | 12 +-
xorg-server/xkeyboard-config/symbols/mk | 2 +-
xorg-server/xkeyboard-config/symbols/mv | 2 +-
xorg-server/xkeyboard-config/symbols/ng | 6 +-
xorg-server/xkeyboard-config/symbols/nl | 4 +-
xorg-server/xkeyboard-config/symbols/no | 8 +-
xorg-server/xkeyboard-config/symbols/pk | 2 +-
xorg-server/xkeyboard-config/symbols/pl | 11 +-
xorg-server/xkeyboard-config/symbols/ru | 38 +-
xorg-server/xkeyboard-config/symbols/se | 4 +-
xorg-server/xkeyboard-config/symbols/si | 4 +-
xorg-server/xkeyboard-config/symbols/sk | 10 +-
xorg-server/xkeyboard-config/symbols/srvr_ctrl | 20 +-
xorg-server/xkeyboard-config/symbols/th | 6 +-
xorg-server/xkeyboard-config/symbols/tj | 194 ++--
xorg-server/xkeyboard-config/symbols/tm | 2 +-
xorg-server/xkeyboard-config/symbols/ua | 8 +-
xorg-server/xkeyboard-config/symbols/us | 46 +-
xorg-server/xkeyboard-config/symbols/uz | 55 +-
xorg-server/xkeyboard-config/symbols/za | 60 +-
324 files changed, 9447 insertions(+), 7018 deletions(-)
create mode 100644 fontconfig/m4/ac_check_symbol.m4
create mode 100644 mesalib/docs/relnotes/10.0.1.html
create mode 100644 mesalib/docs/relnotes/9.2.5.html
create mode 100644 mesalib/docs/specs/WL_create_wayland_buffer_from_image.spec
create mode 100644 mesalib/include/HaikuGL/GLRenderer.h
create mode 100644 mesalib/include/HaikuGL/GLView.h
create mode 100644 mesalib/include/HaikuGL/OpenGLKit.h
create mode 100644 mesalib/include/HaikuGL/README
create mode 100644 mesalib/m4/ax_check_compile_flag.m4
create mode 100644 mesalib/src/mapi/glapi/gen/ARB_clear_buffer_object.xml
create mode 100644 mesalib/src/mapi/glapi/gen/ARB_texture_view.xml
create mode 100644 mesalib/src/mesa/main/textureview.c
create mode 100644 mesalib/src/mesa/main/textureview.h
delete mode 100644 mesalib/src/mesa/x86/rtasm/x86sse.c
delete mode 100644 mesalib/src/mesa/x86/rtasm/x86sse.h
delete mode 100644 xorg-server/glx/glxstubs.c
create mode 100644 xorg-server/hw/xwin/glx/glshim.c
create mode 100644 xorg-server/hw/xwin/glx/glthunk.c
delete mode 100644 xorg-server/hw/xwin/glx/glwrap.c
create mode 100644 xorg-server/xkeyboard-config/rules/base.lists.base.part
create mode 100644 xorg-server/xkeyboard-config/rules/base.ml_s1.part
create mode 100644 xorg-server/xkeyboard-config/rules/evdev.lists.part
diff --git a/X11/xtrans/Xtransint.h b/X11/xtrans/Xtransint.h
index 1f32f0cae..ec5a77203 100644
--- a/X11/xtrans/Xtransint.h
+++ b/X11/xtrans/Xtransint.h
@@ -72,10 +72,6 @@ from The Open Group.
# define XTRANSDEBUG 1
#endif
-#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun))
-#error "FD passing support only on Linux & Solaris"
-#endif
-
#ifdef WIN32
# define _WILLWINSOCK_
#endif
diff --git a/X11/xtrans/Xtransutil.c b/X11/xtrans/Xtransutil.c
index a6928bb87..63f0fc355 100644
--- a/X11/xtrans/Xtransutil.c
+++ b/X11/xtrans/Xtransutil.c
@@ -306,24 +306,12 @@ static jmp_buf env;
#ifdef SIGALRM
static volatile int nameserver_timedout = 0;
-static
-#ifdef RETSIGTYPE /* set by autoconf AC_TYPE_SIGNAL */
-RETSIGTYPE
-#else /* Imake */
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-#endif
+static void
nameserver_lost(int sig _X_UNUSED)
{
nameserver_timedout = 1;
longjmp (env, -1);
/* NOTREACHED */
-#ifdef SIGNALRETURNSINT
- return -1; /* for picky compilers */
-#endif
}
#endif /* SIGALARM */
diff --git a/X11/xtrans/xtrans.m4 b/X11/xtrans/xtrans.m4
index d84442e86..fe128b47e 100644
--- a/X11/xtrans/xtrans.m4
+++ b/X11/xtrans/xtrans.m4
@@ -29,12 +29,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_SEARCH_LIBS(socket, [socket])
AC_SEARCH_LIBS(gethostbyname, [nsl])
if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
- AC_HAVE_LIBRARY([ws2_32])
+ AC_CHECK_LIB([ws2_32],[main])
fi
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
AC_ARG_ENABLE(ipv6,
- AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
+ AS_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
[IPV6CONN=$enableval],
[AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])])
AC_MSG_CHECKING([if IPv6 support should be built])
@@ -100,13 +100,12 @@ AC_INCLUDES_DEFAULT
# that use Xtrans functions
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_TYPE_SIGNAL])
[case $host_os in
mingw*) unixdef="no" ;;
*) unixdef="yes" ;;
esac]
AC_ARG_ENABLE(unix-transport,
- AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
+ AS_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
[UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
@@ -114,7 +113,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
fi
AC_MSG_RESULT($UNIXCONN)
AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ AS_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
[TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
@@ -127,7 +126,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
*) localdef="no" ;;
esac]
AC_ARG_ENABLE(local-transport,
- AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]),
+ AS_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]),
[LOCALCONN=$enableval], [LOCALCONN=$localdef])
AC_MSG_CHECKING([if Xtrans should support os-specific local connections])
AC_MSG_RESULT($LOCALCONN)
@@ -145,7 +144,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_DEFUN([XTRANS_SECURE_RPC_FLAGS],
[AC_REQUIRE([XTRANS_TCP_FLAGS])
AC_ARG_ENABLE(secure-rpc,
- AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]),
+ AS_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]),
[SECURE_RPC=$enableval], [SECURE_RPC="try"])
if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then
diff --git a/fontconfig/autogen.sh b/fontconfig/autogen.sh
index 1482e401c..29c1fd26c 100644
--- a/fontconfig/autogen.sh
+++ b/fontconfig/autogen.sh
@@ -24,10 +24,19 @@ LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOMAKE=${AUTOMAKE-automake}
AUTOHEADER=${AUTOHEADER-autoheader}
AUTOCONF=${AUTOCONF-autoconf}
+GPERF=${GPERF-gperf}
LIBTOOLIZE_FLAGS="--copy --force"
DIE=0
+($GPERF --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have gperf installed to compile $PROJECT."
+ echo "Install the appropriate package for your distribution."
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ DIE=1
+}
+
have_libtool=false
if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
libtool_version=`$LIBTOOLIZE --version | sed 's/^.* \([0-9][.][0-9.]*\)[^ ]*$/\1/'`
diff --git a/fontconfig/conf.d/10-no-sub-pixel.conf b/fontconfig/conf.d/10-no-sub-pixel.conf
index cf1246561..635847c40 100644
--- a/fontconfig/conf.d/10-no-sub-pixel.conf
+++ b/fontconfig/conf.d/10-no-sub-pixel.conf
@@ -1,7 +1,7 @@
-
+
@@ -494,4 +516,25 @@ but in an order preferring similar designs first. We do this in three steps:
+
+ Cambria
+
+ Caladea
+
+
+
+
+ Calibri
+
+ Carlito
+
+
+
+
+ Symbol
+
+ SymbolNeu
+
+
+
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 44789149b..728a55099 100644
--- a/fontconfig/configure.ac
+++ b/fontconfig/configure.ac
@@ -148,52 +148,42 @@ AC_TYPE_PID_T
# Checks for library functions.
AC_FUNC_VPRINTF
AC_FUNC_MMAP
-AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat])
+AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat])
dnl AC_CHECK_FUNCS doesn't check for header files.
dnl posix_fadvise() may be not available in older libc.
-fc_saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $WARN_CFLAGS -Werror"
-AC_MSG_CHECKING([for posix_fadvise])
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
- #include
- int main(void) {
- return posix_fadvise(0, 0, 0, 0);
- }
- ]])],[
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_POSIX_FADVISE], [1], [Define to 1 if you have the 'posix_fadvise' function.])
- ],[AC_MSG_RESULT([no])])
+AC_CHECK_SYMBOL([posix_fadvise], [fcntl.h], [fc_func_posix_fadvise=1], [fc_func_posix_fadvise=0])
+AC_DEFINE_UNQUOTED([HAVE_POSIX_FADVISE], [$fc_func_posix_fadvise], [Define to 1 if you have the 'posix_fadivse' function.])
if test "$os_win32" = "no"; then
AC_MSG_CHECKING([for scandir])
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ fc_saved_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $WARN_CFLAGS -Werror"
+ AC_TRY_COMPILE([
#include
- int comp(const struct dirent **, const struct dirent **);
- int comp(const struct dirent **a, const struct dirent **b) { return 0; }
- int main(void) {
- struct dirent **d;
- return scandir(".", &d, 0, &comp) >= 0;
- }
- ]])],[
+ int main(void);
+ ], [
+ int (* comp) (const struct dirent **, const struct dirent **) = 0;
+ struct dirent **d;
+ return scandir(".", &d, 0, comp) >= 0;
+ ], [
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_SCANDIR], [1], [Define to 1 if you have the 'scandir' function.])
+ ], [
+ AC_TRY_COMPILE([
+ #include
+ int main(void);
+ ], [
+ int (* comp) (const void *, const void *) = 0;
+ struct dirent **d;
+ return scandir(".", &d, 0, comp) >= 0;
+ ], [
AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_SCANDIR], [1], [Define to 1 if you have the 'scandir' function.])
+ AC_DEFINE([HAVE_SCANDIR_VOID_P], [1], [Define to 1 if you have the 'scandir' function with int (* compar)(const void *, const void *)])
],[
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
- #include
- int comp(const void *, const void *);
- int comp(const void *a, const void *b) { return 0; }
- int main(void) {
- struct dirent **d;
- return scandir(".", &d, 0, &comp) >= 0;
- }
- ]])],[
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_SCANDIR_VOID_P], [1], [Define to 1 if you have the 'scandir' function with int (* compar)(const void *, const void *)])
- ],[
- AC_MSG_ERROR([
+ AC_MSG_ERROR([
*** No scandir function available.])
- ])
])
+ ])
fi
CFLAGS="$fc_saved_CFLAGS"
@@ -531,7 +521,7 @@ AC_ARG_WITH(cache-dir,
case $fc_cachedir in
no|yes)
if test "$os_win32" = "yes"; then
- fc_cachedir="WINDOWSTEMPDIR_FONTCONFIG_CACHE"
+ fc_cachedir="LOCAL_APPDATA_FONTCONFIG_CACHE"
else
fc_cachedir='${localstatedir}/cache/${PACKAGE}'
fi
diff --git a/fontconfig/m4/ac_check_symbol.m4 b/fontconfig/m4/ac_check_symbol.m4
new file mode 100644
index 000000000..41c15286a
--- /dev/null
+++ b/fontconfig/m4/ac_check_symbol.m4
@@ -0,0 +1,48 @@
+dnl @synopsis AC_CHECK_SYMBOL(SYMBOL, HEADER... [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
+dnl
+dnl a wrapper around AC_EGREP_HEADER the shellvar $ac_found will hold
+dnl the HEADER-name that had been containing the symbol. This value is
+dnl shown to the user.
+dnl
+dnl @category C
+dnl @author Guido U. Draheim
+dnl @version 2006-10-13
+dnl @license GPLWithACException
+
+AC_DEFUN([AC_CHECK_SYMBOL],
+[AC_MSG_CHECKING([for $1 in $2])
+AC_CACHE_VAL(ac_cv_func_$1,
+[AC_REQUIRE_CPP()dnl
+changequote(, )dnl
+symbol="[^a-zA-Z_0-9]$1[^a-zA-Z_0-9]"
+changequote([, ])dnl
+ac_found=no
+for ac_header in $2 ; do
+ ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%' `
+ if test $ac_found != "yes" ; then
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ AC_EGREP_HEADER( $symbol, $ac_header, [ac_found="$ac_header"] )
+ fi
+ fi
+done
+if test "$ac_found" != "no" ; then
+ AC_MSG_RESULT($ac_found)
+ ifelse([$3], , :, [$3])
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], , , [$4
+])dnl
+fi
+])])
+
+dnl AC_CHECK_SYMBOLS( symbol..., header... [, action-if-found [, action-if-not-found]])
+AC_DEFUN([AC_CHECK_SYMBOLS],
+[for ac_func in $1
+do
+P4_CHECK_SYMBOL($ac_func, $2,
+[changequote(, )dnl
+ ac_tr_func=HAVE_`echo $ac_func | sed -e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:' -e 's:[[^A-Z0-9]]:_:'`
+changequote([, ])dnl
+ AC_DEFINE_UNQUOTED($ac_tr_func) $2], $3)dnl
+done
+])
diff --git a/fontconfig/src/fccache.c b/fontconfig/src/fccache.c
index c7f243749..10eacffdf 100644
--- a/fontconfig/src/fccache.c
+++ b/fontconfig/src/fccache.c
@@ -573,7 +573,7 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
{
#if defined(HAVE_MMAP) || defined(__CYGWIN__)
cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
-#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
+#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
#endif
if (cache == MAP_FAILED)
diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c
index c6397c0c2..4beda7c00 100644
--- a/fontconfig/src/fcdefault.c
+++ b/fontconfig/src/fcdefault.c
@@ -149,7 +149,7 @@ retry:
#else
# if defined (HAVE_GETEXECNAME)
const char *p = getexecname ();
-# else
+# elif defined (HAVE_READLINK)
char buf[PATH_MAX + 1];
int len;
char *p = NULL;
@@ -160,6 +160,8 @@ retry:
buf[len] = '\0';
p = buf;
}
+# else
+ char *p = NULL;
# endif
if (p)
{
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index 627aa1a16..93e013f9b 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -743,6 +743,7 @@ FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **csp, FcBool tr
{
FcBool ret = FcFalse;
FcCharSet *cs;
+ int i;
cs = 0;
if (trim || csp)
@@ -752,7 +753,7 @@ FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **csp, FcBool tr
goto bail;
}
- while (nnode--)
+ for (i = 0; i < nnode; i++)
{
FcSortNode *node = *n++;
FcBool adds_chars = FcFalse;
@@ -776,7 +777,7 @@ FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **csp, FcBool tr
* If this font isn't a subset of the previous fonts,
* add it to the list
*/
- if (!trim || adds_chars)
+ if (!i || !trim || adds_chars)
{
FcPatternReference (node->pattern);
if (FcDebug () & FC_DBG_MATCHV)
diff --git a/gl/configure.ac b/gl/configure.ac
index 04511930e..7b0c60899 100644
--- a/gl/configure.ac
+++ b/gl/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([GLProto], [1.4.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.17], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
diff --git a/gl/glxtokens.h b/gl/glxtokens.h
index 5e6bbea11..a95082e47 100644
--- a/gl/glxtokens.h
+++ b/gl/glxtokens.h
@@ -107,6 +107,8 @@ extern "C" {
/* GLX_RENDER_TYPE bits */
#define GLX_RGBA_BIT 0x00000001
#define GLX_COLOR_INDEX_BIT 0x00000002
+#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008
/* GLX_DRAWABLE_TYPE bits */
#define GLX_WINDOW_BIT 0x00000001
diff --git a/libX11/include/X11/Xlib.h b/libX11/include/X11/Xlib.h
index 65f253cd4..2bffa76de 100644
--- a/libX11/include/X11/Xlib.h
+++ b/libX11/include/X11/Xlib.h
@@ -58,23 +58,11 @@ typedef unsigned long wchar_t;
#endif
#endif
-#if defined(ISC) && defined(USE_XMBTOWC)
-#define wctomb(a,b) _Xwctomb(a,b)
-#define mblen(a,b) _Xmblen(a,b)
-#ifndef USE_XWCHAR_STRING
-#define mbtowc(a,b,c) _Xmbtowc(a,b,c)
-#endif
-#endif
extern int
_Xmblen(
-#ifdef ISC
- char const *str,
- size_t len
-#else
char *str,
int len
-#endif
);
/* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
@@ -3999,13 +3987,8 @@ extern void XSetAuthorization(
extern int _Xmbtowc(
wchar_t * /* wstr */,
-#ifdef ISC
- char const * /* str */,
- size_t /* len */
-#else
char * /* str */,
int /* len */
-#endif
);
extern int _Xwctomb(
diff --git a/libX11/modules/om/generic/omGeneric.c b/libX11/modules/om/generic/omGeneric.c
index 7122bb762..0d202c0f6 100644
--- a/libX11/modules/om/generic/omGeneric.c
+++ b/libX11/modules/om/generic/omGeneric.c
@@ -833,7 +833,7 @@ parse_omit_name(
return True;
/* This may mot be needed anymore as XListFonts() takes care of this */
- while (num_fields < 12) {
+ if (num_fields < 12) {
if ((last - buf) > (XLFD_MAX_LEN - 2))
return -1;
*last = '*';
diff --git a/libX11/src/xlibi18n/lcStd.c b/libX11/src/xlibi18n/lcStd.c
index 87f6b60b3..9d452bcae 100644
--- a/libX11/src/xlibi18n/lcStd.c
+++ b/libX11/src/xlibi18n/lcStd.c
@@ -199,13 +199,8 @@ _Xlcwcstombs(
int
_Xmbtowc(
wchar_t *wstr,
-#ifdef ISC
- char const *str,
- size_t len
-#else
char *str,
int len
-#endif
)
{
return _Xlcmbtowc((XLCd) NULL, wstr, str, len);
@@ -213,13 +208,8 @@ _Xmbtowc(
int
_Xmblen(
-#ifdef ISC
- char const *str,
- size_t len
-#else
char *str,
int len
-#endif
)
{
return _Xmbtowc((wchar_t *) NULL, str, len);
diff --git a/libXft/src/xftglyphs.c b/libXft/src/xftglyphs.c
index 2f3dc5a6b..4b5fb82e5 100644
--- a/libXft/src/xftglyphs.c
+++ b/libXft/src/xftglyphs.c
@@ -21,10 +21,10 @@
*/
#include "xftint.h"
-#include
-#include
+#include FT_OUTLINE_H
+#include FT_LCD_FILTER_H
-#include
+#include FT_SYNTHESIS_H
/*
* Validate the memory info for a font
diff --git a/libXmu/src/ShapeWidg.c b/libXmu/src/ShapeWidg.c
index 32388ee46..3ca711648 100644
--- a/libXmu/src/ShapeWidg.c
+++ b/libXmu/src/ShapeWidg.c
@@ -201,7 +201,7 @@ ShapeEllipseOrRoundedRectangle(Widget w, Bool ellipse, int ew, int eh)
GC gc;
unsigned long mask;
- if (width < 3 || width < 3)
+ if (width < 3 || height < 3)
return;
width += w->core.border_width << 1;
height += w->core.border_width << 1;
diff --git a/libxcb/NEWS b/libxcb/NEWS
index 533d72b87..d0198f59c 100644
--- a/libxcb/NEWS
+++ b/libxcb/NEWS
@@ -1,6 +1,43 @@
+Release 1.10 (2013-12-XX)
+=========================
+* Bump libxcb-xkb SONAME due to ABI break introduced in 1.9.2
+* Enable libxcb-xkb by default
+* Bump libxcb-sync SONAME
+* c_client.py: Fix _sizeof() functions
+* c_client.py: Do not create pointers in unions
+* c_client.py: Always initialize xcb_align_to
+* Re-introduce xcb_ge_event_t (deprecated, xcb_ge_generic_event_t should be
+ used instead)
+* Fix alignment issues in FD passing code
+* Fix poll() if POLLIN == ROLLRDNORM|POLLRDBAND
+* Use /usr/spool/sockets/X11/ on HP-UX for UNIX sockets
+* Make xsltproc optional
+
+Release 1.9.3 (2013-11-07)
+==========================
+* Check if we need to define _XOPEN_SOURCE for struct msghdr.msg_control
+* Add configure option to enable or disable fd passing with sendmsg
+* Switch to using the CMSG_* macros for FD passing
+* Initialize automake earlier (bugfix for #66413)
+
+Release 1.9.2 (2013-11-07)
+==========================
+* Add Present extension
+* Add DRI3 library
+* Add event queue splitting
+* Add support for receiving fds in replies
+* Add xcb_send_fd API
+* Remove xcb_ge_event_t from xcb.h
+* c_client.py: Inject full_sequence into GE events
+* c_client.py: Handle multiple expr. in a bitcase
+
+Release 1.9.1 (2013-05-30)
+==========================
+* Fix python code to work with python-3
+* Security fix for integer overflow in read_packet() [CVE-2013-2064]
+
Release 1.9 (2012-10-05)
========================
-
* Always include "config.h" at the start of all C source files.
* Add AC_USE_SYSTEM_EXTENSIONS to allow use of more system functionality
* Return connection failure if display string specifies non-existent screen
diff --git a/libxcb/configure.ac b/libxcb/configure.ac
index 87804ba26..294bd1a92 100644
--- a/libxcb/configure.ac
+++ b/libxcb/configure.ac
@@ -41,7 +41,7 @@ fi
AC_SUBST(HTML_CHECK_RESULT)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.9)
+PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.10)
NEEDED="pthread-stubs xau >= 0.99.2"
PKG_CHECK_MODULES(NEEDED, $NEEDED)
diff --git a/libxcb/src/Makefile.am b/libxcb/src/Makefile.am
index 346ee03cc..f2875dd18 100644
--- a/libxcb/src/Makefile.am
+++ b/libxcb/src/Makefile.am
@@ -139,7 +139,7 @@ endif
EXTSOURCES += sync.c
if BUILD_SYNC
lib_LTLIBRARIES += libxcb-sync.la
-libxcb_sync_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@
libxcb_sync_la_LIBADD = $(XCB_LIBS)
nodist_libxcb_sync_la_SOURCES = sync.c sync.h
endif
@@ -179,7 +179,7 @@ endif
EXTSOURCES += xinput.c
if BUILD_XINPUT
lib_LTLIBRARIES += libxcb-xinput.la
-libxcb_xinput_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
libxcb_xinput_la_LIBADD = $(XCB_LIBS)
nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
endif
@@ -187,7 +187,7 @@ endif
EXTSOURCES += xkb.c
if BUILD_XKB
lib_LTLIBRARIES += libxcb-xkb.la
-libxcb_xkb_la_LDFLAGS = -version-info 0:0:0 -no-undefined
+libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libxcb_xkb_la_LIBADD = $(XCB_LIBS)
nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
endif
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py
index 72800045e..99fd307b0 100644
--- a/libxcb/src/c_client.py
+++ b/libxcb/src/c_client.py
@@ -1061,8 +1061,8 @@ def _c_serialize_helper(context, complex_type,
if context in ('unserialize', 'unpack', 'sizeof') and not self.var_followed_by_fixed_fields:
code_lines.append('%s xcb_block_len += sizeof(%s);' % (space, self.c_type))
code_lines.append('%s xcb_tmp += xcb_block_len;' % space)
- # probably not needed
- #_c_serialize_helper_insert_padding(context, code_lines, space, False)
+ code_lines.append('%s xcb_buffer_len += xcb_block_len;' % space)
+ code_lines.append('%s xcb_block_len = 0;' % space)
count += _c_serialize_helper_fields(context, self,
code_lines, temp_vars,
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 63864dc37..e62c985d5 100644
--- a/libxcb/src/xcb.h
+++ b/libxcb/src/xcb.h
@@ -140,6 +140,26 @@ typedef struct {
uint32_t full_sequence; /**< full sequence */
} xcb_generic_event_t;
+/**
+ * @brief GE event
+ *
+ * An event as sent by the XGE extension. The length field specifies the
+ * number of 4-byte blocks trailing the struct.
+ *
+ * @deprecated Since some fields in this struct have unfortunate names, it is
+ * recommended to use xcb_ge_generic_event_t instead.
+ */
+typedef struct {
+ uint8_t response_type; /**< Type of the response */
+ uint8_t pad0; /**< Padding */
+ uint16_t sequence; /**< Sequence number */
+ uint32_t length;
+ uint16_t event_type;
+ uint16_t pad1;
+ uint32_t pad[5]; /**< Padding */
+ uint32_t full_sequence; /**< full sequence */
+} xcb_ge_event_t;
+
/**
* @brief Generic error.
*
diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c
index fd6c2efd2..95087be4e 100644
--- a/libxcb/src/xcb_in.c
+++ b/libxcb/src/xcb_in.c
@@ -918,11 +918,13 @@ int _xcb_in_read(xcb_connection_t *c)
#if HAVE_SENDMSG
struct cmsghdr *hdr;
- for (hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) {
- if (hdr->cmsg_level == SOL_SOCKET && hdr->cmsg_type == SCM_RIGHTS) {
- int nfd = (hdr->cmsg_len - CMSG_LEN(0)) / sizeof (int);
- memcpy(&c->in.in_fd.fd[c->in.in_fd.nfd], CMSG_DATA(hdr), nfd * sizeof (int));
- c->in.in_fd.nfd += nfd;
+ if (msg.msg_controllen >= sizeof (struct cmsghdr)) {
+ for (hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) {
+ if (hdr->cmsg_level == SOL_SOCKET && hdr->cmsg_type == SCM_RIGHTS) {
+ int nfd = (hdr->cmsg_len - CMSG_LEN(0)) / sizeof (int);
+ memcpy(&c->in.in_fd.fd[c->in.in_fd.nfd], CMSG_DATA(hdr), nfd * sizeof (int));
+ c->in.in_fd.nfd += nfd;
+ }
}
}
#endif
diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS
index ebe184532..50ced6186 100644
--- a/libxcb/xcb-proto/NEWS
+++ b/libxcb/xcb-proto/NEWS
@@ -1,3 +1,64 @@
+Release 1.10 (2013-12-XX)
+=========================
+* xkb: comment out portions that libxcb doesn't handle properly
+* Present: Remove reference to nonexistent enum
+* sync: Add missing namespace for the INT64 struct
+* sync: VALUETYPE and TESTTYPE are enum
+* xinput: Add XI2 event enum. for event selection
+* Rename ge events to GeGeneric events to avoid clash with libxcb
+
+Release 1.9 (2013-11-07)
+========================
+* Add Present protocol specification
+* Add DRI3
+* Add MIT-SHM AttachFd and CreateSegment requests
+* Add support for file descriptor request fields
+* Define X generic event structure
+* Add CARD64/INT64 protocol types
+* XKB: Rewrite AXOption
+* XKB: Fix values of AXFBOpt enum
+* xkb: Fix struct ExtensionDeviceNotify
+* xkb: Pad structs CommonDoodad and SALockDeviceBtn
+* randr: Fix GetProviderProperty reply
+* Enforce a bit or value in enum items
+* xkb: Add missing LedClass and BellClass enum values
+* xkb: Add missing 'supported' field to GetNamedIndicator reply
+* xkb: Unify Overlay1Behavior and Overlay2Behavior
+* xkb: Change DfltBtnAbsolute to the value used by the server
+* xkb: Fix key type map entry field order
+* xkb: Work around alignment problems in GetNames and GetMap replies
+* xinput: Use BARRIER from xfixes
+* xinput: Unlock uninterpreted lists
+* xinput: Add XI v2.3
+* xinput: Add XI v2.2
+* xinput: Add XI v2.1
+* xinput: Add XI v2.0
+* xinput: Add XI v1.5
+* xinput: Cleanup implementation of XI up to v1.4
+* Add support for X Generic Extension events
+* sync: Change value list param of CreateAlarm and ChangeAlarm into switch
+* res: Add ClientIdMask enum
+* res: Fix and rename list in ClientIdValue
+* randr: Add provider object support (RandR v1.4)
+* xtest: Version bump 2.1..2.2
+* glx: Version bump 1.3..1.4
+* composite: Version bump 0.3..0.4
+* xfixes: Rename enum DirectionMask to BarrierDirec.
+* XKB: Correct enum to mask
+* screensaver: Use enum and mask attributes
+* screensaver: Remove wrong fields from Notify event
+* Prototype for XRes v1.2
+* XKB: Fix calculation in GetIndicatorMap
+* XKB: Fix GetKbdByName
+* Allow multiple in a
+* XKB: Change CARD8 to char where ASCII is expected
+* XKB: Fix VirtualMods
+* XKB: Fix SymInterpret
+* XKB: Fix CountedString16 padding
+* xkb: Revert half of d42d791 XKB: Fix broken events
+* xfixes: Update to version 5
+* autogen.sh: Implement GNOME Build API
+
Release 1.8 (2012-10-05)
========================
* dri2: Update to DRI2 1.4
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml
index dd3f18438..fa115bdcd 100644
--- a/libxcb/xcb-proto/src/xinput.xml
+++ b/libxcb/xcb-proto/src/xinput.xml
@@ -1790,10 +1790,10 @@ authorization from the authors.
-
+
-
+
@@ -2003,8 +2003,8 @@ authorization from the authors.
-
-
+
+
diff --git a/libxcb/xcb-proto/src/xproto.xml b/libxcb/xcb-proto/src/xproto.xml
index defa11e6e..07795682c 100644
--- a/libxcb/xcb-proto/src/xproto.xml
+++ b/libxcb/xcb-proto/src/xproto.xml
@@ -1080,7 +1080,7 @@ The number of keycodes altered.
-
+ generic event (with length)
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am
index 361fb5122..4780510ad 100644
--- a/mesalib/Makefile.am
+++ b/mesalib/Makefile.am
@@ -36,7 +36,6 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
EXTRA_FILES = \
aclocal.m4 \
configure \
- VERSION \
bin/ar-lib \
bin/compile \
bin/config.sub \
@@ -46,6 +45,7 @@ EXTRA_FILES = \
bin/ltmain.sh \
bin/missing \
bin/ylwrap \
+ bin/test-driver \
src/glsl/glsl_parser.cpp \
src/glsl/glsl_parser.h \
src/glsl/glsl_lexer.cpp \
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 8c52535e6..f75325d33 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -28,7 +28,7 @@ AC_SUBST([OSMESA_VERSION])
dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.24
-LIBDRM_RADEON_REQUIRED=2.4.49
+LIBDRM_RADEON_REQUIRED=2.4.50
LIBDRM_INTEL_REQUIRED=2.4.49
LIBDRM_NVVIEUX_REQUIRED=2.4.33
LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
@@ -230,6 +230,12 @@ esac
AC_SUBST([VISIBILITY_CFLAGS])
AC_SUBST([VISIBILITY_CXXFLAGS])
+dnl
+dnl Optional flags, check for compiler support
+dnl
+AX_CHECK_COMPILE_FLAG([-msse4.1], [SSE41_SUPPORTED=1], [SSE41_SUPPORTED=0])
+AM_CONDITIONAL([SSE41_SUPPORTED], [test x$SSE41_SUPPORTED = x1])
+
dnl
dnl Hacks to enable 32 or 64 bit build
dnl
@@ -761,6 +767,9 @@ AC_SUBST([MESA_LLVM])
# Check for libdrm
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
[have_libdrm=yes], [have_libdrm=no])
+if test "x$have_libdrm" = xyes; then
+ DEFINES="$DEFINES -DHAVE_LIBDRM"
+fi
PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED],
have_libudev=yes, have_libudev=no)
@@ -833,7 +842,7 @@ xyesno)
dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8"
if test x"$enable_dri3" = xyes; then
- dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence"
+ dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= 1.1"
fi
# add xf86vidmode if available
@@ -1439,6 +1448,8 @@ for plat in $egl_platforms; do
drm)
test "x$enable_gbm" = "xno" &&
AC_MSG_ERROR([EGL platform drm needs gbm])
+ test "x$have_libdrm" != xyes &&
+ AC_MSG_ERROR([EGL platform drm requires libdrm >= $LIBDRM_REQUIRED])
;;
android|fbdev|gdi|null)
@@ -1541,6 +1552,7 @@ strip_unwanted_llvm_flags() {
-e 's/-O.\>//g' \
-e 's/-g\>//g' \
-e 's/-Wall\>//g' \
+ -e 's/-fcolor-diagnostics\>//g' \
-e 's/-fomit-frame-pointer\>//g'
}
@@ -1938,7 +1950,7 @@ AC_SUBST([XVMC_MAJOR], 1)
AC_SUBST([XVMC_MINOR], 0)
AC_SUBST([XA_MAJOR], 2)
-AC_SUBST([XA_MINOR], 0)
+AC_SUBST([XA_MINOR], 1)
AC_SUBST([XA_TINY], 0)
AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_TINY")
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 059ae9840..f98a54a78 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -30,14 +30,15 @@ GL 3.0 --- all DONE: i965, nv50, nvc0, r600, radeonsi
GL_EXT_texture_shared_exponent DONE (swrast)
Float depth buffers (GL_ARB_depth_buffer_float) DONE ()
Framebuffer objects (GL_ARB_framebuffer_object) DONE (r300, swrast)
- Half-float DONE (r300, swrast)
- Non-normalized Integer texture/framebuffer formats DONE ()
- 1D/2D Texture arrays DONE ()
+ GL_ARB_half_float_pixel DONE (r300, swrast)
+ GL_ARB_half_float_vertex DONE (r300, swrast)
+ GL_EXT_texture_integer DONE ()
+ GL_EXT_texture_array DONE ()
Per-buffer blend and masks (GL_EXT_draw_buffers2) DONE (swrast)
GL_EXT_texture_compression_rgtc DONE (r300, swrast)
- Red and red/green texture formats DONE (r300, swrast)
+ GL_ARB_texture_rg DONE (r300, swrast)
Transform feedback (GL_EXT_transform_feedback) DONE ()
- Vertex array objects (GL_APPLE_vertex_array_object) DONE
+ Vertex array objects (GL_ARB_vertex_array_object) DONE (all drivers)
sRGB framebuffer format (GL_EXT_framebuffer_sRGB) DONE ()
glClearBuffer commands DONE
glGetStringi command DONE
@@ -45,6 +46,7 @@ GL 3.0 --- all DONE: i965, nv50, nvc0, r600, radeonsi
glVertexAttribI commands DONE
Depth format cube textures DONE ()
GLX_ARB_create_context (GLX 1.4 is required) DONE
+ Multisample anti-aliasing DONE (r300)
GL 3.1 --- all DONE: i965, nv50, nvc0, r600, radeonsi
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html
index b495097c9..a9d8b4f7d 100644
--- a/mesalib/docs/devinfo.html
+++ b/mesalib/docs/devinfo.html
@@ -17,7 +17,7 @@
Development Notes
-
Adding Extentions
+
Adding Extensions
To add a new GL extension to Mesa you have to do at least the following.
@@ -190,11 +190,26 @@ you should add an appropriate note to the commit message.
Here are some examples of such a note:
-
NOTE: This is a candidate for the 9.0 branch.
-
NOTE: This is a candidate for the 8.0 and 9.0 branches.
-
NOTE: This is a candidate for the stable branches.
+Simply adding the CC to the mesa-stable list address is adequate to nominate
+the commit for the most-recently-created stable branch. It is only necessary
+to specify a specific branch name, (such as "9.2 10.0" or "10.0" in the
+examples above), if you want to nominate the commit for an older stable
+branch. And, as in these examples, you can nominate the commit for the older
+branch in addition to the more recent branch, or nominate the commit
+exclusively for the older branch.
+
+This "CC" syntax for patch nomination will cause patches to automatically be
+copied to the mesa-stable@ mailing list when you use "git send-email" to send
+patches to the mesa-dev@ mailing list. Also, if you realize that a commit
+should be nominate for the stable branch after it has already been commited,
+you can send a note directly to the mesa-stable@lists.freedesktop.org where
+the Mesa stable-branch maintainers will receive it. Be sure to mention the
+commit ID of the commit of interest (as it appears in the mesa master branch).
+Mesa 10.0 is released.
+This is a new development release.
+See the release notes for more information about the release.
+
+
November 27, 2013
Mesa 9.2.4 is released.
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index 24c0153b2..70e5862fa 100644
--- a/mesalib/docs/relnotes.html
+++ b/mesalib/docs/relnotes.html
@@ -22,7 +22,9 @@ The release notes summarize what's new or changed in each Mesa release.
+Mesa 10.0.1 is a bug fix release which fixes bugs found since the 10.0 release.
+
+
+Mesa 10.0.1 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3. OpenGL
+3.3 is only available if requested at context creation
+because compatibility contexts not supported.
+
@@ -61,7 +63,75 @@ Note: some of the new features are only available with certain drivers.
Bug fixes
-TBD.
+
Attempts have been made to not include bugs fixed in previous 9.2
+releases or bugs that were regressions during 10.0 development. This list is
+likely incomplete.
+
+
+
+
Bug 47755 - [glsl-compiler] no error checking when Interpolation qualifier for built-in variable is different in vertex and fragment shader
+
+
Bug 52171 - [gallium/r600/clover] Simple benchmarks failed to run
+
+
Bug 53077 - [IVB] Output error with msaa when both of framebuffer and source color's alpha are not 1
diff --git a/mesalib/docs/relnotes/10.1.html b/mesalib/docs/relnotes/10.1.html
index 1b8ea22f8..778ae6a57 100644
--- a/mesalib/docs/relnotes/10.1.html
+++ b/mesalib/docs/relnotes/10.1.html
@@ -45,6 +45,7 @@ Note: some of the new features are only available with certain drivers.
GL_ARB_draw_indirect on i965.
+
GL_ARB_clear_buffer_object
@@ -54,7 +55,11 @@ TBD.
Changes
-TBD.
+
+
Removed support for the GL_MESA_texture_array extension. This extension
+ enabled the use of texture array with fixed-function and assembly fragment
+ shaders. No applications are known to use this extension.
+
+
+
+
The Mesa 3D Graphics Library
+
+
+
+
+
+
Mesa 9.2.5 Release Notes / (December 12, 2013)
+
+
+Mesa 9.2.5 is a bug fix release which fixes bugs found since the 9.2.4 release.
+
+
+Mesa 9.2 implements the OpenGL 3.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.1. OpenGL
+3.1 is only available if requested at context creation
+because GL_ARB_compatibility is not supported.
+
The full set of changes can be viewed by using the following GIT command:
+
+
+ git log mesa-9.2.4..mesa-9.2.5
+
+
+
Chad Versace (2):
+
+
i965/hsw: Apply non-msrt fast color clear w/a to all HSW GTs
+
i965: Add extra-alignment for non-msrt fast color clear for all hw (v2)
+
+
+
Chris Forbes (4):
+
+
i965: Gen4-5: Don't enable hardware alpha test with MRT
+
i965: Gen4-5: Include alpha func/ref in program key
+
i965/fs: Gen4-5: Setup discard masks for MRT alpha test
+
i965/fs: Gen4-5: Implement alpha test in shader for MRT
+
+
+
Chí-Thanh Christopher Nguyễn (1):
+
+
st/xorg: Handle new DamageUnregister API which has only one argument
+
+
+
Dave Airlie (3):
+
+
mesa/swrast: fix inverted front buffer rendering with old-school swrast
+
glx: don't fail out when no configs if we have visuals
+
swrast: fix readback regression since inversion fix
+
+
+
Ian Romanick (1):
+
+
glsl: Don't emit empty declaration warning for a struct specifier
+
+
+
Ilia Mirkin (4):
+
+
nv50: Fix GPU_READING/WRITING bit removal
+
nouveau: avoid leaking fences while waiting
+
nv50: wait on the buf's fence before sticking it into pushbuf
+
nv50: report 15 max inputs for fragment programs
+
+
+
Tom Stellard (2):
+
+
r300/compiler/tests: Fix segfault
+
r300/compiler/tests: Fix line length check in test parser
+
+
+
+
diff --git a/mesalib/docs/relnotes/9.2.4.html b/mesalib/docs/relnotes/9.2.4.html
index 1ca6b1d13..e4a6fd4e5 100644
--- a/mesalib/docs/relnotes/9.2.4.html
+++ b/mesalib/docs/relnotes/9.2.4.html
@@ -31,6 +31,9 @@ because GL_ARB_compatibility is not supported.