diff options
22 files changed, 163 insertions, 22 deletions
diff --git a/fontconfig/conf.d/10-autohint.conf b/fontconfig/conf.d/10-autohint.conf index c597bf41d..bf08de83e 100644 --- a/fontconfig/conf.d/10-autohint.conf +++ b/fontconfig/conf.d/10-autohint.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Use the Autohinter --> <match target="font"> - <edit name="autohint" mode="assign"><bool>true</bool></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="autohint" mode="append"><bool>true</bool></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/10-no-sub-pixel.conf b/fontconfig/conf.d/10-no-sub-pixel.conf index 87ada4ef2..e650160a5 100644 --- a/fontconfig/conf.d/10-no-sub-pixel.conf +++ b/fontconfig/conf.d/10-no-sub-pixel.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Enable sub-pixel rendering --> <match target="font"> - <edit name="rgba" mode="assign"><const>none</const></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="rgba" mode="append"><const>none</const></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/10-sub-pixel-bgr.conf b/fontconfig/conf.d/10-sub-pixel-bgr.conf index e1f64fd33..74574ad3f 100644 --- a/fontconfig/conf.d/10-sub-pixel-bgr.conf +++ b/fontconfig/conf.d/10-sub-pixel-bgr.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Enable sub-pixel rendering --> <match target="font"> - <edit name="rgba" mode="assign"><const>bgr</const></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="rgba" mode="append"><const>bgr</const></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/10-sub-pixel-rgb.conf b/fontconfig/conf.d/10-sub-pixel-rgb.conf index 2b49fe3d2..3c558e5df 100644 --- a/fontconfig/conf.d/10-sub-pixel-rgb.conf +++ b/fontconfig/conf.d/10-sub-pixel-rgb.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Enable sub-pixel rendering --> <match target="font"> - <edit name="rgba" mode="assign"><const>rgb</const></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="rgba" mode="append"><const>rgb</const></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/10-sub-pixel-vbgr.conf b/fontconfig/conf.d/10-sub-pixel-vbgr.conf index 5947650df..392634d53 100644 --- a/fontconfig/conf.d/10-sub-pixel-vbgr.conf +++ b/fontconfig/conf.d/10-sub-pixel-vbgr.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Enable sub-pixel rendering --> <match target="font"> - <edit name="rgba" mode="assign"><const>vbgr</const></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="rgba" mode="append"><const>vbgr</const></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/10-sub-pixel-vrgb.conf b/fontconfig/conf.d/10-sub-pixel-vrgb.conf index 84481bde2..1b7b5f6d5 100644 --- a/fontconfig/conf.d/10-sub-pixel-vrgb.conf +++ b/fontconfig/conf.d/10-sub-pixel-vrgb.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Enable sub-pixel rendering --> <match target="font"> - <edit name="rgba" mode="assign"><const>vrgb</const></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="rgba" mode="append"><const>vrgb</const></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/10-unhinted.conf b/fontconfig/conf.d/10-unhinted.conf index 025ae2a82..67037b435 100644 --- a/fontconfig/conf.d/10-unhinted.conf +++ b/fontconfig/conf.d/10-unhinted.conf @@ -3,6 +3,12 @@ <fontconfig> <!-- Disable hinting --> <match target="font"> - <edit name="hinting" mode="assign"><bool>false</bool></edit> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit name="hinting" mode="append"><bool>false</bool></edit> </match> </fontconfig> diff --git a/fontconfig/conf.d/11-lcdfilter-default.conf b/fontconfig/conf.d/11-lcdfilter-default.conf index 040a4ac83..e251edd4d 100644 --- a/fontconfig/conf.d/11-lcdfilter-default.conf +++ b/fontconfig/conf.d/11-lcdfilter-default.conf @@ -3,7 +3,13 @@ <fontconfig> <!-- Use lcddefault as default for LCD filter --> <match target="font"> - <edit mode="assign" name="lcdfilter"> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit mode="append" name="lcdfilter"> <const>lcddefault</const> </edit> </match> diff --git a/fontconfig/conf.d/11-lcdfilter-legacy.conf b/fontconfig/conf.d/11-lcdfilter-legacy.conf index 218585ce3..63a4116e2 100644 --- a/fontconfig/conf.d/11-lcdfilter-legacy.conf +++ b/fontconfig/conf.d/11-lcdfilter-legacy.conf @@ -3,7 +3,13 @@ <fontconfig> <!-- Use lcdlegacy as default for LCD filter --> <match target="font"> - <edit mode="assign" name="lcdfilter"> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit mode="append" name="lcdfilter"> <const>lcdlegacy</const> </edit> </match> diff --git a/fontconfig/conf.d/11-lcdfilter-light.conf b/fontconfig/conf.d/11-lcdfilter-light.conf index d38a66ef0..af50b2c2e 100644 --- a/fontconfig/conf.d/11-lcdfilter-light.conf +++ b/fontconfig/conf.d/11-lcdfilter-light.conf @@ -3,7 +3,13 @@ <fontconfig> <!-- Use lcdlight as default for LCD filter --> <match target="font"> - <edit mode="assign" name="lcdfilter"> + <!-- + This configuration is available on the major desktop environments. + We shouldn't overwrite it with "assign" unconditionally. + Most clients may picks up the first value only. so using "append" + may simply works to avoid it. + --> + <edit mode="append" name="lcdfilter"> <const>lcdlight</const> </edit> </match> diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS index 32bcc6924..3e50762ab 100644 --- a/libxcb/xcb-proto/NEWS +++ b/libxcb/xcb-proto/NEWS @@ -1,3 +1,9 @@ +Release 1.7.1 (2012-03-23) +========================== +* Add ge and xf86vidmode protocol descriptions +* Remove now unnecessary files as everything is implemented in xcbgen +* Rename the ExprType "parent" attribute to "parents" + Release 1.7 (2012-01-11) ======================== * Add missing padding bytes to ChangeKeyboardMapping request diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac index 5368e2a05..e20c9aa1e 100644 --- a/libxcb/xcb-proto/configure.ac +++ b/libxcb/xcb-proto/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 1.7, + 1.7.1, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/libxcb/xcb-proto/xcbgen/xtypes.py b/libxcb/xcb-proto/xcbgen/xtypes.py index 14c318ac3..c78915846 100644 --- a/libxcb/xcb-proto/xcbgen/xtypes.py +++ b/libxcb/xcb-proto/xcbgen/xtypes.py @@ -221,11 +221,11 @@ class ExprType(Type): Public fields added: expr is an Expression object containing the value of the field. ''' - def __init__(self, elt, member, *parent): + def __init__(self, elt, member, *parents): Type.__init__(self, member.name) self.is_expr = True self.member = member - self.parent = parent + self.parents = parents self.expr = Expression(list(elt)[0], self) diff --git a/mesalib/Makefile b/mesalib/Makefile index 77c9154ff..1368b44ea 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -266,4 +266,6 @@ md5: $(ARCHIVES) @-md5sum $(PACKAGE_NAME).tar.bz2 @-md5sum $(PACKAGE_NAME).zip -.PHONY: tarballs md5 +am--refresh: + +.PHONY: tarballs md5 am--refresh diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index f677b7681..c0bbf80ee 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -72,7 +72,7 @@ GLX_ARB_create_context_profile DONE GL 3.3: GLSL 3.30 not started -GL_ARB_blend_func_extended not started +GL_ARB_blend_func_extended started (airlied/ARB_blend_func_extended) GL_ARB_explicit_attrib_location DONE (i915, i965, r300, r600, swrast) GL_ARB_occlusion_query2 DONE (r300, r600, swrast) GL_ARB_sampler_objects DONE (i965, r300, r600) diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp index 20a0377d4..101d9992d 100644 --- a/mesalib/src/glsl/ir_validate.cpp +++ b/mesalib/src/glsl/ir_validate.cpp @@ -455,7 +455,7 @@ ir_validate::visit_leave(ir_expression *ir) ir_visitor_status ir_validate::visit_leave(ir_swizzle *ir) { - int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w}; + unsigned int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w}; for (unsigned int i = 0; i < ir->type->vector_elements; i++) { if (chans[i] >= ir->val->type->vector_elements) { diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index cfaac64bf..97bef3543 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -567,7 +567,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, GLint i; const GLint minLevel = baseLevel; const GLint maxLevel = t->_MaxLevel; - GLuint width, height, depth, face, numFaces = 1; + const GLuint numFaces = t->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1; + GLuint width, height, depth, face; if (minLevel > maxLevel) { incomplete(t, BASE, "minLevel > maxLevel"); diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp index 991df7896..da41ee84c 100644 --- a/mesalib/src/mesa/main/uniform_query.cpp +++ b/mesalib/src/mesa/main/uniform_query.cpp @@ -905,8 +905,10 @@ _mesa_get_uniform_location(struct gl_context *ctx, name_copy[i-1] = '\0'; offset = strtol(&name[i], NULL, 10); - if (offset < 0) + if (offset < 0) { + free(name_copy); return -1; + } array_lookup = true; } else { diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c index d3496642f..889200686 100644 --- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c +++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c @@ -233,10 +233,22 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target, = _mesa_get_tex_image(ctx, texObj, target, srcLevel); struct gl_texture_image *dstImage; struct st_texture_image *stImage; - uint dstWidth = u_minify(pt->width0, dstLevel); - uint dstHeight = u_minify(pt->height0, dstLevel); - uint dstDepth = u_minify(pt->depth0, dstLevel); uint border = srcImage->Border; + uint dstWidth, dstHeight, dstDepth; + + dstWidth = u_minify(pt->width0, dstLevel); + if (texObj->Target == GL_TEXTURE_1D_ARRAY) { + dstHeight = pt->array_size; + } + else { + dstHeight = u_minify(pt->height0, dstLevel); + } + if (texObj->Target == GL_TEXTURE_2D_ARRAY) { + dstDepth = pt->array_size; + } + else { + dstDepth = u_minify(pt->depth0, dstLevel); + } dstImage = _mesa_get_tex_image(ctx, texObj, target, dstLevel); if (!dstImage) { diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 028053e6a..a2f4db040 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -244,6 +244,16 @@ <languageList><iso639Id>crd</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>cz_sk_de</name> + <description>Czech Slovak and German (US)</description> + <languageList><iso639Id>eng</iso639Id> + <iso639Id>cze</iso639Id> + <iso639Id>slo</iso639Id> + <iso639Id>ger</iso639Id> </languageList> + </configItem> + </variant> </variantList> </layout> <layout> diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index c58eb0deb..0bf0be217 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -125,7 +125,8 @@ xkb_symbols "oss" { include "latin" include "level3(ralt_switch)" - include "nbsp(level4nl)" + include "nbsp(level4n)" + include "level5(rctrl_switch)" include "keypad(oss)" name[Group1]="French (alternative)"; diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 5cdd1e351..d3b223370 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -1191,6 +1191,53 @@ xkb_symbols "htcdream" { // EXTRAS: +// Czech, Slovak and German charecters added as third level symbols to US keyboard layout. +partial alphanumeric_keys +xkb_symbols "cz_sk_de" { + include "us" + name[Group1]="Czech Slovak and German (US)"; + + key <TLDE> { [grave, asciitilde, uring, Uring ] }; + key <AE01> { [ 1, exclam, uacute, Uacute ] }; + key <AE02> { [ 2, at, ecaron, Ecaron ] }; + key <AE03> { [ 3, numbersign, scaron, Scaron ] }; + key <AE04> { [ 4, dollar, ccaron, Ccaron ] }; + key <AE05> { [ 5, percent, rcaron, Rcaron ] }; + key <AE06> { [ 6, asciicircum, zcaron, Zcaron ] }; + key <AE07> { [ 7, ampersand, yacute, Yacute ] }; + key <AE08> { [ 8, asterisk, aacute, Aacute ] }; + key <AE09> { [ 9, parenleft, iacute, Iacute ] }; + key <AE10> { [ 0, parenright, eacute, Eacute ] }; + key <AE11> { [minus, underscore, ssharp, 0x1001E9E ] }; + key <AE12> { [equal, plus, dead_acute, dead_caron ] }; + + key <AD03> { [ e, E, EuroSign, Eacute ] }; + + key <AD11> { [bracketleft, braceleft, udiaeresis, Udiaeresis ] }; + key <AC10> { [ semicolon, colon, odiaeresis, Odiaeresis ] }; + key <AC11> { [apostrophe, quotedbl,adiaeresis, Adiaeresis ] }; + + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AD08> { [ i, I, iacute, Iacute ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + key <AD06> { [ y, Y, yacute, Yacute ] }; + key <AD07> { [ u, U, uring, Uring ] }; + + key <AC02> { [ s, S, scaron, Scaron ] }; + key <AB01> { [ z, Z, zcaron, Zcaron ] }; + key <AB03> { [ c, C, ccaron, Ccaron ] }; + key <AD04> { [ r, R, rcaron, Rcaron ] }; + key <AD05> { [ t, T, tcaron, Tcaron ] }; + key <AC03> { [ d, D, dcaron, Dcaron ] }; + key <AB06> { [ n, N, ncaron, Ncaron ] }; + key <AC09> { [ l, L, lcaron, Lcaron ] }; + key <AD10> { [ p, P,ocircumflex, Ocircumflex ] }; + + key <SPCE> { [ space, space, nobreakspace, nobreakspace] }; + + include "level3(ralt_switch)" +}; + // XCompose is out! Unicode combining is in! For those of us who live // on the edge: A keymap using Unicode combining characters instead of // deadkeys. This variation does not deviate from the lame MS-style |