Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/common.py
	mesalib/docs/GL3.txt
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/SConscript
	xorg-server/Xext/xtest.c
	xorg-server/dix/getevents.c
	xorg-server/dix/window.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyr.h
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/src/kdrive.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/dri2/dri2.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwinEvents.c
	xorg-server/hw/xquartz/darwinEvents.h
	xorg-server/hw/xquartz/darwinXinput.c
	xorg-server/hw/xwin/InitInput.c
	xorg-server/include/input.h
	xorg-server/include/window.h
	xorg-server/mi/mipointer.c
	xorg-server/test/Makefile.am
	xorg-server/test/xi2/protocol-eventconvert.c

2 files changed, 106 insertions, 48 deletions

diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py
index d18f5642d..5de5537bf 100644
--- a/mesalib/scons/custom.py
+++ b/mesalib/scons/custom.py
@@ -33,6 +33,8 @@ Custom builders and methods.
 import os

 import os.path

 import re

+import sys

+import subprocess

 

 import SCons.Action

 import SCons.Builder

@@ -154,6 +156,79 @@ def createCodeGenerateMethod(env):
     env.AddMethod(code_generate, 'CodeGenerate')

 

 

+def _pkg_check_modules(env, name, modules):

+    '''Simple wrapper for pkg-config.'''

+

+    env['HAVE_' + name] = False

+

+    # For backwards compatability

+    env[name.lower()] = False

+

+    if env['platform'] == 'windows':

+        return

+

+    if not env.Detect('pkg-config'):

+        return

+

+    if subprocess.call(["pkg-config", "--exists", ' '.join(modules)]) != 0:

+        return

+

+    # Other flags may affect the compilation of unrelated targets, so store

+    # them with a prefix, (e.g., XXX_CFLAGS, XXX_LIBS, etc)

+    try:

+        flags = env.ParseFlags('!pkg-config --cflags --libs ' + ' '.join(modules))

+    except OSError:

+        return

+    prefix = name + '_'

+    for flag_name, flag_value in flags.iteritems():

+        assert '_' not in flag_name

+        env[prefix + flag_name] = flag_value

+

+    env['HAVE_' + name] = True

+

+def pkg_check_modules(env, name, modules):

+

+    sys.stdout.write('Checking for %s...' % name)

+    _pkg_check_modules(env, name, modules)

+    result = env['HAVE_' + name]

+    sys.stdout.write(' %s\n' % ['no', 'yes'][int(bool(result))])

+

+    # XXX: For backwards compatability

+    env[name.lower()] = result

+

+

+def pkg_use_modules(env, names):

+    '''Search for all environment flags that match NAME_FOO and append them to

+    the FOO environment variable.'''

+

+    names = env.Flatten(names)

+

+    for name in names:

+        prefix = name + '_'

+

+        if not 'HAVE_' + name in env:

+            print 'Attempt to use unknown module %s' % name

+            env.Exit(1)

+

+        if not env['HAVE_' + name]:

+            print 'Attempt to use unavailable module %s' % name

+            env.Exit(1)

+

+        flags = {}

+        for flag_name, flag_value in env.Dictionary().iteritems():

+            if flag_name.startswith(prefix):

+                flag_name = flag_name[len(prefix):]

+                if '_' not in flag_name:

+                    flags[flag_name] = flag_value

+        if flags:

+            env.MergeFlags(flags)

+

+

+def createPkgConfigMethods(env):

+    env.AddMethod(pkg_check_modules, 'PkgCheckModules')

+    env.AddMethod(pkg_use_modules, 'PkgUseModules')

+

+

 def generate(env):

     """Common environment generation code"""

 

@@ -164,6 +239,7 @@ def generate(env):
     # Custom builders and methods

     createConvenienceLibBuilder(env)

     createCodeGenerateMethod(env)

+    createPkgConfigMethods(env)

 

     # for debugging

     #print env.Dump()

diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 97868b930..1cdc11cb5 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -104,41 +104,6 @@ def num_jobs():
     return 1

 

 

-def pkg_config_modules(env, name, modules):

-    '''Simple wrapper for pkg-config.'''

-

-    env[name] = False

-

-    if env['platform'] == 'windows':

-        return

-

-    if not env.Detect('pkg-config'):

-        return

-

-    if subprocess.call(["pkg-config", "--exists", ' '.join(modules)]) != 0:

-        return

-

-    # Put -I and -L flags directly into the environment, as these don't affect

-    # the compilation of targets that do not use them

-    try:

-        env.ParseConfig('pkg-config --cflags-only-I --libs-only-L ' + ' '.join(modules))

-    except OSError:

-        return

-

-    # Other flags may affect the compilation of unrelated targets, so store

-    # them with a prefix, (e.g., XXX_CFLAGS, XXX_LIBS, etc)

-    try:

-        flags = env.ParseFlags('!pkg-config --cflags-only-other --libs-only-l --libs-only-other ' + ' '.join(modules))

-    except OSError:

-        return

-    prefix = name.upper() + '_'

-    for flag_name, flag_value in flags.iteritems():

-        env[prefix + flag_name] = flag_value

-

-    env[name] = True

-

-

-

 def generate(env):

     """Common environment generation code"""

 

@@ -289,8 +254,21 @@ def generate(env):
             'PTHREADS',

             'HAVE_POSIX_MEMALIGN',

         ]

-    if env['platform'] == 'darwin':

-        cppdefines += ['_DARWIN_C_SOURCE']

+        if env['platform'] == 'darwin':

+            cppdefines += [

+                '_DARWIN_C_SOURCE',

+                'GLX_USE_APPLEGL',

+                'GLX_DIRECT_RENDERING',

+            ]

+        else:

+            cppdefines += [

+                'GLX_DIRECT_RENDERING',

+                'GLX_INDIRECT_RENDERING',

+            ]

+        if env['platform'] in ('linux', 'freebsd'):

+            cppdefines += ['HAVE_ALIAS']

+        else:

+            cppdefines += ['GLX_ALIAS_UNSUPPORTED']

     if platform == 'windows':

         cppdefines += [

             'WIN32',

@@ -381,6 +359,8 @@ def generate(env):
             ccflags += ['-O0']

         else:

             ccflags += ['-O3']

+        # Work around aliasing bugs - developers should comment this out

+        ccflags += ['-fno-strict-aliasing']

         ccflags += ['-g3']

         if env['build'] in ('checked', 'profile'):

             # See http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#Which_options_should_I_pass_to_gcc_when_compiling_for_profiling?

@@ -437,10 +417,10 @@ def generate(env):
             ]

         if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2'):

             ccflags += [

-                '-Werror=pointer-arith',

+                '-Wpointer-arith',

             ]

             cflags += [

-                '-Werror=declaration-after-statement',

+                '-Wdeclaration-after-statement',

             ]

     if msvc:

         # See also:

@@ -622,19 +602,21 @@ def generate(env):
     if env['llvm']:

         env.Tool('llvm')

     

-    pkg_config_modules(env, 'x11', ['x11', 'xext'])

-    pkg_config_modules(env, 'drm', ['libdrm'])

-    pkg_config_modules(env, 'drm_intel', ['libdrm_intel'])

-    pkg_config_modules(env, 'drm_radeon', ['libdrm_radeon'])

-    pkg_config_modules(env, 'xorg', ['xorg-server'])

-    pkg_config_modules(env, 'kms', ['libkms'])

-

-    env['dri'] = env['x11'] and env['drm']

-

     # Custom builders and methods

     env.Tool('custom')

     createInstallMethods(env)

 

+    env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])

+    env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])

+    env.PkgCheckModules('DRM', ['libdrm'])

+    env.PkgCheckModules('DRM_INTEL', ['libdrm_intel'])

+    env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon'])

+    env.PkgCheckModules('XORG', ['xorg-server'])

+    env.PkgCheckModules('KMS', ['libkms'])

+    env.PkgCheckModules('UDEV', ['libudev'])

+

+    env['dri'] = env['x11'] and env['drm']

+

     # for debugging

     #print env.Dump()