Merge remote-tracking branch 'origin/released'

* origin/released:
  Added presentproto-1.0
  libxtrans libxcb xcb-proto mesa git update 8 nov 2013

Conflicts:
	X11/xtrans/Xtransint.h
	X11/xtrans/Xtranssock.c
	libxcb/src/.gitignore
	mesalib/src/mesa/drivers/dri/common/dri_util.c

4 files changed, 6 insertions, 40 deletions

diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac
index ba6a90cd8..c82c8c749 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.8,
+        1.9,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb-proto.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/libxcb/xcb-proto/src/present.xml b/libxcb/xcb-proto/src/present.xml
index d12ae4879..57e7cd364 100644
--- a/libxcb/xcb-proto/src/present.xml
+++ b/libxcb/xcb-proto/src/present.xml
@@ -133,7 +133,7 @@ OF THIS SOFTWARE.
 
   <!-- Events -->
 
-  <event name="Generic">
+  <event name="Generic" number="0">
     <field type="CARD8" name="extension" />
     <field type="CARD32" name="length" />
     <field type="CARD16" name="evtype" enum="EventType" />
diff --git a/libxcb/xcb-proto/src/xcb.xsd b/libxcb/xcb-proto/src/xcb.xsd
index 7a9c80018..73dbf8a77 100644
--- a/libxcb/xcb-proto/src/xcb.xsd
+++ b/libxcb/xcb-proto/src/xcb.xsd
@@ -89,6 +89,9 @@ authorization from the authors.
   <!-- field replaces FIELD, PARAM, and REPLY. -->
   <xsd:element name="field" type="var" />
 
+  <!-- fd passing parameter -->
+  <xsd:element name="fd" />
+
   <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type
        are specified as attributes.  The content is an expression giving the
        length. -->
@@ -185,6 +188,7 @@ authorization from the authors.
       <xsd:element ref="pad" />
       <xsd:element ref="field" />
       <xsd:element ref="list" />
+      <xsd:element ref="fd" />
     </xsd:choice>
   </xsd:group>
 
diff --git a/libxcb/xcb-proto/xcbgen/xtypes.py b/libxcb/xcb-proto/xcbgen/xtypes.py
index 6150d1818..951731afc 100644
--- a/libxcb/xcb-proto/xcbgen/xtypes.py
+++ b/libxcb/xcb-proto/xcbgen/xtypes.py
@@ -164,44 +164,6 @@ class Enum(SimpleType):
     out = __main__.output['enum']
 
 
-class FileDescriptor(SimpleType):
-    '''
-    Derived class which represents a file descriptor. Passed via magic kernel stuff
-
-    Public fields added:
-    values contains a list of (name, value) tuples.  value is empty, or a number.
-    bits contains a list of (name, bitnum) tuples.  items only appear if specified as a bit. bitnum is a number.
-    '''
-    def __init__(self, name, elt):
-        SimpleType.__init__(self, name, 4)
-        self.values = []
-        self.bits = []
-        self.doc = None
-        for item in list(elt):
-            if item.tag == 'doc':
-                self.doc = Doc(name, item)
-
-            # First check if we're using a default value
-            if len(list(item)) == 0:
-                self.values.append((item.get('name'), ''))
-                continue
-
-            # An explicit value or bit was specified.
-            value = list(item)[0]
-            if value.tag == 'value':
-                self.values.append((item.get('name'), value.text))
-            elif value.tag == 'bit':
-                self.values.append((item.get('name'), '%u' % (1 << int(value.text, 0))))
-                self.bits.append((item.get('name'), value.text))
-
-    def resolve(self, module):
-        self.resolved = True
-
-    def fixed_size(self):
-        return True
-
-    out = __main__.output['enum']
-    
 class ListType(Type):
     '''
     Derived class which represents a list of some other datatype.  Fixed- or variable-sized.