Merge remote-tracking branch 'origin/released'

* origin/released:
  libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013

Conflicts:
	mesalib/include/GL/glext.h
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	xorg-server/damageext/damageext.c
	xorg-server/dix/dispatch.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_program.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/glx/glthunk.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/include/os.h
	xorg-server/present/present_request.c

9 files changed, 115 insertions, 54 deletions

diff --git a/xorg-server/xkeyboard-config/rules/HDR b/xorg-server/xkeyboard-config/rules/HDR
index 769b8fc7f..9ee3e39d8 100644
--- a/xorg-server/xkeyboard-config/rules/HDR
+++ b/xorg-server/xkeyboard-config/rules/HDR
@@ -15,6 +15,7 @@
 ! model		layout[3]	variant[3]	=	symbols
 ! model		layout[4]	variant[4]	=	symbols
 ! model		=	symbols
+! model		layout		=	symbols
 ! layout	variant		=	compat
 ! layout[1]	variant[1]	=	compat
 ! layout[2]	variant[2]	=	compat
diff --git a/xorg-server/xkeyboard-config/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am
index f2d73ce80..9ab91dcf3 100644
--- a/xorg-server/xkeyboard-config/rules/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/Makefile.am
@@ -23,6 +23,7 @@ endif
 if USE_COMPAT_RULES
 
 base_parts = base.hdr.part base.lists.part \
+base.lists.base.part \
 compat/base.lists.part \
 HDR base.m_k.part \
 HDR base.l1_k.part \
@@ -41,6 +42,7 @@ HDR compat/base.ml2v2_s.part  \
 HDR compat/base.ml3v3_s.part  \
 HDR compat/base.ml4v4_s.part  \
 HDR base.m_s.part \
+HDR base.ml_s1.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
 HDR compat/base.l2v2_c.part \
@@ -59,6 +61,7 @@ HDR base.o_c.part \
 HDR base.o_t.part
 
 evdev_parts = base.hdr.part base.lists.part \
+evdev.lists.part \
 compat/base.lists.part \
 HDR evdev.m_k.part \
 HDR base.l1_k.part \
@@ -77,6 +80,7 @@ HDR compat/base.ml2v2_s.part  \
 HDR compat/base.ml3v3_s.part  \
 HDR compat/base.ml4v4_s.part  \
 HDR evdev.m_s.part \
+HDR \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
 HDR compat/base.l2v2_c.part \
@@ -97,6 +101,7 @@ HDR base.o_t.part
 else
 
 base_parts = base.hdr.part base.lists.part \
+base.lists.base.part \
 HDR base.m_k.part \
 HDR base.l1_k.part \
 HDR base.l_k.part \
@@ -114,6 +119,7 @@ HDR \
 HDR \
 HDR \
 HDR base.m_s.part \
+HDR base.ml_s1.part \
 HDR \
 HDR \
 HDR \
@@ -132,6 +138,7 @@ HDR base.o_c.part \
 HDR base.o_t.part
 
 evdev_parts = base.hdr.part base.lists.part \
+evdev.lists.part \
 HDR evdev.m_k.part \
 HDR base.l1_k.part \
 HDR base.l_k.part  \
@@ -154,6 +161,7 @@ HDR \
 HDR \
 HDR \
 HDR \
+HDR \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -170,6 +178,8 @@ endif
 
 all_parts_dist = HDR base.hdr.part \
 base.lists.part \
+base.lists.base.part \
+evdev.lists.part \
 base.m_k.part \
 base.l1_k.part \
 base.l_k.part \
@@ -183,6 +193,7 @@ base.ml2_s.part \
 base.ml3_s.part \
 base.ml4_s.part \
 base.m_s.part \
+base.ml_s1.part \
 base.ml_c.part \
 base.ml1_c.part \
 base.m_t.part \
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index c05fe0a08..aa47e3da0 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -685,8 +685,16 @@
         <name>se</name>
         <_shortDescription>sv</_shortDescription>
         <_description>Swedish</_description>
-	  </configItem>
-	  <variantList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>dvorak_a5</name>
+            <_description>Swedish (Dvorak A5)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+      <variantList>
         <variant>
           <configItem>
             <name>sun_type6</name>
diff --git a/xorg-server/xkeyboard-config/rules/base.lists.base.part b/xorg-server/xkeyboard-config/rules/base.lists.base.part
new file mode 100644
index 000000000..1b2094894
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/base.lists.base.part
@@ -0,0 +1,54 @@
+! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
+              airkey \
+              apple armada azonaRF2300 \
+              benqx brother \
+              btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb \
+              cherrycyboard cherrycmexpert \
+              chicony chicony0108 chicony0420 chicony9885 \
+              compalfl90 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              creativedw7000 \
+              cymotionlinux \
+              dell dellm65 inspiron dellusbmm \
+              emachines ennyah_dkb1008 evdev \
+              genius geniuscomfy2 \
+              gyration honeywell_euroboard \
+              hp250x hp5xx hp500fa hpdv5 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+              ibm_spacesaver ipaq inspiron intel \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+              logidinovo logidinovoedge \
+              microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              pc105 \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 thinkpad60 \
+              samsung4500 samsung4510 \
+              silvercrest \
+              sk1300 sk2500 sk6200 sk7100 \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              unitekkb1925 yahoo
+
+! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
+		cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
+		armada presario dellm65 inspiron dellusbmm diamond \
+		ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \
+		hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \
+		logidinovo logidinovoedge logitech_g15 mx1998 mx2500 mx2750 \
+		microsoft4000 microsoft7000 microsoftprooem microsoftmult \
+		propeller samsung4500 samsung4510 sk1300 sk2500 sk7100 \
+		toshiba_s3000 trust trustda cymotionlinux silvercrest \
+		emachines benqx unitekkb1925 creativedw7000 compalfl90 \
+		pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop btc6301urf \
+		dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy latitude \
+		microsoftpro precision_m scorpius sp_inet targa_v811 thinkpad \
+		tm2030USB-102 tm2030USB-106 trust_slimline
diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part
index 97b3b907f..08c081821 100644
--- a/xorg-server/xkeyboard-config/rules/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/base.lists.part
@@ -33,45 +33,6 @@
 ! $azerty = be fr
 ! $qwertz = al cz de hr hu ro si sk 
 
-! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
-              airkey \
-              apple armada azonaRF2300 \
-              benqx brother \
-              btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
-              cherryblue cherrybluea cherryblueb \
-              cherrycyboard cherrycmexpert \
-              chicony chicony0108 chicony0420 chicony9885 \
-              compalfl90 \
-              compaqeak8 compaqik7 compaqik13 compaqik18 \
-              creativedw7000 \
-              cymotionlinux \
-              dell dellm65 inspiron dellusbmm \
-              emachines ennyah_dkb1008 evdev \
-              genius geniuscomfy2 \
-              gyration honeywell_euroboard \
-              hp250x hp5xx hp500fa hpdv5 \
-              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
-              ibm_spacesaver ipaq inspiron intel \
-              logiaccess logicda logicink \
-              logiex110 logiclx300 \
-              logiinkse logiinkseusb logiitc logiik \
-              logitech_base itouch logiultrax \
-              logitech_g15 \
-              logidinovo logidinovoedge \
-              microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
-              microsoftoffice microsoftmult \
-              mx1998 mx2500 mx2750 \
-              oretec \
-              pc105 \
-              presario propeller \
-              qtronix \
-              rapidaccess rapidaccess2 thinkpad60 \
-              samsung4500 samsung4510 \
-              silvercrest \
-              sk1300 sk2500 sk6200 sk7100 \
-              sven sven303 symplon \
-              toshiba_s3000 trust trustda \
-              unitekkb1925 yahoo
 
 // all layouts with 3rd and 4th groups
 ! $threelevellayouts = al az \
@@ -95,8 +56,6 @@
               vn \
               za
 
-! $evdevkbds = ibm_spacesaver
-
 ! $thinkpads = thinkpad thinkpad60 thinkpadz60
 
 ! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
@@ -117,3 +76,4 @@
 ! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
 
 ! $htcdreamlayouts = us it de
+
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_s1.part b/xorg-server/xkeyboard-config/rules/base.ml_s1.part
new file mode 100644
index 000000000..1a35202da
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/base.ml_s1.part
@@ -0,0 +1 @@
+ $inetmediakbds	jp	=	+jp(henkan)
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 35b6ef3b6..a31556b55 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -8,6 +8,7 @@
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
   altwin:swap_alt_win	=	+altwin(swap_alt_win)
+  grab:debug		=	+srvr_ctrl(grab_debug)
   grp:switch		=	+group(switch)
   grp:lswitch		=	+group(lswitch)
   grp:win_switch	=	+group(win_switch)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 1c75531d8..42fda3fb2 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1762,9 +1762,9 @@
     <layout>
       <configItem>
         <name>bd</name>
-        <!-- Keyboard indicator for Bengali layouts -->
+        <!-- Keyboard indicator for Bangla layouts -->
         <_shortDescription>bn</_shortDescription>
-        <_description>Bengali</_description>
+        <_description>Bangla</_description>
         <languageList>
           <iso639Id>ben</iso639Id>
         </languageList>
@@ -1773,7 +1773,7 @@
         <variant>
           <configItem>
             <name>probhat</name>
-            <_description>Bengali (Probhat)</_description>
+            <_description>Bangla (Probhat)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1789,9 +1789,9 @@
         <variant>
           <configItem>
             <name>ben</name>
-            <!-- Keyboard indicator for Bengali layouts -->
+            <!-- Keyboard indicator for Bangla layouts -->
             <_shortDescription>bn</_shortDescription>
-            <_description>Bengali (India)</_description>
+            <_description>Bangla (India)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1800,9 +1800,9 @@
         <variant>
           <configItem>
             <name>ben_probhat</name>
-            <!-- Keyboard indicator for Bengali layouts -->
+            <!-- Keyboard indicator for Bangla layouts -->
             <_shortDescription>bn</_shortDescription>
-            <_description>Bengali (India, Probhat)</_description>
+            <_description>Bangla (India, Probhat)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1811,28 +1811,28 @@
         <variant>
           <configItem>
             <name>ben_baishakhi</name>
-            <_description>Bengali (India, Baishakhi)</_description>
+            <_description>Bangla (India, Baishakhi)</_description>
             <languageList><iso639Id>ben</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ben_bornona</name>
-            <_description>Bengali (India, Bornona)</_description>
+            <_description>Bangla (India, Bornona)</_description>
             <languageList><iso639Id>ben</iso639Id></languageList>
             </configItem>
         </variant>
          <variant>
           <configItem>
             <name>ben_gitanjali</name>
-            <_description>Bengali (India, Uni Gitanjali)</_description>
+            <_description>Bangla (India, Uni Gitanjali)</_description>
             <languageList><iso639Id>ben</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ben_inscript</name>
-            <_description>Bengali (India, Baishakhi Inscript)</_description>
+            <_description>Bangla (India, Baishakhi Inscript)</_description>
             <languageList><iso639Id>ben</iso639Id></languageList>
           </configItem>
         </variant>
@@ -6033,6 +6033,24 @@
           <_description>Right Alt as Right Ctrl</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>ctrl:swap_lalt_lctl</name>
+          <_description>Swap Left Alt key with Left Ctrl key</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swap_lwin_lctl</name>
+          <_description>Swap Left Win key with Left Ctrl key</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swap_lalt_lctl_lwin</name>
+          <_description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
@@ -6532,6 +6550,12 @@
           <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>grab:debug_actions</name>
+          <_description>Allow grab and window tree logging</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
diff --git a/xorg-server/xkeyboard-config/rules/evdev.lists.part b/xorg-server/xkeyboard-config/rules/evdev.lists.part
new file mode 100644
index 000000000..7b5d0d46d
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/evdev.lists.part
@@ -0,0 +1 @@
+! $evdevkbds = ibm_spacesaver