Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig xserver mesa xkeyboard-config git update 9 oct 2012

9 files changed, 35 insertions, 19 deletions

diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd
index 782e59244..4a309a9d2 100644
--- a/fontconfig/fonts.dtd
+++ b/fontconfig/fonts.dtd
@@ -13,7 +13,7 @@
 -->
 <!ELEMENT dir (#PCDATA)>
 <!ATTLIST dir
-	  prefix    (#PCDATA)	       "default"
+	  prefix    CDATA       "default"
 	  xml:space (default|preserve) 'preserve'>
 
 <!--
@@ -36,7 +36,7 @@
 -->
 <!ELEMENT cachedir (#PCDATA)>
 <!ATTLIST cachedir
-	  prefix    (#PCDATA)	       "default"
+	  prefix    CDATA      "default"
 	  xml:space (default|preserve) 'preserve'>
 
 <!--
@@ -52,8 +52,8 @@
 <!ELEMENT include (#PCDATA)>
 <!ATTLIST include
 	  ignore_missing    (no|yes)		"no"
-	  prefix	    (#PCDATA)		"default"
-	  deprecated	    (#PCDATA)		"no"
+	  prefix	    CDATA               "default"
+	  deprecated	    (yes|no)		"no"
 	  xml:space	    (default|preserve)	"preserve">
 
 <!--
@@ -165,7 +165,7 @@
 	  qual (any|all|first|not_first)    "any"
 	  name CDATA	    #REQUIRED
 	  target (pattern|font|default)		"default"
-	  ignore-blanks (#PCDATA)	"false"
+	  ignore-blanks (true|false)	"false"
 	  compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains)	"eq">
 
 <!--
diff --git a/fontconfig/src/fcstr.c b/fontconfig/src/fcstr.c
index f505ea665..037960d2f 100644
--- a/fontconfig/src/fcstr.c
+++ b/fontconfig/src/fcstr.c
@@ -974,6 +974,10 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s)
     FcMemAlloc (FC_MEM_STRING, size);
     slash = NULL;
     f = file;
+#ifdef _WIN32
+    if (*s == '/' && *(s+1) == '/') /* Network path, do not squash // */
+	*f++ = *s++;
+#endif
     for (;;) {
 	if (*s == '/' || *s == '\0')
 	{
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 225081578..d7156e670 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1949,9 +1949,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
 {
    const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
    GLint expectedSize;
-   GLenum choose_format;
-   GLenum choose_type;
-   GLenum proxy_format;
    GLenum error = GL_NO_ERROR;
    char *reason = ""; /* no error */
 
@@ -2015,10 +2012,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
 #endif
 
    default:
-      choose_format = GL_NONE;
-      choose_type = GL_NONE;
-      proxy_format = internalFormat;
-
       /* check level */
       if (level < 0 || level >= maxLevels) {
 	 reason = "level";
@@ -3405,8 +3398,8 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
          break;
       default:
          targetOK = GL_FALSE;
-       }
-    }
+      }
+   }
    else {
       assert(dims == 1 || dims == 3);
       /* no 1D or 3D compressed textures at this time */
diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h
index 09659ce9c..656556dd4 100644
--- a/mesalib/src/mesa/program/prog_instruction.h
+++ b/mesalib/src/mesa/program/prog_instruction.h
@@ -210,7 +210,7 @@ typedef enum prog_opcode {
    OPCODE_RCC,       /*                    1.1                   */
    OPCODE_RCP,       /*   X        X       X       X         X   */
    OPCODE_RET,       /*                    2       2        opt  */
-   OPCODE_RFL,       /*            X               X             */
+   OPCODE_RFL,       /*                            X             */
    OPCODE_RSQ,       /*   X        X       X       X         X   */
    OPCODE_SCS,       /*            X                         X   */
    OPCODE_SEQ,       /*                    2       X         X   */
diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 5f056b9b1..c614bdec5 100644
--- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1172,6 +1172,7 @@ st_translate_mesa_program(
                struct pipe_screen *pscreen = st->pipe->screen;
                assert(procType == TGSI_PROCESSOR_VERTEX);
                assert(pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_INTEGERS));
+               (void) pscreen;  /* silence non-debug build warnings */
                if (!ctx->Const.NativeIntegers) {
                   struct ureg_dst temp = ureg_DECL_local_temporary(t->ureg);
                   ureg_U2F( t->ureg, ureg_writemask(temp, TGSI_WRITEMASK_X), t->systemValues[i]);
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h
index 179b87cf5..1514c2603 100644
--- a/xorg-server/hw/xfree86/common/xf86.h
+++ b/xorg-server/hw/xfree86/common/xf86.h
@@ -469,4 +469,8 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
 /* flags passed to xf86 allocate screen */
 #define XF86_ALLOCATE_GPU_SCREEN 1
 
+/* Update the internal total dimensions of all ScreenRecs together */
+extern _X_EXPORT void
+xf86UpdateDesktopDimensions(void);
+
 #endif                          /* _XF86_H */
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index f681a8577..721159d0b 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1898,3 +1898,9 @@ xf86ScrnToScreen(ScrnInfoPtr pScrn)
         return screenInfo.screens[pScrn->scrnIndex];
     }
 }
+
+void
+xf86UpdateDesktopDimensions(void)
+{
+    update_desktop_dimensions();
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index fd90aac54..1be7ba54d 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -80,7 +80,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(14, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(14, 1)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(18, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index eafb8cd75..6617d2dfc 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -126,8 +126,16 @@ xkb_symbols "lyx" {
     // Note the parens mirroring below:
     key <AD11> { [ bracketright,	braceright	]       };
     key <AD12> { [ bracketleft,	braceleft	]       };
-    key <AE09> { [ 9         ,	parenright	]       };
-    key <AE10> { [ 0         ,	parenleft	]       };
+    key <AE01> { [ 1, exclam      ]};
+    key <AE02> { [ 2, at          ]};
+    key <AE03> { [ 3, numbersign  ]};
+    key <AE04> { [ 4, dollar      ]};
+    key <AE05> { [ 5, percent     ]};
+    key <AE06> { [ 6, asciicircum ]};
+    key <AE07> { [ 7, ampersand   ]};
+    key <AE08> { [ 8, asterisk    ]};
+    key <AE09> { [ 9, parenright  ]};
+    key <AE10> { [ 0, parenleft	  ]};
     
     key <AE11> { [ minus     ,	0x10005be	]	}; // H. Hiphen
     key <AE12> { [ equal     ,	plus		]	};
@@ -314,4 +322,4 @@ xkb_symbols "biblicalSIL" {
 	key <AB10> { [ slash,		question,	U05F3 ] };					//slash		question		geresh P
 
 	key <SPCE> { [ space, 		space,		thinspace,	nobreakspace ] };//space		space			thin space,		nbsp
-};
\ No newline at end of file
+};