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

1 files changed, 73 insertions, 73 deletions

diff --git a/mesalib/scons/dxsdk.py b/mesalib/scons/dxsdk.py
index 4671763d3..920cc2f68 100644
--- a/mesalib/scons/dxsdk.py
+++ b/mesalib/scons/dxsdk.py
@@ -1,73 +1,73 @@
-"""dxsdk

-

-Tool-specific initialization for Microsoft DirectX SDK

-

-"""

-

-#

-# Copyright (c) 2009 VMware, Inc.

-#

-# Permission is hereby granted, free of charge, to any person obtaining

-# a copy of this software and associated documentation files (the

-# "Software"), to deal in the Software without restriction, including

-# without limitation the rights to use, copy, modify, merge, publish,

-# distribute, sublicense, and/or sell copies of the Software, and to

-# permit persons to whom the Software is furnished to do so, subject to

-# the following conditions:

-#

-# The above copyright notice and this permission notice shall be included

-# in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY

-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE

-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-#

-

-import os

-import os.path

-

-import SCons.Errors

-import SCons.Util

-

-

-def get_dxsdk_root(env):

-    try:

-        return os.environ['DXSDK_DIR']

-    except KeyError:

-        return None

-

-def generate(env):

-    dxsdk_root = get_dxsdk_root(env)

-    if dxsdk_root is None:

-        # DirectX SDK not found

-        return

-

-    if env['machine'] in ('generic', 'x86'):

-        target_cpu = 'x86'

-    elif env['machine'] == 'x86_64':

-        target_cpu = 'x64'

-    else:

-        raise SCons.Errors.InternalError, "Unsupported target machine"

-

-    include_dir = os.path.join(dxsdk_root, 'Include')

-    lib_dir = os.path.join(dxsdk_root, 'Lib', target_cpu)

-

-    env.Append(CPPDEFINES = [('HAVE_DXSDK', '1')])

-

-    gcc = 'gcc' in os.path.basename(env['CC']).split('-')

-    if gcc:

-        # Make GCC more forgiving towards Microsoft's headers

-        env.Prepend(CPPFLAGS = ['-isystem', include_dir])

-    else:

-        env.Prepend(CPPPATH = [include_dir])

-

-    env.Prepend(LIBPATH = [lib_dir])

-

-def exists(env):

-    return get_dxsdk_root(env) is not None

-

-# vim:set ts=4 sw=4 et:

+"""dxsdk
+
+Tool-specific initialization for Microsoft DirectX SDK
+
+"""
+
+#
+# Copyright (c) 2009 VMware, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+import os
+import os.path
+
+import SCons.Errors
+import SCons.Util
+
+
+def get_dxsdk_root(env):
+    try:
+        return os.environ['DXSDK_DIR']
+    except KeyError:
+        return None
+
+def generate(env):
+    dxsdk_root = get_dxsdk_root(env)
+    if dxsdk_root is None:
+        # DirectX SDK not found
+        return
+
+    if env['machine'] in ('generic', 'x86'):
+        target_cpu = 'x86'
+    elif env['machine'] == 'x86_64':
+        target_cpu = 'x64'
+    else:
+        raise SCons.Errors.InternalError, "Unsupported target machine"
+
+    include_dir = os.path.join(dxsdk_root, 'Include')
+    lib_dir = os.path.join(dxsdk_root, 'Lib', target_cpu)
+
+    env.Append(CPPDEFINES = [('HAVE_DXSDK', '1')])
+
+    gcc = 'gcc' in os.path.basename(env['CC']).split('-')
+    if gcc:
+        # Make GCC more forgiving towards Microsoft's headers
+        env.Prepend(CPPFLAGS = ['-isystem', include_dir])
+    else:
+        env.Prepend(CPPPATH = [include_dir])
+
+    env.Prepend(LIBPATH = [lib_dir])
+
+def exists(env):
+    return get_dxsdk_root(env) is not None
+
+# vim:set ts=4 sw=4 et: