Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

5 files changed, 294 insertions, 287 deletions

diff --git a/mesalib/src/mesa/drivers/dri/.gitignore b/mesalib/src/mesa/drivers/dri/.gitignore
new file mode 100644
index 000000000..f3c7a7c5d
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/.gitignore b/mesalib/src/mesa/drivers/dri/common/xmlpool/.gitignore
new file mode 100644
index 000000000..a5a437849
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/.gitignore
@@ -0,0 +1,5 @@
+de
+es
+fr
+nl
+sv
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile b/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile
index ae3d89938..b71629e9f 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile
+++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile
@@ -1,96 +1,96 @@
-# Convenient makefile for managing translations.

-

-# Prerequisites:

-# - GNU gettext

-# - Python

-

-# Adding new translations

-# -----------------------

-

-# To start working on a new translation edit the POS=... line

-# below. If you want to add for example a french translation, add

-# fr.po.

-

-# Then run "make po" to generate a fresh .po file from translatable

-# strings in t_options.h. Now you can edit the new .po file (fr.po in

-# the example above) to translate the strings. Please make sure that

-# your editor encodes the file in UTF-8.

-

-# Updating existing translations

-# ------------------------------

-

-# Run "make po" to update .po files with new translatable strings from

-# t_options.h. Now you can edit the .po files you're interested

-# in. Please make sure that your editor encodes the file in UTF-8.

-

-# Updating options.h

-# ------------------

-

-# Finally run "make" to generate options.h from t_options.h with all

-# translations. Now you can rebuild the drivers. Any common options

-# used by the drivers will have option descriptions with the latest

-# translations.

-

-# Publishing translations

-# -----------------------

-

-# To get your translation(s) into Mesa CVS, please send me your

-# <lang>.po file.

-

-# More information:

-# - info gettext

-

-# The set of supported languages. Add languages as needed.

-POS=de.po es.po nl.po fr.po sv.po

-

-#

-# Don't change anything below, unless you know what you're doing.

-#

-LANGS=$(POS:%.po=%)

-MOS=$(POS:%.po=%/LC_MESSAGES/options.mo)

-POT=xmlpool.pot

-

-.PHONY: all clean pot po mo

-

-all: options.h

-

-# Only intermediate files are cleaned up. options.h is not deleted because

-# it's in CVS. 

-clean:

-	-rm -f $(POT) *~

-	-rm -rf $(LANGS)

-

-# Default target options.h

-options.h: t_options.h mo

-	$(PYTHON2) $(PYTHON_FLAGS) gen_xmlpool.py $(LANGS) > options.h

-

-# Update .mo files from the corresponding .po files.

-mo:

-	@for mo in $(MOS); do \

-		lang=$${mo%%/*}; \

-		echo "Updating $$mo from $$lang.po."; \

-		mkdir -p $${mo%/*}; \

-		msgfmt -o $$mo $$lang.po; \

-	done

-

-# Use this target to create or update .po files with new messages in

-# driconf.py.

-po: $(POS)

-

-pot: $(POT)

-

-# Extract message catalog from driconf.py.

-$(POT): t_options.h

-	xgettext -L C --from-code utf-8 -o $(POT) t_options.h

-

-# Create or update a .po file for a specific language.

-%.po: $(POT)

-	@if [ -f $@ ]; then \

-		echo "Merging new strings from $(POT) into $@."; \

-		mv $@ $@~; \

-		msgmerge -o $@ $@~ $(POT); \

-	else \

-		echo "Initializing $@ from $(POT)."; \

-		msginit -i $(POT) -o $@~ --locale=$*; \

-		sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $@~ > $@; \

-	fi

+# Convenient makefile for managing translations.
+
+# Prerequisites:
+# - GNU gettext
+# - Python
+
+# Adding new translations
+# -----------------------
+
+# To start working on a new translation edit the POS=... line
+# below. If you want to add for example a french translation, add
+# fr.po.
+
+# Then run "make po" to generate a fresh .po file from translatable
+# strings in t_options.h. Now you can edit the new .po file (fr.po in
+# the example above) to translate the strings. Please make sure that
+# your editor encodes the file in UTF-8.
+
+# Updating existing translations
+# ------------------------------
+
+# Run "make po" to update .po files with new translatable strings from
+# t_options.h. Now you can edit the .po files you're interested
+# in. Please make sure that your editor encodes the file in UTF-8.
+
+# Updating options.h
+# ------------------
+
+# Finally run "make" to generate options.h from t_options.h with all
+# translations. Now you can rebuild the drivers. Any common options
+# used by the drivers will have option descriptions with the latest
+# translations.
+
+# Publishing translations
+# -----------------------
+
+# To get your translation(s) into Mesa CVS, please send me your
+# <lang>.po file.
+
+# More information:
+# - info gettext
+
+# The set of supported languages. Add languages as needed.
+POS=de.po es.po nl.po fr.po sv.po
+
+#
+# Don't change anything below, unless you know what you're doing.
+#
+LANGS=$(POS:%.po=%)
+MOS=$(POS:%.po=%/LC_MESSAGES/options.mo)
+POT=xmlpool.pot
+
+.PHONY: all clean pot po mo
+
+all: options.h
+
+# Only intermediate files are cleaned up. options.h is not deleted because
+# it's in CVS. 
+clean:
+	-rm -f $(POT) *~
+	-rm -rf $(LANGS)
+
+# Default target options.h
+options.h: t_options.h mo
+	$(PYTHON2) $(PYTHON_FLAGS) gen_xmlpool.py $(LANGS) > options.h
+
+# Update .mo files from the corresponding .po files.
+mo:
+	@for mo in $(MOS); do \
+		lang=$${mo%%/*}; \
+		echo "Updating $$mo from $$lang.po."; \
+		mkdir -p $${mo%/*}; \
+		msgfmt -o $$mo $$lang.po; \
+	done
+
+# Use this target to create or update .po files with new messages in
+# driconf.py.
+po: $(POS)
+
+pot: $(POT)
+
+# Extract message catalog from driconf.py.
+$(POT): t_options.h
+	xgettext -L C --from-code utf-8 -o $(POT) t_options.h
+
+# Create or update a .po file for a specific language.
+%.po: $(POT)
+	@if [ -f $@ ]; then \
+		echo "Merging new strings from $(POT) into $@."; \
+		mv $@ $@~; \
+		msgmerge -o $@ $@~ $(POT); \
+	else \
+		echo "Initializing $@ from $(POT)."; \
+		msginit -i $(POT) -o $@~ --locale=$*; \
+		sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $@~ > $@; \
+	fi
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py b/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
index f5ac5e25b..7398c4cd0 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
+++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
@@ -1,191 +1,191 @@
-#!/usr/bin/python

-

-import sys

-import gettext

-import re

-

-# List of supported languages

-languages = sys.argv[1:]

-

-# Escape special characters in C strings

-def escapeCString (s):

-    escapeSeqs = {'\a' : '\\a', '\b' : '\\b', '\f' : '\\f', '\n' : '\\n',

-                  '\r' : '\\r', '\t' : '\\t', '\v' : '\\v', '\\' : '\\\\'}

-    # " -> '' is a hack. Quotes (") aren't possible in XML attributes.

-    # Better use Unicode characters for typographic quotes in option

-    # descriptions and translations.

-    i = 0

-    r = ''

-    while i < len(s):

-        # Special case: escape double quote with \u201c or \u201d, depending

-        # on whether it's an open or close quote. This is needed because plain

-        # double quotes are not possible in XML attributes.

-        if s[i] == '"':

-            if i == len(s)-1 or s[i+1].isspace():

-                # close quote

-                q = u'\u201c'

-            else:

-                # open quote

-                q = u'\u201d'

-            r = r + q

-        elif escapeSeqs.has_key(s[i]):

-            r = r + escapeSeqs[s[i]]

-        else:

-            r = r + s[i]

-        i = i + 1

-    return r

-

-# Expand escape sequences in C strings (needed for gettext lookup)

-def expandCString (s):

-    escapeSeqs = {'a' : '\a', 'b' : '\b', 'f' : '\f', 'n' : '\n',

-                  'r' : '\r', 't' : '\t', 'v' : '\v',

-                  '"' : '"', '\\' : '\\'}

-    i = 0

-    escape = False

-    hexa = False

-    octa = False

-    num = 0

-    digits = 0

-    r = ''

-    while i < len(s):

-        if not escape:

-            if s[i] == '\\':

-                escape = True

-            else:

-                r = r + s[i]

-        elif hexa:

-            if (s[i] >= '0' and s[i] <= '9') or \

-               (s[i] >= 'a' and s[i] <= 'f') or \

-               (s[i] >= 'A' and s[i] <= 'F'):

-                num = num * 16 + int(s[i],16)

-                digits = digits + 1

-            else:

-                digits = 2

-            if digits >= 2:

-                hexa = False

-                escape = False

-                r = r + chr(num)

-        elif octa:

-            if s[i] >= '0' and s[i] <= '7':

-                num = num * 8 + int(s[i],8)

-                digits = digits + 1

-            else:

-                digits = 3

-            if digits >= 3:

-                octa = False

-                escape = False

-                r = r + chr(num)

-        else:

-            if escapeSeqs.has_key(s[i]):

-                r = r + escapeSeqs[s[i]]

-                escape = False

-            elif s[i] >= '0' and s[i] <= '7':

-                octa = True

-                num = int(s[i],8)

-                if num <= 3:

-                    digits = 1

-                else:

-                    digits = 2

-            elif s[i] == 'x' or s[i] == 'X':

-                hexa = True

-                num = 0

-                digits = 0

-            else:

-                r = r + s[i]

-                escape = False

-        i = i + 1

-    return r

-

-# Expand matches. The first match is always a DESC or DESC_BEGIN match.

-# Subsequent matches are ENUM matches.

-#

-# DESC, DESC_BEGIN format: \1 \2=<lang> \3 \4=gettext(" \5=<text> \6=") \7

-# ENUM format:             \1 \2=gettext(" \3=<text> \4=") \5

-def expandMatches (matches, translations, end=None):

-    assert len(matches) > 0

-    nTranslations = len(translations)

-    i = 0

-    # Expand the description+enums for all translations

-    for lang,trans in translations:

-        i = i + 1

-        # Make sure that all but the last line of a simple description

-        # are extended with a backslash.

-        suffix = ''

-        if len(matches) == 1 and i < len(translations) and \

-               not matches[0].expand (r'\7').endswith('\\'):

-            suffix = ' \\'

-        # Expand the description line. Need to use ugettext in order to allow

-        # non-ascii unicode chars in the original English descriptions.

-        text = escapeCString (trans.ugettext (unicode (expandCString (

-            matches[0].expand (r'\5')), "utf-8"))).encode("utf-8")

-        print matches[0].expand (r'\1' + lang + r'\3"' + text + r'"\7') + suffix

-        # Expand any subsequent enum lines

-        for match in matches[1:]:

-            text = escapeCString (trans.ugettext (unicode (expandCString (

-                match.expand (r'\3')), "utf-8"))).encode("utf-8")

-            print match.expand (r'\1"' + text + r'"\5')

-

-        # Expand description end

-        if end:

-            print end,

-

-# Compile a list of translation classes to all supported languages.

-# The first translation is always a NullTranslations.

-translations = [("en", gettext.NullTranslations())]

-for lang in languages:

-    try:

-        trans = gettext.translation ("options", ".", [lang])

-    except IOError:

-        sys.stderr.write ("Warning: language '%s' not found.\n" % lang)

-        continue

-    translations.append ((lang, trans))

-

-# Regular expressions:

-reLibintl_h  = re.compile (r'#\s*include\s*<libintl.h>')

-reDESC       = re.compile (r'(\s*DRI_CONF_DESC\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')

-reDESC_BEGIN = re.compile (r'(\s*DRI_CONF_DESC_BEGIN\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')

-reENUM       = re.compile (r'(\s*DRI_CONF_ENUM\s*\([^,]+,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')

-reDESC_END   = re.compile (r'\s*DRI_CONF_DESC_END')

-

-# Print a header

-print \

-"/***********************************************************************\n" \

-" ***        THIS FILE IS GENERATED AUTOMATICALLY. DON'T EDIT!        ***\n" \

-" ***********************************************************************/"

-

-# Process the options template and generate options.h with all

-# translations.

-template = file ("t_options.h", "r")

-descMatches = []

-for line in template:

-    if len(descMatches) > 0:

-        matchENUM     = reENUM    .match (line)

-        matchDESC_END = reDESC_END.match (line)

-        if matchENUM:

-            descMatches.append (matchENUM)

-        elif matchDESC_END:

-            expandMatches (descMatches, translations, line)

-            descMatches = []

-        else:

-            sys.stderr.write (

-                "Warning: unexpected line inside description dropped:\n%s\n" \

-                % line)

-        continue

-    if reLibintl_h.search (line):

-        # Ignore (comment out) #include <libintl.h>

-        print "/* %s * commented out by gen_xmlpool.py */" % line

-        continue

-    matchDESC       = reDESC      .match (line)

-    matchDESC_BEGIN = reDESC_BEGIN.match (line)

-    if matchDESC:

-        assert len(descMatches) == 0

-        expandMatches ([matchDESC], translations)

-    elif matchDESC_BEGIN:

-        assert len(descMatches) == 0

-        descMatches = [matchDESC_BEGIN]

-    else:

-        print line,

-

-if len(descMatches) > 0:

-    sys.stderr.write ("Warning: unterminated description at end of file.\n")

-    expandMatches (descMatches, translations)

+#!/usr/bin/python
+
+import sys
+import gettext
+import re
+
+# List of supported languages
+languages = sys.argv[1:]
+
+# Escape special characters in C strings
+def escapeCString (s):
+    escapeSeqs = {'\a' : '\\a', '\b' : '\\b', '\f' : '\\f', '\n' : '\\n',
+                  '\r' : '\\r', '\t' : '\\t', '\v' : '\\v', '\\' : '\\\\'}
+    # " -> '' is a hack. Quotes (") aren't possible in XML attributes.
+    # Better use Unicode characters for typographic quotes in option
+    # descriptions and translations.
+    i = 0
+    r = ''
+    while i < len(s):
+        # Special case: escape double quote with \u201c or \u201d, depending
+        # on whether it's an open or close quote. This is needed because plain
+        # double quotes are not possible in XML attributes.
+        if s[i] == '"':
+            if i == len(s)-1 or s[i+1].isspace():
+                # close quote
+                q = u'\u201c'
+            else:
+                # open quote
+                q = u'\u201d'
+            r = r + q
+        elif escapeSeqs.has_key(s[i]):
+            r = r + escapeSeqs[s[i]]
+        else:
+            r = r + s[i]
+        i = i + 1
+    return r
+
+# Expand escape sequences in C strings (needed for gettext lookup)
+def expandCString (s):
+    escapeSeqs = {'a' : '\a', 'b' : '\b', 'f' : '\f', 'n' : '\n',
+                  'r' : '\r', 't' : '\t', 'v' : '\v',
+                  '"' : '"', '\\' : '\\'}
+    i = 0
+    escape = False
+    hexa = False
+    octa = False
+    num = 0
+    digits = 0
+    r = ''
+    while i < len(s):
+        if not escape:
+            if s[i] == '\\':
+                escape = True
+            else:
+                r = r + s[i]
+        elif hexa:
+            if (s[i] >= '0' and s[i] <= '9') or \
+               (s[i] >= 'a' and s[i] <= 'f') or \
+               (s[i] >= 'A' and s[i] <= 'F'):
+                num = num * 16 + int(s[i],16)
+                digits = digits + 1
+            else:
+                digits = 2
+            if digits >= 2:
+                hexa = False
+                escape = False
+                r = r + chr(num)
+        elif octa:
+            if s[i] >= '0' and s[i] <= '7':
+                num = num * 8 + int(s[i],8)
+                digits = digits + 1
+            else:
+                digits = 3
+            if digits >= 3:
+                octa = False
+                escape = False
+                r = r + chr(num)
+        else:
+            if escapeSeqs.has_key(s[i]):
+                r = r + escapeSeqs[s[i]]
+                escape = False
+            elif s[i] >= '0' and s[i] <= '7':
+                octa = True
+                num = int(s[i],8)
+                if num <= 3:
+                    digits = 1
+                else:
+                    digits = 2
+            elif s[i] == 'x' or s[i] == 'X':
+                hexa = True
+                num = 0
+                digits = 0
+            else:
+                r = r + s[i]
+                escape = False
+        i = i + 1
+    return r
+
+# Expand matches. The first match is always a DESC or DESC_BEGIN match.
+# Subsequent matches are ENUM matches.
+#
+# DESC, DESC_BEGIN format: \1 \2=<lang> \3 \4=gettext(" \5=<text> \6=") \7
+# ENUM format:             \1 \2=gettext(" \3=<text> \4=") \5
+def expandMatches (matches, translations, end=None):
+    assert len(matches) > 0
+    nTranslations = len(translations)
+    i = 0
+    # Expand the description+enums for all translations
+    for lang,trans in translations:
+        i = i + 1
+        # Make sure that all but the last line of a simple description
+        # are extended with a backslash.
+        suffix = ''
+        if len(matches) == 1 and i < len(translations) and \
+               not matches[0].expand (r'\7').endswith('\\'):
+            suffix = ' \\'
+        # Expand the description line. Need to use ugettext in order to allow
+        # non-ascii unicode chars in the original English descriptions.
+        text = escapeCString (trans.ugettext (unicode (expandCString (
+            matches[0].expand (r'\5')), "utf-8"))).encode("utf-8")
+        print matches[0].expand (r'\1' + lang + r'\3"' + text + r'"\7') + suffix
+        # Expand any subsequent enum lines
+        for match in matches[1:]:
+            text = escapeCString (trans.ugettext (unicode (expandCString (
+                match.expand (r'\3')), "utf-8"))).encode("utf-8")
+            print match.expand (r'\1"' + text + r'"\5')
+
+        # Expand description end
+        if end:
+            print end,
+
+# Compile a list of translation classes to all supported languages.
+# The first translation is always a NullTranslations.
+translations = [("en", gettext.NullTranslations())]
+for lang in languages:
+    try:
+        trans = gettext.translation ("options", ".", [lang])
+    except IOError:
+        sys.stderr.write ("Warning: language '%s' not found.\n" % lang)
+        continue
+    translations.append ((lang, trans))
+
+# Regular expressions:
+reLibintl_h  = re.compile (r'#\s*include\s*<libintl.h>')
+reDESC       = re.compile (r'(\s*DRI_CONF_DESC\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')
+reDESC_BEGIN = re.compile (r'(\s*DRI_CONF_DESC_BEGIN\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')
+reENUM       = re.compile (r'(\s*DRI_CONF_ENUM\s*\([^,]+,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')
+reDESC_END   = re.compile (r'\s*DRI_CONF_DESC_END')
+
+# Print a header
+print \
+"/***********************************************************************\n" \
+" ***        THIS FILE IS GENERATED AUTOMATICALLY. DON'T EDIT!        ***\n" \
+" ***********************************************************************/"
+
+# Process the options template and generate options.h with all
+# translations.
+template = file ("t_options.h", "r")
+descMatches = []
+for line in template:
+    if len(descMatches) > 0:
+        matchENUM     = reENUM    .match (line)
+        matchDESC_END = reDESC_END.match (line)
+        if matchENUM:
+            descMatches.append (matchENUM)
+        elif matchDESC_END:
+            expandMatches (descMatches, translations, line)
+            descMatches = []
+        else:
+            sys.stderr.write (
+                "Warning: unexpected line inside description dropped:\n%s\n" \
+                % line)
+        continue
+    if reLibintl_h.search (line):
+        # Ignore (comment out) #include <libintl.h>
+        print "/* %s * commented out by gen_xmlpool.py */" % line
+        continue
+    matchDESC       = reDESC      .match (line)
+    matchDESC_BEGIN = reDESC_BEGIN.match (line)
+    if matchDESC:
+        assert len(descMatches) == 0
+        expandMatches ([matchDESC], translations)
+    elif matchDESC_BEGIN:
+        assert len(descMatches) == 0
+        descMatches = [matchDESC_BEGIN]
+    else:
+        print line,
+
+if len(descMatches) > 0:
+    sys.stderr.write ("Warning: unterminated description at end of file.\n")
+    expandMatches (descMatches, translations)
diff --git a/mesalib/src/mesa/drivers/dri/swrast/.gitignore b/mesalib/src/mesa/drivers/dri/swrast/.gitignore
new file mode 100644
index 000000000..f3c7a7c5d
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/swrast/.gitignore
@@ -0,0 +1 @@
+Makefile