Merge lp:~muktupavels/xorg-server/lp-1209008 into lp:ubuntu/utopic/xorg-server

[Alberts Muktupāvels]

Add upstream patch to fix "No devices detected" error for seats other than seat0. (LP: #1209008)

Add upstream patch to fix "No devices detected" error for seats other than seat0. (LP: #1209008)

=== added file '.dir-locals.el'
--- .dir-locals.el	1970-01-01 00:00:00 +0000
+++ .dir-locals.el	2014-07-01 14:18:40 +0000
@@ -0,0 +1,1 @@
+((c-mode . ((c-basic-offset . 4) (indent-tabs-mode . nil))))
\ No newline at end of file

=== modified file 'COPYING'
--- COPYING	2013-08-14 10:52:17 +0000
+++ COPYING	2014-07-01 14:18:40 +0000
@@ -20,6 +20,7 @@
 Copyright © 2007-2009 Red Hat, Inc.
 Copyright © 2005-2008 Daniel Stone
 Copyright © 2006-2009 Simon Thum
+Copyright © 2003-2008, 2013 Geert Uytterhoeven
 Copyright © 2006 Luc Verhaegen
 
 Permission is hereby granted, free of charge, to any person obtaining a

=== modified file 'ChangeLog'
--- ChangeLog	2013-08-14 10:52:17 +0000
+++ ChangeLog	2014-07-01 14:18:40 +0000
@@ -1,54 +1,5548 @@
-commit bc41226f7741098e55a3b0df924986991576d50a
-Merge: 4ebd618 2cd62dc
-Author: Matt Dew <[e-mail]>
-Date:   Thu Jul 25 22:56:24 2013 -0600
-
-    Merge branch 'server-1.14-touch-fixes' of git://people.freedesktop.org/~whot/xserver into server-1.14-branch
-
-commit 4ebd618bc5ef71507e708e7191091828eca3a7e8
-Author: Matt Dew <[e-mail]>
-Date:   Thu Jul 25 22:24:00 2013 -0600
-
-    Bah, bad rev number. Fixed:  changed 1.14.3-rc1 to 1.14.2.901
-
-commit fef66ffe7a7e899a9126a1e431b94d881163b00d
-Author: Matt Dew <[e-mail]>
-Date:   Thu Jul 25 22:02:26 2013 -0600
-
-    bump rev from 1.14.2 to 1.14.3-rc1
-
-commit 2cd62dc02b67c70d2417b2ccd307ead9596a2967
-Author: Peter Hutterer <[e-mail]>
-Date:   Fri Mar 1 08:43:58 2013 +1000
-
-    Xi: return !Success from DeliverTouchEmulatedEvent if we didn't deliver
-    
-    All callers currently ignore the new value, so this patch has no effect.
-    Inverse call graph:
-    
-    DeliverTouchEmulatedEvent
-            DeliverEmulatedMotionEvent              Ignores value
-            DeliverTouchBeginEvent
-                    DeliverTouchEvent
-                            DeliverTouchEvents      Ignores value
-            DeliverTouchEndEvent
-                    DeliverTouchEvent
-                            DeliverTouchEvents      Ignores value
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Keith Packard <[e-mail]>
-    (cherry picked from commit 9978b57b8d94f061d72a67b99a02b0ba16a11429)
-
-commit c203568905bcbb65fb1e079b626d2c1e90ecb72d
-Author: Peter Hutterer <[e-mail]>
-Date:   Mon May 13 15:22:12 2013 +1000
-
-    Xi: fix warning - remove unused 'rc'
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    (cherry picked from commit fd5ea0237db6d725a48f76b706135df9d3246b82)
-
-commit 93f063c40dc4b339ae9114551071c57b52d98dba
+commit 9182af8a09c326bb4b01d3645fb2936e93f02242
+Author: Matt Dew <[e-mail]>
+Date:   Sun Apr 13 20:55:40 2014 -0600
+
+    Bump version to 1.15.1
+
+commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Mar 6 18:50:07 2014 -0800
+
+    glx: Clear new FBConfig attributes to 0 by default.
+    
+    The visualSelectGroup wasn't getting set (since our DRI drivers don't
+    use it), and and since it's the top priority in the sort order, you
+    got random sorting of your visuals unless malloc really returned you
+    new memory.  This manifested as Xephyr -glamor rendering to a
+    multisampled window on my system, which as you might guess was
+    slightly lower performance than expected.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Michel Dänzer <[e-mail]>
+
+commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
+Author: Julien Cristau <[e-mail]>
+Date:   Wed Mar 26 23:24:20 2014 +0100
+
+    Xephyr: restore initial window resize lost in xcb conversion
+    
+    The XResizeWindow call wasn't replaced by the xcb equivalent, so we
+    were no longer setting the initial window size, only wm size hints.
+    
+    Regression from commit a2b73da "Xephyr: start converting hostx.c over to
+    xcb"
+    
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
+    
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Reported-by: Laércio de Sousa <[e-mail]>
+    Tested-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 300458fb8ad0a7957e941cd65f47d204c7886e22
+Author: Matt Dew <[e-mail]>
+Date:   Fri Mar 21 23:49:41 2014 -0600
+
+    Bump bersion to 1.15.0.901
+
+commit c971864565eb114e4b34f17b0d2244e8e6e1e005
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Feb 26 07:54:56 2014 +1000
+
+    config: search for PnPID on all parents (#75513)
+    
+    The PnPID for a device may not be on the immediate parent, so search up the
+    device tree until we find one.
+    
+    X.Org Bug 75513 <http://bugs.freedesktop.org/show_bug.cgi?id=75513>
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Tested-by: Benjamin Tissoires <[e-mail]>
+    (cherry picked from commit 795066477ee81b5b82e490eac8bed6b656d01f17)
+
+commit 2cbbe80efc485d2d05b06efe1e2e01f81f3e06f6
+Author: Peter Hutterer <[e-mail]>
+Date:   Thu Feb 20 13:18:05 2014 +1000
+
+    Xi: check for invalid modifiers for XI2 passive grabs
+    
+    The other values are checked correctly, but if a modifier was outside the
+    allowed range, it would go unnoticed and cause a out-of-bounds read error for
+    any mask equal or larger than 256. The DetailRec where we store the grab masks
+    is only sized to 8 * sizeof(Mask).
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Alan Coopersmith <[e-mail]>
+    (cherry picked from commit 0f10cfd4b903d4db293ec47c8a9a0d8b33965803)
+
+commit b3656c0b52d57333c64f932676a237d0f3a97f36
+Author: Mark Kettenis <[e-mail]>
+Date:   Sun Dec 15 14:31:10 2013 +0100
+
+    sync: Avoid ridiculously long timeouts
+    
+    On OpenBSD, passing a timeout longer than 100000000 seconds to select(2) will
+    make it fail with EINVAL.  As this is original 4.4BSD behaviour it is not
+    inconceivable that other systems suffer from the same problem.  And Linux,
+    though not suffering from any 4.4BSD heritage, briefly did something similar:
+    
+    <https://lkml.org/lkml/2012/8/31/263>
+    
+    So avoid calling AdjustWaitForDelay() instead of setting the timeout to
+    (effectively) ULONG_MAX milliseconds.
+    
+    Signed-off-by: Mark Kettenis <[e-mail]>
+    Reviewed-by: Matthieu Herrb <[e-mail]>
+    (cherry picked from commit ddeca927498c9df3b5e62c7bf05e31e2a3aeaa52)
+
+commit b332cd20ee14049606e3656490d13a8efa6b23ee
+Merge: f41ab8c 5e0432f
+Author: Matt Dew <[e-mail]>
+Date:   Thu Mar 6 22:03:03 2014 -0700
+
+    Merge branch 'server-1.15-branch' of git://people.freedesktop.org/~jeremyhu/xserver into server-1.15-branch
+
+commit f41ab8c60780ea8f87354e536e5b73cb23878eb7
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Jan 24 18:32:54 2014 +1000
+
+    dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS
+    
+    The server internally relies on arrays with a MAX_BUTTONS maximum size (which
+    is the max the core protocol can transport). Make sure a driver adheres to
+    that.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Daniel Stone <[e-mail]>
+    (cherry picked from commit 87ca80a7196949597113225405f3e4ee03bbee13)
+
+commit 4447d71b9a74afe91aaf4cc01eae12a44ef09306
+Author: Alan Coopersmith <[e-mail]>
+Date:   Tue Jan 28 20:27:51 2014 -0800
+
+    xf86DeleteScreen: move check for NULL pScrn before first dereference
+    
+    Flagged by cppcheck 1.62:
+    [hw/xfree86/common/xf86Helper.c:220] -> [hw/xfree86/common/xf86Helper.c:231]:
+     (warning) Possible null pointer dereference: pScrn - otherwise it is
+     redundant to check it against null.
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+    (cherry picked from commit c1ac89c793614797e08d3d8e7fc9ba55be899130)
+
+commit 2ac840a14958fe74170518ee2c3a6b2dd88b20bd
+Author: Alan Coopersmith <[e-mail]>
+Date:   Tue Jan 28 20:27:50 2014 -0800
+
+    On realloc failure, free font_path_string instead of leaking it
+    
+    Flagged by cppcheck 1.62:
+    [dix/dixfonts.c:1792]: (error) Common realloc mistake:
+     'font_path_string' nulled but not freed upon failure
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+    (cherry picked from commit e6733ae91b7be52930f22a87de15fa05819ef948)
+
+commit 157cc02fc13c998bba70e1652907972015e15e8e
+Author: Alan Coopersmith <[e-mail]>
+Date:   Fri Jan 24 23:42:49 2014 -0800
+
+    Check for calloc() failure in add_master()
+    
+    Reported-by: Ilja Van Sprundel <[e-mail]>
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    (cherry picked from commit 9fc19168e7ca6308275bf8769d1ccb982f88465b)
+
+commit f11c5938d732af717aeebbbf3b356138f3411bb7
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Jan 24 16:51:02 2014 +1000
+
+    Xi: fix modifier offset in XIPassiveGrab swapping function
+    
+    The request is followed by mask_len 4-byte units, then followed by the actual
+    modifiers.
+    
+    Also fix up the swapping test, which had the same issue.
+    
+    Reported-by: Alan Coopersmith <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Alan Coopersmith <[e-mail]>
+    (cherry picked from commit 76b3be75b62657e346731444736f7e4d200beb5b)
+    
+    Conflicts:
+    	test/xi2/protocol-xipassivegrabdevice.c
+
+commit 345b7ead1dd262020e10b4aeb71044d46d16e134
+Author: Peter Hutterer <[e-mail]>
+Date:   Mon Jan 13 17:00:23 2014 +1000
+
+    os: restrict display names to digits
+    
+    We call atoi() on the server's display to get the socket but otherwise use the
+    unmodified display for log file name, xkb paths, etc. This results in
+    Xorg :banana being the equivalent of Xorg :0, except for the log files being
+    in /var/log/Xorg.banana.log. I'm not sure there's a good use-case for this
+    behaviour.
+    
+    Check the display for something that looks reasonable, i.e. digits only, but
+    do allow for :0.0 (i.e. digits, followed by a period, followed by one or two
+    digits).
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    (cherry picked from commit 71baa466b1f6b02fe503f9a3089b7b9d61aa0f80)
+
+commit 940d6a8e9d3544696654d5e68c615ab887f81945
+Author: Carlos Garnacho <[e-mail]>
+Date:   Thu Jan 2 21:33:30 2014 +0100
+
+    Xi: Ensure DeviceChanged is emitted after grabs are deactivated
+    
+    When a grab on a slave device is deactivated, the master device must
+    be checked, just in case there were events from other devices while
+    the slave device was stolen away by the passive grab. This may
+    introduce misbehaviors on mismatching valuators and device features
+    later on UpdateDeviceState().
+    
+    Signed-off-by: Carlos Garnacho <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    (cherry picked from commit b2d5ee2e3684951b611fd2068d57cc65fd8305a3)
+
+commit 47da6e3f47a55aeeef2c849067dd2d09fc2fe481
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Jan 24 18:16:54 2014 +1000
+
+    dix: fix button state check before changing a button mapping
+    
+    dev->button->down is a bitmask, not a normal array. Use the helper function to
+    check, we technically allow the mapping to change after the physical button
+    has been pressed (but not yet processed yet), so only check BUTTON_PROCESSED.
+    
+    From XSetPointerMapping(3):
+    "If any of the buttons to be altered are logically in the down state,
+    XSetPointerMapping returns MappingBusy, and the mapping is not changed."
+    
+    Reported-by: Ilja Van Sprundel <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Daniel Stone <[e-mail]>
+    (cherry picked from commit 25d10464f440b8b34594b7c988a99a830ea39a29)
+
+commit 5e0432f797d58fe1a69ef538694f65bbba38737f
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Wed Jan 1 11:10:41 2014 -0800
+
+    XQuartz: Avoid passing uninitialized pointers to X11ApplicationSetWindowMenu in AppleWMSetWindowMenu
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit 77df653ae3d8448be21221711851acde12c6bc1a)
+
+commit 859ced56d9ee168796c2fcf7fa6056e0c1491f3a
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Wed Jan 1 11:04:07 2014 -0800
+
+    XQuartz: Check for allocated memory before using it in AppleWMSetWindowMenu
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit 3bc608a361a01043b226fb9aaebf88f6fd852925)
+
+commit 9444955d16f85926c75ee8eafb0ca796dcf16439
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Wed Jan 1 11:00:40 2014 -0800
+
+    XQuartz: Silence a clang static analysis warning about a memory leak
+    
+    It seems the alanyzer can't comprehend dixSetPrivate().
+    
+    quartz.c:119:12: warning: Potential leak of memory pointed to by 'displayInfo'
+        return quartzProcs->AddScreen(index, pScreen);
+               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit 64327226ddfba8f0653615cd678d2d4336fb993d)
+
+commit 64b0669d1c062e7e11fb0e3b8ea7fe56113fc86f
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Wed Jan 1 10:55:10 2014 -0800
+
+    XQuartz: Silence a clang static analysis warning about a possible memory leak on exit
+    
+    stub.c:356:9: warning: Potential leak of memory pointed to by 'newargv'
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+            ^~~~~~~
+    stub.c:356:9: warning: Potential leak of memory pointed to by 'newenvp'
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+            ^~~~~~~
+    2 warnings generated.
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit b2f6b3497c33a4897afae80a2cf69c596b9f81e8)
+
+commit 472e8e5d1c26573cef4bd42451230ef47791ed6f
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Wed Jan 1 10:47:52 2014 -0800
+
+    XQuartz: Validate length in appledri before swapping
+    
+    Avoids potential memory corruption from bad requests
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit a03f096a85537d9e881cedaa6cb71aca43a97086)
+
+commit 782fe5c174def75a9e4cb188c00c2fec72821472
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Wed Jan 1 10:39:56 2014 -0800
+
+    XQuartz: Validate screen in AppleDRIQueryDirectRenderingCapable requests
+    
+    Return an error to the caller rather than crashing the server on
+    invalid screens.
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit b3572c0d1ab7888ac26d6b2b8be6d1d19ed9af3f)
+
+commit 045122566c0532378b50c1af3ffec3254e416fe2
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Dec 29 12:45:23 2013 -0800
+
+    XQuartz: Simplify hook_run to quiet static analyzer
+    
+    x-hook.c:96:9: warning: Called function pointer is an uninitalized pointer value
+            (*fun[i])(arg, data[i]);
+            ^~~~~~~~~~~~~~~~~~~~~~~
+    1 warning generated.
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit 959e8f23af7850fcaf40d6c67f5228241a36a9ab)
+
+commit 33b2ae0f3b4a80fd962d876f7437d98fcfc27791
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Dec 29 12:41:18 2013 -0800
+
+    XQuartz: Mark applicationWillTerminate: noreturn
+    
+    X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn'
+          [-Wmissing-noreturn,Semantic Issue]
+    {
+    ^
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit f79af1941776fd6f1ec26c50603fcc35ca7d514b)
+
+commit 404f26866147be1c26585e59d9795e87e0c3e5fa
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Dec 29 12:36:51 2013 -0800
+
+    XQuartz: Fix get_proc_address signature
+    
+    indirect.c:675:28: warning: incompatible pointer types passing 'glx_gpa_proc (*)(const char *)' to parameter of type
+          'glx_gpa_proc' (aka 'glx_func_ptr (*)(const char *)') [-Wincompatible-pointer-types,Semantic Issue]
+        __glXsetGetProcAddress(&get_proc_address);
+                               ^~~~~~~~~~~~~~~~~
+    ../../../glx/glxserver.h:122:42: note: passing argument to parameter 'get_proc_address' here [Semantic Issue]
+    void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);
+                                             ^
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit ea80279e292e59a9fe9651489f03e9f2f39810d9)
+
+commit 7803c4075b824ece79af0425cee736025c41d901
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Dec 29 12:31:23 2013 -0800
+
+    XQuartz: Fix darwinfb.h header guard
+    
+    ./darwinfb.h:28:9: warning: '_DARWIN_FB_H' is used as a header guard here, followed by #define of a different macro
+          [-Wheader-guard,Lexical or Preprocessor Issue]
+            ^~~~~~~~~~~~
+    ./darwinfb.h:29:9: note: '_DARWIN_DB_H' is defined here; did you mean '_DARWIN_FB_H'? [Lexical or Preprocessor Issue]
+            ^~~~~~~~~~~~
+            _DARWIN_FB_H
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit 2e3ebec9520719a8e5c3c92390e83bcb5216f978)
+
+commit 6c055f0d78349ff08a570c5dcc92c6f7b6924993
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Dec 29 12:22:55 2013 -0800
+
+    XQuartz: Silence some static analyzer warnings by annotating referencing counts
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    (cherry picked from commit 9da6c0918f40359f28fe8889d5b7cae7efcc8377)
+
+commit 2ea973e12f5d954211e1d10085a4c74581b43aca
+Author: Keith Packard <[e-mail]>
+Date:   Fri Dec 27 09:50:55 2013 -0800
+
+    Bump version to 1.15.0
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 2eb9915eea358f941702d3dad7434197991885c5
+Author: Keith Packard <[e-mail]>
+Date:   Thu Dec 12 15:48:08 2013 -0800
+
+    present: Set complete notify mode to Skip as needed
+    
+    Skipped present pixmap calls were not setting the mode to
+    PresentCompleteModeSkip for skipped operations.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit e487babd525ef1bd016ec7b283fa08cf9e6c6f4f
+Author: Keith Packard <[e-mail]>
+Date:   Thu Dec 12 14:52:35 2013 -0800
+
+    present: Don't abandon presents which are already queued for flip
+    
+    Presents which are not marked 'queued' and are in the window present
+    list are waiting for the flip event; discarding those won't work very
+    well (it'll end up trashing displayed content for the next frame), so
+    skip over those when looking for duplicate frame presents
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit ca3a5b2a8f9f627bbaa9883e16512a21c2a0b81d
+Author: Keith Packard <[e-mail]>
+Date:   Thu Dec 12 14:17:40 2013 -0800
+
+    present: Handle PresentOptionAsync for copy mode
+    
+    Check for Async flag and execute immediately if set, otherwise wait
+    for the next appropriate vblank before copying.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit a68df147421da21528b5be2d34678383922fa352
+Author: Keith Packard <[e-mail]>
+Date:   Thu Dec 19 14:31:07 2013 -0800
+
+    Bump version to 1.14.99.905 (1.15 RC5)
+    
+    Another week, another RC. This should be the last before 1.15 final
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0
+Merge: 4d62646 929795d
+Author: Keith Packard <[e-mail]>
+Date:   Thu Dec 19 14:14:59 2013 -0800
+
+    Merge remote-tracking branch 'whot/for-keith'
+
+commit 4d62646142718024b0981eb4f1fd0131e829161f
+Merge: f4bfb14 81ba89d
+Author: Keith Packard <[e-mail]>
+Date:   Mon Dec 16 09:27:57 2013 -0800
+
+    Merge remote-tracking branch 'jeremyhu/master'
+
+commit f4bfb14f53a939574da1f5995f0dad949898b86a
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Dec 12 10:57:40 2013 -0500
+
+    configure: Fix a typo near dri3/shmfence detection
+    
+    " is not the mate of ].
+    
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 8248b4af31ef71ac03158871b77f20eb456dbe38
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Dec 13 15:07:48 2013 -0500
+
+    glx: Add null pointer protection to __glGetProcAddress
+    
+    This can't happen when GLX is the backing window system, but can
+    elsewhere.  We may as well protect against it at a high level.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 128449dd6498a2f74c3770f89a9dae0f70e2b351
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Dec 13 11:39:16 2013 -0500
+
+    present: Don't use the major/minor version from the protocol headers
+    
+    We want to advertise the version we implement, not the version the
+    protocol headers happen to describe.
+    
+    Reviewed-by: Jasper St. Pierre <<[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit ec6087bf070131bc3a26848fb9fb840f09b0e19d
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Dec 13 11:36:38 2013 -0500
+
+    dri3: Don't use the major/minor version from the protocol headers
+    
+    We want to advertise the version we implement, not the version the
+    protocol headers happen to describe.
+    
+    Reviewed-by: Jasper St. Pierre <<[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e6fafd3de70d315130fb6e5732cfd02a5901b788
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Dec 13 11:28:59 2013 -0500
+
+    dri3: Guard against buggy clients
+    
+    There's nothing to stop a client from sending these requests to screens
+    without DRI3 support, and if they do, we'll crash.  Let's not do that.
+    
+    Reviewed-by: Jasper St. Pierre <<[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 81ba89d6703a22178a153aa39478ba2d4bde262b
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Fri Dec 13 01:39:44 2013 -0800
+
+    configure.ac: Add PRESENT_LIB to XQUARTZ_LIBS
+    
+    Undefined symbols for architecture x86_64:
+      "_present_extension_init", referenced from:
+          _staticExtensions in libXquartz.a(miinitext.o)
+      "_present_register_complete_notify", referenced from:
+          ___glXregisterPresentCompleteNotify in libglx.a(glxcmds.o)
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit d7c9235ee261b0f780320985233e00dec5e2689c
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sat Dec 7 01:36:33 2013 -0800
+
+    XQuartz: Use asl_log_descriptor to log stdout/stderr of child processes
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit ad8111d7c971ce448905c733d65ba0cfc72bdca4
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sat Dec 7 01:14:37 2013 -0800
+
+    darwin: Don't leave stdin/stdout closed
+    
+    <rdar://problem/15609419>
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit 929795d50d788358d6269ce423f72c6cc40e334b
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Dec 3 10:14:51 2013 +1000
+
+    dix: fix check for grab type
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 23394c7fea0f5c33333198c87ecfecc9f6c6a791
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Dec 3 08:36:45 2013 +1000
+
+    Xi: ungrab device when releasing a passive grab without ButtonReleaseMask (#71878)
+    
+    If an touch triggers an async button grab and that grab does not have the
+    ButtonReleaseMask set, the TouchEnd is never delivered, deliveries is 0  and
+    the grab is never deactivated.
+    
+    If the grab is pointer async and keyboard sync, the keyboard events are stuck
+    in EnqueueEvent until some other pointer event terminates the grab.
+    
+    Change this to check for the number of listeners. If we're about to deliver a
+    TouchEnd to a passive pointer grab, the number of listeners is already 1 -
+    pointer grabs always accept so other listeners were removed.
+    
+    X.Org Bug 71878 <http://bugs.freedesktop.org/show_bug.cgi?id=71878>
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit c1d30b5bd7f90e68bc38404fd0cc32578d6d3018
+Author: Ben Gamari <[e-mail]>
+Date:   Thu Nov 21 21:24:20 2013 -0500
+
+    Xi: Don't ActivateEarlyAccept POINTER_REGULAR listeners
+    
+    Bug #71878 describes a bug resulting in the server ceasing to respond to
+    keyboard input after a touch event. The problem might be the following:
+    
+    DeliverTouchBeginEvent tries to deliver an event to a listener of type
+    LISTENER_POINTER_REGULAR, taking the following if branch,
+    
+        if (listener->type == LISTENER_POINTER_REGULAR ||
+            listener->type == LISTENER_POINTER_GRAB) {
+            rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win,
+                                           grab, xi2mask);
+            if (rc == Success) {
+                listener->state = LISTENER_IS_OWNER;
+                /* async grabs cannot replay, so automatically accept this touch */
+                if (dev->deviceGrab.grab &&
+                    dev->deviceGrab.fromPassiveGrab &&
+                    dev->deviceGrab.grab->pointerMode == GrabModeAsync)
+                    ActivateEarlyAccept(dev, ti);
+            }
+            goto out;
+        }
+    
+    DeliverTouchEmulatedEvent succeeds.  The deviceGrab meets all
+    three of the conditions of the inner if, enters
+    ActivateEarlyAccept which then fails due to,
+    
+        BUG_RETURN(ti->listeners[0].type != LISTENER_GRAB &&
+                   ti->listeners[0].type != LISTENER_POINTER_GRAB);
+    
+    That is, despite listener->type == LISTENER_POINTER_REGULAR. With my
+    non-existent knowledge of XINPUT, it seems like the solution here
+    might be to only ActivateEarlyAccept when listener->type ==
+    LISTENER_POINTER_GRAB.
+    
+    Signed-off-by: Ben Gamari <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit fe07ec19e212a68076560d243a2a935c54589068
+Author: Keith Packard <[e-mail]>
+Date:   Tue Dec 10 11:27:47 2013 -0800
+
+    present: recursively set window pixmaps on flip
+    
+    Newly created windows inherit the pixmap of their parent, similarly,
+    reparenting a tree inherits the pixmap of the destination tree.
+    
+    Making present preserve the invariant that unredirected windows always
+    have the same pixmap as their parent ensures that the above cases work
+    correctly.
+    
+    v2: name the recursive function to 'set_tree_pixmap' instead of 'set_window_pixmap'
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit b3533d0b212b6747a8f9a01931253d6bdb648ee2
+Author: Keith Packard <[e-mail]>
+Date:   Tue Dec 10 10:29:11 2013 -0800
+
+    Bump version to 1.14.99.904 (1.15 RC4)
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 9a4d7572fe3be16bb5aded5f48d4217fdf725b1d
+Author: Jon TURNEY <[e-mail]>
+Date:   Thu Sep 27 18:59:45 2012 +0100
+
+    hw/xwin/glx: Rewrite WGL wrappers after Xserver conversion to direct GL dispatch
+    
+    v1: Rewrite by Marc Haesen of the WGL wrapper function generation script to use
+    Khronos group XML.
+    
+    v2: Remove -dispatchheader option, since dispatch.h doesn't exist anymore, use
+    the private glapi interface to construct the GL dispatch table for the native
+    WGL thunks.
+    
+    v3:
+    Rewrite to generate shims for the OpenGL 1.2.1 (GL 1.2 + GL_ARB_imaging
+    +GL_ARB_multitexture + GL_ARB_texture_compression(?)) functions the server links
+    directly with rather than libGL.
+    
+    These shims dispatch to either the mesa GL DLL, or a thunking DLL containing
+    cdecl-to-stcall wrapper functions for the native GL DLL.
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit cb48877a3c4cfb1ae2248000fcd3443e3092bdaa
+Author: Jon TURNEY <[e-mail]>
+Date:   Fri Dec 6 14:00:21 2013 +0000
+
+    glx: Consistently use ARB-suffixed names for ARB_multitexture functions
+    
+    At the moment we have a mix of ARB and non-ARB suffixed forms for ARB_multitexture functions
+    e.g. glMultiTexCoord1fvARB and glMultiTexCoord1dv
+    
+    Consistently use the ARB-suffixed form, assuming that is present in all libGL
+    which provide the OpenGL 1.2.1 ABI we expect to be able to directly link with.
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 1a021f57a1e75ab63e8f87704f0394162402c4d4
+Author: Jon TURNEY <[e-mail]>
+Date:   Sun Dec 1 22:25:46 2013 +0000
+
+    ephyr: Fix compilation when ./configure'd with --enable-debug
+    
+    /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessMouseMotion’:
+    /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:946:188: error: ‘ephyrCurScreen’ undeclared (first use in this function)
+    /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessButtonPress’:
+    /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:980:186: error: ‘ephyrCurScreen’ undeclared (first use in this function)
+    /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessButtonRelease’:
+    /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:1007:186: error: ‘ephyrCurScreen’ undeclared (first use in this function)
+    
+    Fix ephyr compilation when ./configure'd with --enable-debug after commit
+    46cf6bf5692ef751ec9d17ae2292565d4b13f14b, some instances of ephyrCurScreen were
+    not converted to screen->pScreen->myNum.
+    
+    v2: Don't use a trivial local variable which will be unused when ./configure'd
+    with --disable-debug
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 875dbcef5bfcb6a94ef8456be6151e133408793f
+Author: Jon TURNEY <[e-mail]>
+Date:   Fri Nov 29 14:29:20 2013 +0000
+
+    configure.ac: Link XWin with present extension if we are building with it enabled
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit e61e19959d9138d5b81b1f25b7aa3e257918170d
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 13:45:43 2013 -0500
+
+    xquartz/glx: Convert to non-glapi dispatch
+    
+    CGL doesn't have anything like glXGetProcAddress, and the old code just
+    called down to dlsym in any case.  It's a little mind-warping since
+    dlopening a framework actually loads multiple dylibs, but that's just
+    how OSX rolls.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit a668aa0e41bc33ff2db7f9c53b6dc321a96926a9
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 15:03:13 2013 -0500
+
+    drisw: Wire up GetProcAddress
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 4fcdfeb7bc55d00d50d7f89788d9b929946ae3d9
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 15:02:57 2013 -0500
+
+    dri2: wire up GetProcAddress
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 47f00b3920be9d8df8b148263d744934f3a02cd4
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 15:01:44 2013 -0500
+
+    glx: Untangle the prototypes around the GetProcAddress thunk
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+
+commit c1fd143f2847ef425ec9891d9e1cba44a1bb007d
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 13:11:52 2013 -0500
+
+    glx: Remove function stubs
+    
+    Now that we're calling non-1.2 ABI things by function pointer this is no
+    longer needed.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+
+commit 6b93e1f5ff39c6ac5b0d97d4245aeac9113eed8b
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 13:11:09 2013 -0500
+
+    glx: Convert non-generated function pointer thunking
+    
+    Same concept as the generated code conversion.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+
+commit c4567a376083eb7b142a7f003ddf8372d376ea86
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Dec 3 12:40:24 2013 -0500
+
+    glx: Convert generated code function pointer thunking
+    
+    We're meant not to call these by name due to ABI.  Rather than try to
+    generate a bunch of little stub functions that do the lookup, just
+    inline it all directly into the calling function.
+    
+    This does not cache results.  That's fine, this is not a performance
+    path, and if we're atop WGL then we effectively have to do this every
+    time anyway because wglGetProcAddress results are context-dependent.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Jon TURNEY <[e-mail]>
+
+commit f69f4f417c6807405e45289b39a80f1b9a55f9e6
+Author: Keith Packard <[e-mail]>
+Date:   Tue Dec 10 07:09:17 2013 -0800
+
+    Depend on latest glproto (1.4.17)
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 576f3d36dd324bd0d16c9968f1ded5c5eead3569
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Dec 9 13:16:01 2013 -0500
+
+    damageext: Die if we can't create the Xinerama resource type
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit f10f36d91db1b21c2ce5a531b4fa5f96fcbdc2f0
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Sep 16 15:17:26 2013 -0400
+
+    damageext: Xineramify (v7)
+    
+    v7: Don't bother making resources for the backing listeners. [keithp]
+    
+    This is now slightly unlike how other resources are xineramified.  We
+    create N+1 internal damage listeners, one that's a real resource and
+    reflects the protocol view, and then one per backend screen where the
+    report function piles onto the protocol view.  The internal listeners
+    are not stored in the resource database directly, they just hang off the
+    xinerama resource. We don't wrap Subtract at the dispatch level, but we
+    do extend it for the Xinerama case to clip to the root window geometry.
+    
+    As a result of the N+1 design here, the damage reports we generate are
+    not quite minimal.  However they are indistinguishable from sequential
+    rendering events happening before the client hears damage, and we don't
+    need to add a post-dispatch callback just for this one extension.
+    
+    Add is probably (still) somewhat broken since it will only hit screen 0,
+    but Add really only exists for DRI1's sake, and DRI1 disables itself
+    with Xinerama enabled anyway.  In the absence of a use case, I'm leaving
+    it unwrapped under Xinerama; if someone wants to define how it ought to
+    work, be my guest.
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 808303fe5232ba0320ae5a4310b1ed1322e85f1d
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Nov 4 17:49:34 2013 -0500
+
+    fixes: Fix PanoramiXSetWindowShapeRegion for root windows (v2)
+    
+    Root windows in Xinerama are in the coordinate space of their root window
+    pixmap, not in protocol space.
+    
+    v2: Only translate for root windows, sice the window shape is
+    drawable-relative.
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 5c10c7ea2129b70015e745523918d143cc29318d
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Nov 4 17:49:33 2013 -0500
+
+    fixes: Fix PanoramiXSetPictureClipRegion for root windows (v2)
+    
+    Root windows in Xinerama are in the coordinate space of their root
+    window pixmap, not in protocol space.  This fixes 'xcompmgr -n' when
+    Xinerama is active.
+    
+    v2: Only translate for root windows, since the clip origin is
+    drawable-relative.
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 1dd839a425adc6e5a1dc377003ed86a374d81f0b
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Nov 7 13:59:30 2013 -0500
+
+    composite: Fix COW creation for Xinerama (v2)
+    
+    Say you have two 800x600 screens left/right of each other.  A window
+    that's 200x200 at +700+0 in protocol coordinate space will appear to be
+    at -100+0 in the coordinate space of the right hand screen.  Put another
+    way: windows are in the coordinate space of their root window pixmap.
+    
+    We weren't doing this translation for the COW, so when rendering came in
+    to it you'd see the top-left chunk of the COW on all screens.  Cool
+    effect and all, but wrong.
+    
+    v2: Only translate when Xinerama is active [keithp]
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 8dbe456abae1a32fb6c5c74fa456bc7301cccabe
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 29 10:44:07 2013 -0400
+
+    xinerama: Export the screen region
+    
+    damageext wants this so it can intersect subtract requests against the
+    root window geometry.
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit c6d4c2a24140feee4ceae48c4c74fedcae9b68b3
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 15 15:13:31 2013 -0500
+
+    xfree86: Prefer fbdev to vesa
+    
+    On UEFI machines you'd prefer fbdev to grab efifb instead of vesa trying
+    to initialize and failing in a way we can't unwind from.  On BIOS
+    machines this is harmless: either there is an fbdev driver and it'll
+    probably be more capable, or there's not and vesa will kick in anyway.
+    
+    Reviewed-by: Alex Deucher <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 7b5d4f147fdef9edfeaa9c6565375111079efd11
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Nov 5 10:12:28 2013 -0500
+
+    composite: Don't double-redirect if someone asks for backing store twice
+    
+    v2: Belt-and-suspenders the unredirection path [vsyrjala]
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit a2b2c271e0ca87d3188ba2741b6db9bbbdc599f5
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Nov 5 10:08:17 2013 -0500
+
+    composite: Automatically enable backing store support on the screen
+    
+    ... unless you explicitly disabled it with -bs on the command line, or
+    with the corresponding thing in xorg.conf.
+    
+    v2: Drop a bogus hunk from compChangeWindowAttributes [vsyrjala]
+    v3: s/TRUE/WhenMapped/ [jcristau]
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e0cac005608a2e5618c7be59701318d684e0bb93
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Nov 5 09:58:17 2013 -0500
+
+    bs: Set the screen's bs support level to WhenMapped
+    
+    Since we're using RedirectAutomatic to do this, we don't actually
+    preserve contents when unmapped.
+    
+    v2: Don't say WhenMapped if Composite didn't initialize [vsyrjala]
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit b61ccd5d9d368f3fbbae27ce14ac02a3db1884c4
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Nov 5 10:20:04 2013 -0500
+
+    smartsched: Tweak the default scheduler intervals
+    
+    A default timeslice of 20ms means a pathological client can ruin up to
+    two frames per scheduler tick.  And a fifth of a second is just insane.
+    
+    Pick two different numbers out of the hat.  A 5ms slice means you can
+    probably keep up with two or three abusive clients, and letting it burst
+    to 15ms should give you about all the timeslice you need for a
+    fullscreen game (that's doing server-side rendering for some reason).
+    
+    If you're running on a system with a 10ms granularity on SIGALRM, then
+    this effectively changes the intervals to 10ms and 30ms.  Which is still
+    better, just not as better.
+    
+    I suspect this is about as good as we can do without actually going
+    preemptive, which is an entire other nightmare.
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 66310ea2893811614b3c3aade8992624a95a6ee7
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 8 09:22:37 2013 -0500
+
+    dri3: Disable when Xinerama is active
+    
+    Pretty sure this can't work.
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 793fd5eefb0e417614d77fe1522c6548587fbd4e
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 8 09:20:29 2013 -0500
+
+    dri2: Disable when Xinerama is active
+    
+    Would only work on ScreenRec 0, which means it's broken.
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 2bf92108294805c5c6fef249c2f7de6ecf4975d8
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 8 09:06:59 2013 -0500
+
+    present: Disable when Xinerama is active
+    
+    Among much else Present depends on RANDR types, and RANDR isn't properly
+    Xinerama-aware yet anyway.
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit ac772cb187ddf7e04b8f4b3a071b90f18f4488d0
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Nov 14 17:40:47 2013 -0800
+
+    glx: Fix incorrect use of dri_interface.h version defines in driver probing.
+    
+    If we extend __DRI_CORE or __DRI_SWRAST in dri_interface.h to allow a
+    new version, it shouldn't make old server code retroactively require
+    the new version from swrast drivers.
+    
+    Notably, new Mesa defines __DRI_SWRAST version 4, but we still want to
+    be able to probe version 1 drivers, since we don't use any features
+    beyond version 1 of the struct.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+
+commit 6e926b18ca1b182253bac435a1d53caaff7ffff6
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Nov 14 17:40:46 2013 -0800
+
+    glx: Fix incorrect use of dri_interface.h version defines in extensions.
+    
+    Those defines are so you can compile-time check "do I have a
+    dri_interface.h that defines this new field of the struct?"  You don't
+    want the server to claim it implements the new struct just because you
+    installed a new copy of Mesa.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+
+commit 57a8ce927332e855dd29ff30210a211a907adb25
+Author: Jon TURNEY <[e-mail]>
+Date:   Fri Nov 29 12:26:43 2013 +0000
+
+    configure.ac: Fixup for "Require libpciaccess for int10"
+    
+    On 16/11/2013 01:00, Connor Behan wrote:
+    > A --disable-pciaccess build will fail with an int10 module other than
+    > stub.
+    >
+    > Signed-off-by: Connor Behan <[e-mail]>
+    > ---
+    >  configure.ac | 3 +++
+    >  1 file changed, 3 insertions(+)
+    >
+    > diff --git a/configure.ac b/configure.ac
+    > index 5e621e0..a843770 100644
+    > --- a/configure.ac
+    > +++ b/configure.ac
+    > @@ -1822,6 +1822,9 @@ if test "x$XORG" = xyes; then
+    >  		if test "x$CONFIG_UDEV_KMS" = xyes; then
+    >  			AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
+    >  		fi
+    > +		if test "x$INT10" != xstub; then
+    > +			AC_MSG_ERROR([Cannot build int10 without libpciaccess])
+    > +		fi
+    >  	fi
+    >  	AC_MSG_RESULT([$PCI])
+    >
+    
+    This causes my build to fail where --disable-int10-module --disable-pciaccess
+    is the default (as INT10 still has the default value 'x86emu')
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Tested-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 653d33941b0808ef910aaa5f3aeab05d9c1a100b
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 26 12:18:12 2013 -0800
+
+    present: Report damage when flipping
+    
+    Limit damage to the 'update' region.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 5cf12c9569ac3d83fe1b7a8376c15f8f0b01655e
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 26 12:10:48 2013 -0800
+
+    present: Also set the root window pixmap when flipping
+    
+    This makes sure that things like software cursors continue to work
+    while the screen is flipped.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 4aa77378de69efdc10bced6ba650b0ebff50c112
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 26 12:06:57 2013 -0800
+
+    present: Clear target_crtc if driver lacks Present support
+    
+    If the driver doesn't have the necessary hooks for Present, then the
+    target_crtc needs to be set to NULL to make sure the extension uses
+    the present_fake code.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Tested-by: Fredrik Höglund <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 3dd5bfe540b295bb37a2c2fd0ba4a31fb217612b
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 21 22:48:31 2013 -0800
+
+    present: Send GLX_BufferSwapComplete events from present extension
+    
+    This allows GL to support the GLX_INTEL_swap_event extension.
+    
+    v2: Return GLX_BLIT_COMPLETE_INTEL for unknown swap types
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit cde86e68fcb716f34c90f5a16eb868870f5c85e4
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 25 23:06:08 2013 -0800
+
+    present: Set window pixmap to flipped pixmap
+    
+    This makes other drawing to the window appear on the screen.
+    
+    Note that no child windows can be affected because only full-screen
+    windows are eligible for flipping, and so we only need to set pixmap
+    for the window itself.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 04e138846e128670d409798aa2e797c3c5503a47
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 25 23:10:17 2013 -0800
+
+    present: Leave vblank on window list until flip complete
+    
+    If the window is destroyed, then we've got cleanup work to do, even if
+    the vblank has already been executed -- we need to clear the window
+    pointer so that we don't try to deliver events to it.
+    
+    Leaving it on the window list meant that when walking that list, we
+    need to know whether the vblank is waiting to be executed or waiting
+    for the flip to complete, so a new 'queued' flag was added to the
+    vblank to distinguish between the two states.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit b121d62accb8c346b4e1b1bce99586e13712f04a
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 26 03:07:55 2013 -0800
+
+    present: Add a debug output line when skipping a pending present
+    
+    When an application provides two pixmaps for the same MSC, the
+    previous one is skipped. This just dumps out some information at that point
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit eafba23b34be31c141ddafb8380520ac9a0622ac
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 21 22:45:18 2013 -0800
+
+    miext/sync: Handle libxshmfence API change
+    
+    libxshmfence had an unfortunate 'int32_t' type for the mapped fence.
+    That changed to exposing a 'struct shmfence' instead, which is nice
+    and opaque and offers fine type checking across the API.
+    
+    This patch requires the newer version of the library and uses
+    the new interface type.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit b6d7ed4d787a652e8150532f384bfdf51760f3c2
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 21 22:12:34 2013 -0800
+
+    miext: Move SyncShm FDs out of the way of clients
+    
+    Applications may end up allocating a bunch of shmfence objects, each
+    of which uses a file descriptor, which must be kept open lest some
+    other client ask for a copy of it later on.
+    
+    Lacking an API that can turn a memory mapping back into a file
+    descriptor, about the best we can do is push the file descriptors out
+    of the way of other X clients so that we don't run out of the ability
+    to accept new connections.
+    
+    This uses fcntl F_GETFD to push the FD up above MAXCLIENTS.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit cc63204926c6da83d9221c5f8c0dc8f5e2f2481d
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 13 14:16:33 2013 +0900
+
+    Xext: Use SHMDIR and O_TMPFILE when creating mapping files
+    
+    ShmCreateSegment asks for a file descriptor for a memory mapped file
+    created by the X server. This patch uses O_TMPFILE where available,
+    and also uses the SHMDIR directory to store the files, both for the
+    O_TMPFILE and mkstemp cases.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 5a969f0928b84da5cfe0777dfb542caaacc915ad
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 13 12:17:10 2013 +0900
+
+    Select directory for MIT-SHM temp files at configure time
+    
+    By default, this looks through a list of directories to find one which
+    exists, but can be overridden with --with-shared-memory-dir=PATH
+    
+    This patch doesn't actually do anything with this directory, just
+    makes it available in the configuration
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit d695cb7fb6bb8fd159a332d902673edbbd2237d7
+Author: Alan Coopersmith <[e-mail]>
+Date:   Mon Nov 25 22:19:34 2013 -0800
+
+    Xdmx: Initialize DMX extension even if not built with GLX support
+    
+    dmxAddExtensions takes an argument to determine if it should just
+    initialize the DMX extension, or both DMX & GLX, but if GLX wasn't
+    compiled in, the entire call was #ifdef'ed out, leaving the DMX
+    extension unavailable.
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit bd70def07754357d26b86c287037eb3884631daf
+Author: Connor Behan <[e-mail]>
+Date:   Fri Nov 15 17:00:40 2013 -0800
+
+    configure.ac: Require libpciaccess for int10
+    
+    A --disable-pciaccess build will fail with an int10 module other than
+    stub.
+    
+    Signed-off-by: Connor Behan <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit a575c1dc64c10bc88bd0e963ebb8ab137f59a078
+Author: Connor Behan <[e-mail]>
+Date:   Fri Nov 15 17:00:20 2013 -0800
+
+    configure.ac: Require libpciaccess for platform bus support
+    
+    There is currently no reason to build with --enable-config-udev-kms and
+    --disable-pciaccess but anyone who tries this should know that the build
+    will fail.
+    
+    Signed-off-by: Connor Behan <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 361dfe74eaa2f1eddb54abdecca1d8b1b3f58704
+Author: Connor Behan <[e-mail]>
+Date:   Fri Nov 15 17:00:00 2013 -0800
+
+    configure.ac: Add whitespace near PCI configuration
+    
+    Signed-off-by: Connor Behan <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 80481267662c8687e73081237913fa561e7a6561
+Author: Keith Packard <[e-mail]>
+Date:   Sat Nov 23 22:22:37 2013 -0800
+
+    Bump release to 1.14.99.903 (1.15 RC3)
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit f1604002a32b7f098c2a16b4a8649c694af570c8
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 18 22:36:17 2013 -0800
+
+    miext: Ensure xshmfence is only called when driver supports it
+    
+    This provides a place for drivers to insert their own FD-based
+    SyncFence implementations, and prevents applications from using DRI3
+    SyncFence creation functions unless the driver has some support for
+    them.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Tested-by: Fredrik Höglund <[e-mail]>
+
+commit 037566c57caff93fd7717f385d4b532b81f19c77
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 18 22:33:27 2013 -0800
+
+    Xext: Recover from miSyncInitFenceFromFD failure without crashing
+    
+    miSyncDestroyFence must not be called unless miSyncInitFence has been
+    invoked, so if miSyncInitFenceFromFD fails, we must free the fence
+    manually.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Tested-by: Fredrik Höglund <[e-mail]>
+
+commit e7000534a456fdf9cd4eaada3193846c8525f740
+Author: Chris Wilson <[e-mail]>
+Date:   Sat Oct 5 08:47:03 2013 +0100
+
+    glx/glxdri2: Unwrap EnterVT/LeaveVT upon CloseScreen
+    
+    In a similar spirit to
+    
+    commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
+    Author: Keith Packard <[e-mail]>
+    Date:   Mon Jul 12 16:01:34 2010 -0700
+    
+        Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
+    
+    we need to unwrap our pScrn->EnterVT/LeaveVT hooks around server
+    regeneration or else we cause an infinite recursion on the next VT
+    switch afterwards.
+    
+    Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1235516
+    Signed-off-by: Chris Wilson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 6d5883bd7e5b765f8f0548501b825d9e56840799
+Author: Keith Packard <[e-mail]>
+Date:   Sat Nov 23 16:19:46 2013 -0800
+
+    xnest: Ignore GetImage() error in xnestGetImage() (v3)
+    
+    (I found an amended version of this patch and applied the difference
+    here - keithp)
+    
+    v3: Don't call Xsync before restoring error handler as any errors
+        generated by XGetImage() should be processed when this call
+        returns as suggested by Jamey Sharp <[e-mail]>
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Reviewed-by: Jamey Sharp <[e-mail]>
+
+commit 6403cbb143c67872ca9c58e3116ae7942def0ae1
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 19 22:13:54 2013 -0800
+
+    present: When unflipping, copy to flip window rather than screen
+    
+    unflip happens after the clip lists have been updated, so instead of
+    smashing the whole screen and drawing over other windows, just draw to
+    the original flip window; it'll have the right clip list and so the
+    copy will work just fine.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 8bdd2ccc776ded3f527596b5009ef25129aa3287
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 11 18:03:42 2013 -0800
+
+    present: Block for wait_fence in present_execute
+    
+    Pend presentation until wait_fence is also triggered by having the
+    SyncFence trigger invoke present_execute once triggered.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit e5a188cb919edee2e3a03054276bce0db02f7b62
+Author: Keith Packard <[e-mail]>
+Date:   Sat Nov 9 12:36:47 2013 -0800
+
+    present: Signal destroyed flip window with vblank->window == NULL
+    
+    This eliminates dereferencing freed window pointers when there is a
+    flip for that window in progress. The flip will complete, and then
+    immediately get undone (as we can't stop an in-progress flip).
+    
+    Remove the vblank->window_destroyed field as we can signal this with
+    vblank->window == NULL instead.
+    
+    Change check to vblank->window == NULL in:
+    
+    	present_flip_notify
+    
+    Add check for vblank->window == NULL in:
+    	present_vblank_notify
+    	present_execute
+    
+    present_flip_notify was also using vblank->window->drawable.pScreen,
+    so stop doing that and use vblank->screen instead.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit a5bcc4f7b9499caf8993f0a6ef96088553399ca3
+Author: Keith Packard <[e-mail]>
+Date:   Sat Nov 9 12:33:02 2013 -0800
+
+    present: Ignore event_id 0 from driver vblank notify
+    
+    We use event_id 0 to mean 'no such event'; if a driver sends us that
+    event_id, make sure we don't accidentally match it.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 4f3c37a1f17ffcfbbff71d217e1caad3d0148c90
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 7 14:17:12 2013 -0800
+
+    present: Round fake MSC computations intead of truncating
+    
+    If the timer fired too early, we'd sometimes mis-compute the MSC for
+    fake vblanks. Rounding the computation to the nearest MSC fixes this nicely.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit da9997f89f14ab619f244d5b2e80a423b028c789
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Nov 19 08:07:09 2013 +1000
+
+    configure: allow for --enable-libunwind and --disable-libunwind
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a
+Merge: 0492deb 8ff7e32
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 14 17:02:04 2013 +0900
+
+    Merge remote-tracking branch 'whot/for-keith'
+
+commit 0492deb8f8238b7782e5a706ec6219d88aa1091d
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 29 12:09:27 2013 -0400
+
+    mieq: Bump default queue size to 512
+    
+    Based on some bugzilla scraping I did around November 2012.  Of xserver
+    bugs in Red Hat bugzilla with an EQ size message in the log, the
+    distribution looked like:
+    
+    String                      | Matches
+    -------------------------------------
+    Increasing EQ size to 512   | 460
+    Increasing EQ size to 1024  | 52
+    Increasing EQ size to 2048  | 6
+    Increasing EQ size to 4096  | 0
+    
+    Most of the "512" ones appear to be mostly harmless, some relatively
+    expensive path in either rendering or resource destruction simply taking
+    too long due to external pressures like paging or CPU contention.  So
+    let's raise the initial queue size, both to reduce the number of
+    spurious abrt reports and to drop fewer events in all but the most
+    pathological cases.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit d1440783a7367ff0d0c47d256bbca3b3cf8a5034
+Author: Dave Airlie <[e-mail]>
+Date:   Tue Oct 29 12:09:26 2013 -0400
+
+    xfree86: return NULL for compat output if no outputs.
+    
+    With outputless GPUs showing up we crash here if there are not outputs
+    try and recover with a bit of grace.
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Dave Airlie <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit d7ee27e5e415778240919082c83a65226c6f17e6
+Author: Dan Horák <[e-mail]>
+Date:   Tue Oct 29 12:09:25 2013 -0400
+
+    test: build the touch test only when building Xorg
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Dan Horák <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 8ff7e32c3ef7b0c13c4ab9664f651e9782d35a85
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Nov 13 17:14:11 2013 +1000
+
+    include: export key_is_down and friends
+    
+    VNC needs key_is_down to check if a key is processed as down before it
+    simulates various key releases. Make it available, because I seriously can't
+    be bothered thinking about how to rewrite VNC to not need that.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Acked-by: Keith Packard <[e-mail]>
+
+commit 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab
+Author: Alan Coopersmith <[e-mail]>
+Date:   Tue Nov 12 14:46:04 2013 -0800
+
+    Stop including inline assembly .il file for Solaris Studio builds
+    
+    Since all the inb/outb/etc. use in the X server itself (except for
+    xf86SlowBcopy) has been replaced by calls to libpciaccess, we no
+    longer need to pass inline assembly files to replace the gcc inline
+    assembly from hw/xfree86/common/compiler.h when building Xorg itself.
+    
+    The .il files are still generated and installed in the SDK for the
+    benefit of drivers who may use them.
+    
+    Binary diff of before and after showed that xf86SlowBcopy was the
+    only function changed across the Xorg binary and all modules built
+    in the Xserver build, it just calls the outb() function now instead
+    of having the outb instructions inlined, making it a slightly slower
+    bcopy.
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 550baf38f6096658f0bcf0ad647c4fedf93132f2
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Oct 4 10:55:52 2013 +1000
+
+    kdrive: fix cursor jumps on CursorOffScreen behavior
+    
+    This patch fixes cursor jumps when there is a grab on the Xephyr window and
+    the pointer moves outside the window.
+    
+    So on two side-by-side 640x480 screens, a coordinate of 0/481
+    triggers KdCursorOffscreen.
+    
+    If the delta between two screens is 0, they share the same offset for
+    that dimension. When searching for the new screen, the loop always rules out
+    the current screen. So we get to the second screen, trigger the conditions
+    where dy <= 0 and decide that this new screen is the correct one. The result
+    is that whenever KdCursorOffScreen is called, the pointer jumps to the other
+    screen.
+    
+    Change to check for dy < 0 etc. so that the cursor stays on the same screen if
+    there is no other screen at the target location.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit a94d945065177d73f3ee8dc0b9147264ba281136
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Oct 29 14:24:41 2013 +1000
+
+    kdrive: modify ephyr events to use POINTER_DESKTOP and scale them to that
+    
+    A multi-head Xephyr instance has the pointer stuck on one screen
+    because of bad coordinate calculation. The coordinates passed to
+    GetPointerEvents are per-screen, so the cursor gets stuck on the left-most
+    screen by default.
+    
+    Adjust and mark the events as POINTER_DESKTOP, so the DIX
+    can adjust them accordingly.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit d66832a3b8a8675f1e5f3656dcb1bbe95598f0ea
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 14 13:21:54 2013 +1000
+
+    kdrive: handle WxH as valid geometry spec
+    
+    If a screen size was specified as WxH, the loop returned early and kdOrigin
+    was never advanced. Thus, screen->origin was always 0 (or whatever was given
+    at the -origin commandline flag).
+    
+    If a screen size was given with a bit depth (WxHxD), kdOrigin would always
+    advance by the current screen, offsetting the next screen.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit c8c5105c1d5c093675d7f571f158147f22f7572b
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Oct 29 14:33:56 2013 +1000
+
+    ephyr: xcb_connect returns an error, not NULL
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 2aa67ccef6ad8f51deb94b66defc668ddb7d226c
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 14 10:26:20 2013 +0900
+
+    Update to version 1.14.99.902
+    
+    1.15 RC2
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 9309d2a009a6a3b6090fc377fc7a3eded1a34dc0
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 13 07:01:45 2013 +0900
+
+    xext: Fix shmint.h to not use headers outside of sdk_HEADERS
+    
+    shmint.h is part of sdk_HEADERS, and so can't use anything not
+    included in sdk_HEADERS.
+    
+    busfault.h includes dix-config.h which is not. Leave the use of
+    struct busfault in shmint.h and move the include of busfault.h to
+    shm.c.
+    
+    protocol-versions.h is not part of sdk_HEADERS, so instead of using
+    that, just use XTRANS_SEND_FDS to choose whether to expose the fd
+    passing requests directly.
+    
+    Reported-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+    Tested-by: Knut Petersen <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+    
+    v2: also avoid using protocol-versions.h
+
+commit 4a251f5883b042cd902c192060a0be2b11148f2b
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Fri Nov 8 14:55:33 2013 -0800
+
+    xfree86: Fix build without libpciaccess
+    
+    Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Reviewed-by: Connor Behan <[e-mail]>
+
+commit 5b02d5b7aaabf1ba8dcbdfe4525b7995b4e79f92
+Author: Alan Coopersmith <[e-mail]>
+Date:   Thu Nov 7 21:08:56 2013 -0800
+
+    Enable XTRANS_SEND_FDS on Solaris too.
+    
+    Requires passing through the __EXTENSIONS__ and _XOPEN_SOURCE defines
+    in order to expose the msg_control members in struct msghdr.
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit c4c154d18ef42dc550f2675a9ee88e07b1ca6bed
+Author: Alan Coopersmith <[e-mail]>
+Date:   Thu Nov 7 21:05:33 2013 -0800
+
+    Avoid conflicts with Solaris <sys/regset.h> defines that clash with our names
+    
+    When building on Solaris with _XOPEN_SOURCE set to a recent XPG release,
+    <stdlib.h> and other core headers start including <sys/regset.h>, which
+    has a bunch of unfortunately named macros such as "CS", "ES", etc. for
+    x86 & x64 registers which clash with existing variable & struct member
+    names in Xorg - so #undef these so they don't interfere with our use.
+    
+    (Yes, have filed a bug against the system headers for exposing these,
+     but this solves the problem for building on existing releases.)
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit d7f9be0f8541368bf1a095ad1fbe7f38be6d3d15
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 11 15:48:41 2013 -0800
+
+    Proper spelling of MAP_ANONYMOUS is MAP_ANON.
+    
+    The former doesn't exist on BSD and the latter is available everywhere
+    AFAIK (checked Solaris and Linux).
+    
+    You also might want to wrap that line ;).
+    
+    Reported-by: Mark Kettenis <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit fc84166e65c35ad75f566b135dcfc305ad5a2fde
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 7 15:18:28 2013 -0800
+
+    Get rid of the rest of the FD passing code when XTRANS_SEND_FDS isn't set
+    
+    req_fds and SetReqFds in include/dixstruct.h
+    
+    ReadFdFromClient, WriteFdToClient and the FD flushing in os/io.c
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit a239e6faf3fce848ac0d10c48f8e817db68a493c
+Merge: 43e5a43 f70a8bf
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 11 15:26:12 2013 -0800
+
+    Merge remote-tracking branch 'jeremyhu/master'
+
+commit 43e5a43fa8994e50cf01dd954118f4ef2c4e7933
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Nov 7 12:01:41 2013 -0500
+
+    present: Don't try to initialize when building without present support
+    
+    There's a --disable-present, so it'd be nice if it worked.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+    Reviewed-by: Mark Kettenis <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 0822a23e048b12c98c654e8b6af711c5f2c97141
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 7 03:19:42 2013 -0800
+
+    present: Change debug output a bit to help diagnose missing vblank signals
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 20bb49ae9ba11d3dccfba191483cd682d9c9d96c
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 6 23:56:26 2013 -0800
+
+    Present: Check for window/fence destroyed when idling pixmaps
+    
+    A client destroying objects in the middle of an unflip can end up
+    having the screen flip window or fence set to NULL in the unflip
+    notify path. Check for these and don't try to use those objects.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a
+Author: Keith Packard <[e-mail]>
+Date:   Sun Nov 3 13:12:40 2013 -0800
+
+    Trap SIGBUS to handle truncated shared memory segments
+    
+    If a client passes a section of memory via file descriptor and then
+    subsequently truncates that file, the underlying pages will be freed
+    and the addresses invalidated. Subsequent accesses to the page will
+    fail with a SIGBUS error.
+    
+    Trap that SIGBUS, figure out which segment was causing the error and
+    then allocate new pages to fill in for that region. Mark the offending
+    shared segment as invalid and free the resource ID so that the client
+    will be able to tell when subsequently attempting to use the segment.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    
+    v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis)
+    v3: Also catch errors in ShmCreateSegment
+    
+    Conflicts:
+    	include/dix-config.h.in
+    	include/xorg-config.h.in
+
+commit 719e880d7698d92f9b854b217ef9680aaa446f2e
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 6 23:22:51 2013 -0800
+
+    Require libXtrans version 1.3.2
+    
+    This has the FD passing support included
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit bee2ec54049377e0033d49abff20d7bd069c62aa
+Author: Keith Packard <[e-mail]>
+Date:   Sun Nov 3 10:08:15 2013 -0800
+
+    Xext: Enable MIT-SHM FD-passing request definitions only when possible
+    
+    Check to see if xtrans FD passing is available and use that to
+    advertise the appropriate version of the SHM extension
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Alan Coopersmith <[e-mail]>
+
+commit ea8acfe3e2f74a46c3f1e91809b4b99af18502b7
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 6 23:06:28 2013 -0800
+
+    Require xextproto version 7.2.99.901
+    
+    This includes the MIT-SHM FD passing requests
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Alan Coopersmith <[e-mail]>
+
+commit 914672fefacc15386041e7c2bc3beed4faf45e9d
+Author: Keith Packard <[e-mail]>
+Date:   Thu Nov 7 14:20:26 2013 -0800
+
+    Remove dix-config.h config variables from xorg-config.h
+    
+    xorg-config.h includes dix-config, so there's no need to duplicate.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 7aad79c5a582ece301d950bd65f0bcb4b9956e86
+Author: Keith Packard <[e-mail]>
+Date:   Wed Nov 6 23:05:46 2013 -0800
+
+    Make XTrans FD passing support optional. Define only on Linux
+    
+    Until other operating systems have a libXtrans port for FD passing,
+    disable this on non-Linux systems.
+    
+    Note that this define affects how libXtrans gets built into the X
+    server, which is why it need only define the symbol
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit f70a8bf3714d89bccaad36841ef9149e91ad3bba
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Nov 10 11:40:27 2013 -0800
+
+    XQuartz: Don't sleep forever on exit if usleep() returns an error
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit ebcc1c214c466582d7b92826b4860256fd9c582a
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Nov 10 11:26:49 2013 -0800
+
+    XQuartz: Update Info.plist copyright years
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit 81c123ea2dd833864f7ba217791e59acca0f7c97
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Mon Nov 4 12:13:45 2013 -0800
+
+    configure.ac: Move GLX section after DRI
+    
+    The GLX section of configura.ac checks the state of DRI2, so it
+    needs to be after DRI2=auto is resolved.
+    
+    Also reset libgl requirement to 7.1.0 in non-dri2 case.
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
+Author: Andreas Schwab <[e-mail]>
+Date:   Thu Aug 15 12:03:42 2013 +0200
+
+    ARM64: Add support for aarch64
+    
+    Signed-off-by: Andreas Schwab <[e-mail]>
+    Reviewed-by: Mark Kettenis <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 8fcf82cbf015609e00b3feb9bc567133c7aee5cf
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 5 18:39:11 2013 -0800
+
+    Use $GL_LIBS instead of -lGL for linking
+    
+    -lGL presumes that the GL library is in the system path, while
+     $GL_LIBS is auto-detected.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit f348935e7d2c84a438aba08eee2f2c4e0dc77d20
+Author: Keith Packard <[e-mail]>
+Date:   Tue Nov 5 18:37:12 2013 -0800
+
+    Link with xshmfence, reference miSyncShmScreenInit in sdksyms
+    
+    This gets the server to link with xshmfence again, and also ensures
+    that the miSyncShm code is linked into the server with the reference
+    from sdksyms.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 5f1e832694e57986c0185048a941b3af51b2f85f
+Author: Julien Cristau <[e-mail]>
+Date:   Tue Nov 5 07:08:21 2013 -0800
+
+    os: Actually use the computed clockid in GetTimeInMicros
+    
+    The selection of which clock to use for this function was not actually
+    getting used when fetching the final clock value.
+    
+    Reported-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 903a058370645ea075ea98d380fd565efb6160c9
+Author: Keith Packard <[e-mail]>
+Date:   Mon Nov 4 19:01:26 2013 -0800
+
+    hw/xfree86: Link libdri3 only when DRI3 is defined
+    
+    Don't attempt to link non-existant libraries...
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit aaf0e29619196a283fee7ead2020a91032d84f48
+Author: Keith Packard <[e-mail]>
+Date:   Sun Nov 3 09:56:02 2013 -0800
+
+    Disable DRI3 and sync fence FD functions if xshmfence isn't available
+    
+    Make sure the server can build when the xshmfence library isn't present
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
+Author: Keith Packard <[e-mail]>
+Date:   Fri Nov 1 01:01:58 2013 -0700
+
+    Set version to 1.14.99.901 (1.15 RC1)
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 9db1d66f6d2c6857de220d8f1c08965962fe1416
+Author: Keith Packard <[e-mail]>
+Date:   Fri Nov 1 01:43:59 2013 -0700
+
+    Add dri3 and present directorys to distribution
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3
+Merge: 66c5ee0 f36f5a6
+Author: Keith Packard <[e-mail]>
+Date:   Fri Nov 1 00:34:18 2013 -0700
+
+    Merge remote-tracking branch 'whot/for-keith'
+
+commit 66c5ee0ff4690e630a69656331fd9d545c99c26c
+Author: Egbert Eich <[e-mail]>
+Date:   Wed Aug 14 18:18:56 2013 +0200
+
+    config/APM: Add option to disable building of APM support on Linux
+    
+        APM support in the Xserver was used to restore the console mode
+        prior to a power management event. This was to ensure the mode
+        upon suspend/resume was one that the system firmware or kernel
+        could deal with.
+        APM support is now largely obsolete, KMS drivers don't require a
+        mode restoration anyhow. Therefore it should be possible to disable
+        this feature.
+    
+    (small modification by keithp - move test for XF86PM flag after check
+    for APM, then move XF86PM flag to xorg-config.h.in)
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Tested-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit f36f5a65f639b6524191d888d5bf89e73027156c
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 30 15:40:58 2013 +1000
+
+    sync: fix corner-case in triggering idle alarms
+    
+    ProcessInputEvent() resets the device idle times. If idle time was higher than
+    the lower bracket, this should trigger an event in the idle time wakeup
+    handler.
+    
+    If processing is slow, the idle time may advance past the lower bracket
+    between the reset and the time the BlockHandler is called. In that case, we'd
+    never schedule a wakeup to handle the event, causing us to randomly miss
+    events.
+    
+    Ran tests with a neg transition trigger on 5ms with 200 repeats of the test
+    and it succeeded. Anything below that gets a bit tricky to make sure the
+    server sees the same idle time as the client usleeps for.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit f994d99539192a10a8c83047e11991f52e0ca677
+Author: Egbert Eich <[e-mail]>
+Date:   Wed Aug 14 18:18:39 2013 +0200
+
+    config/ACPI: Add option to disable building of ACPI support on Linux
+    
+    ACPI support in the Xserver was used to restore the console mode
+    prior to a power management event. This was to ensure the mode
+    upon suspend/resume was one that the system firmware or kernel
+    could deal with.
+    The feature depended on acpid to be running. Most of this functionality
+    is now take over by systemd, KMS drivers don't require a mode restoration
+    anyhow. Therefore it should be possible to disable this feature under
+    some circumstances.
+    
+    Tested-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 2aa5092b88174cb9988076ae96298217c97ad75f
+Author: Egbert Eich <[e-mail]>
+Date:   Mon Aug 12 18:21:33 2013 +0200
+
+    DDX/Randr: Avoid server crash when xrandr SetConfig is called while switched away
+    
+    A call to Xrandr SetScreenConfig (for randr 1.1) causes the Xserver to
+    crash when xf86SetViewport() which does not check if the hardware is
+    accessible.
+    Wrap accesses to xf86SetViewport() with if (vtSema) { ... } to avoid that.
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 508e05777aba823c93a2417cc26d18c9f061ca26
+Author: Egbert Eich <[e-mail]>
+Date:   Mon Aug 12 18:20:36 2013 +0200
+
+    DDX/Events: Distinguish between Input- and GeneralHandlers in xf86VTSwitch()
+    
+    When enabling/disabling input handlers in xf86VTSwitch() we treat Input-
+    and GeneralHandlers equally. The result is that after a VT switch the
+    masks for EnabledDevices and AllSockets are equal and the distiction
+    between both types is lost.
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Reviewed-by: Daniel Stone <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 0cb33ce34081d7d123ec565582d7d19bdb3964ad
+Author: Egbert Eich <[e-mail]>
+Date:   Sat Oct 5 08:02:28 2013 +0200
+
+    DDX/modes: Add a sanity check when using screen sizes from EDID
+    
+    EDID sometimes lies about screen sizes. Since the screen size is used
+    by clients to determine the DPI a wrong ration will lead to terrible
+    looking fonts.
+    Add a sanity check for the h/v ratio cutting off at 2.4. This would
+    still accept the cinemascope aspect ratio as valid.
+    Also add message suggesting to add a quirk table entry.
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a
+Author: Egbert Eich <[e-mail]>
+Date:   Wed Aug 14 11:50:26 2013 +0200
+
+    DDX/DPMS: Call dixSaveScreens() also when screen is turned on
+    
+    DMPS calls dixSaveScreens() when turned off but not when turned
+    on. In most cases this is irrelevant as DPMS is done when a
+    key is hit in which case dixSaveScreens() will be called to
+    unblank anyhow. This isn't the case if we use xset (or the
+    DPMS extension directly) to unblank.
+    Check screenIsSaved to make sure the state needs to be changed
+    before calling dixSaveScreens().
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 623c4147650d0404cfbea0f9b7df66dc7d928e00
+Author: Søren Sandmann Pedersen <[e-mail]>
+Date:   Mon Oct 21 17:11:56 2013 -0400
+
+    ephyr: Ensure stride of private framebuffer is multiple of 4
+    
+    The fb layer of X can't deal with strides that are not a multiple of
+    4, so when Xephyr allocates its own framebuffer it should make sure to
+    align it.
+    
+    This fixes crashes and rendering corruption when Xephyr runs in a
+    depth that is different from the host X server and its screen size is
+    not a multiple of 4 / depth. (This is particularly easy to trigger if
+    you use the -resizeable option).
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Soren Sandmann <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 97cf53cc2ad7ecfdd495133bad31d0ec7d939326
+Author: Søren Sandmann Pedersen <[e-mail]>
+Date:   Mon Oct 21 16:58:54 2013 -0400
+
+    ephyr: hostx_screen_init(): Fix bits_per_pixel and bytes_per_line
+    
+    When the depth of the Xephyr server matches that of the host X server,
+    Xephyr simply uses the buffer associated with the XImage as its
+    framebuffer. In this case, it is correct to get the bits_per_pixel and
+    bytes_per_line values returned from hostx_screen_init() from the XImage.
+    
+    However, when the depth doesn't match the host, Xephyr uses a private
+    framebuffer that is periodically copied to the XImage. In this case,
+    the returned values of bits_per_pixel and bytes_per_line should be
+    those of the private framebuffer, not those of the XImage.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Soren Sandmann <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 55246b67b755d4c1039d54971fe3f77ea60d604e
+Author: Søren Sandmann Pedersen <[e-mail]>
+Date:   Tue Oct 8 17:45:40 2013 -0400
+
+    xf86AddBusDeviceToConfigure(): Store device in DevToConfig[i].pVideo
+    
+    After fc3ab84d the pVideo field in DevToConfig[i] is no longer
+    initialized, so it's always NULL. This causes the duplicate finding
+    algorithm in the beginning of the function to not work anymore as it
+    is based on this field.
+    
+    The symptom of this bug is that X -configure reports
+    
+        Number of created screens does not match number of detected devices.
+          Configuration failed.
+        Server terminated with error (2). Closing log file.
+    
+    rather than producing a working config file.
+    
+    This patch fixes that bug by initializing the field before calling
+    xf86PciConfigureNewDev().
+    
+    Cc: [e-mail]
+    Signed-off-by: Soren Sandmann <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 95bf478b78e466002c382bcde7d4d62591e9215d
+Merge: abf5d5a bb745f2
+Author: Keith Packard <[e-mail]>
+Date:   Thu Oct 31 18:18:19 2013 -0700
+
+    Merge remote-tracking branch 'jeremyhu/master'
+
+commit abf5d5ac12437ebe156b4dd500c2acd69eea3654
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Thu Oct 31 08:57:56 2013 -0700
+
+    miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)"
+    
+    Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
+    
+    http://lists.x.org/archives/xorg-devel/2013-May/036241.html
+    https://trac.macports.org/ticket/38993
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit e4636072949a76477fe7c9d54662a0b3536b1372
+Merge: 17ed7ac 5c5c1b7
+Author: Keith Packard <[e-mail]>
+Date:   Thu Oct 31 17:05:48 2013 -0700
+
+    Merge remote-tracking branch 'keithp/dri3'
+
+commit 17ed7ac1fe7426d66f688087c09da5ff1dbb41d3
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 31 18:39:22 2013 -0400
+
+    glx: Lie about GLX_Y_INVERTED_EXT
+    
+    Well, that was lame.  The problem with reporting y inversion honestly is
+    that libGL asks the driver _its_ opinion of Y inversion, which it just
+    fabricates from whole cloth.  So then when libGL goes to compare the
+    driver's idea of fbconfigs with that of the server - a fairly dumb idea
+    to begin with - nothing matches, and direct rendering fails, and
+    sadness.
+    
+    So until the DRI drivers are fixed we should just continue to lie about
+    Y inversion.  GLX_DONT_CARE is what libGL would make up for that
+    attribute if we hadn't sent it, so just send that instead.
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Tested-by: Keith Packard <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 5c5c1b77982a9af7279a90bc3c2be48adaa9c778
+Author: Keith Packard <[e-mail]>
+Date:   Thu Jul 11 16:11:57 2013 -0700
+
+    present: Add Present extension
+    
+    Provides both a software implementation using timers and driver hooks
+    to base everything on vblank intervals.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 563138298868f62501875d3016f03469dcffaad0
+Author: Keith Packard <[e-mail]>
+Date:   Tue Apr 9 19:59:39 2013 -0700
+
+    dri3: Add DRI3 extension
+    
+    Adds DRM compatible fences using futexes.
+    Uses FD passing to get pixmaps from DRM applications.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit fdec793cdc2ef9a6ea66b311cb1068a7bd4a3be3
+Author: Keith Packard <[e-mail]>
+Date:   Thu Jan 17 13:46:55 2013 -0800
+
+    Add support for MIT-SHM AttachFd request
+    
+    This passes a file descriptor from the client to the server, which is
+    then mmap'd
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 9fd35daa3160fd36f00ed354bfcbefefa1353cce
+Author: Keith Packard <[e-mail]>
+Date:   Thu Jan 17 13:43:02 2013 -0800
+
+    Add interfaces to get FDs from clients over the socket
+    
+    This adds two interfaces:
+    
+        void SetReqFds(ClientPtr client, int req_fds)
+    
+    	Marks the number of file descriptors expected for this
+    	request. Call this before any request processing so that
+    	any un-retrieved file descriptors will be closed
+    	automatically.
+    
+        int ReadFdFromClient(ClientPtr client)
+    
+    	Reads the next queued file descriptor from the connection. If
+    	this request is not expecting any more file descriptors, or
+    	if there are no more file descriptors available from the
+    	connection, then this will return -1.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 264fc3abe5f18341d0cf9ddb6766e10e4154e447
+Author: Keith Packard <[e-mail]>
+Date:   Thu Oct 31 13:01:46 2013 -0700
+
+    misync: Don't smash custom screen sync functions
+    
+    There was a check to avoid smashing custom functions, but the sense
+    was backwards causing it to always smash them, and also not set them otherwise.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 2d96948ab5c952b68875ac63844cf7d778d4bf63
+Author: Keith Packard <[e-mail]>
+Date:   Thu Jul 11 16:10:34 2013 -0700
+
+    os: Add GetTimeInMicros
+    
+    64-bit higher resolution current time value.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 0c33f47281c36726848daf513fb0483cdea57bff
+Author: Keith Packard <[e-mail]>
+Date:   Thu Jul 11 16:09:34 2013 -0700
+
+    Add swapll to byte swap 64-bit datatypes
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 26f013ba45b08a02bb028a461af68288a86fadb1
+Author: Keith Packard <[e-mail]>
+Date:   Thu Jul 11 16:08:41 2013 -0700
+
+    Add a RegionDuplicate function
+    
+    This allocates a new region structure and copies a source region into
+    it in a single API rather than forcing the caller to do both steps themselves.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit d25c217964eb1fe54c3a54bca4cac7f47b4b9fdf
+Author: Keith Packard <[e-mail]>
+Date:   Mon Jan 14 14:24:36 2013 -0800
+
+    Clean up a couple of warnings in os/
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 7710f2b927ec8e3c631f72d66d494b523377b48e
+Author: Keith Packard <[e-mail]>
+Date:   Fri Jan 18 21:43:40 2013 -0800
+
+    Xext: Move MIT-SHM 'ShmDesc' to shmint.h
+    
+    This data structure is required to use shared memory objects in any
+    extension. That includes the Xv extension, which (before this patch)
+    duplicated the definition of this structure in its own code.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit e8961b718d82f1c081ec110d8d962f64e8406b82
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Oct 22 14:24:52 2013 +1000
+
+    os: use a constant for backtrace array size
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+
+commit f12a9ed870017f35cf6d2a82b1405e843aae42ac
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Oct 29 15:24:11 2013 +1000
+
+    configure: remove a comment
+    
+    94ed0ba1b5043ad9fc33b42756af447d5ab15bbd moved backtracing into the DIX, so
+    this comment is outdated. since no-one noticed and it's easier to just grep
+    than update file references, remove the comment.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+
+commit bb745f2b45768d0936f3960951e1a5cee8b03194
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Thu Oct 31 08:50:57 2013 -0700
+
+    XQuartz: Bump bundle version to 2.7.6
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit 2eedf42c229e2251035d716a96b654222155cd51
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 31 09:23:52 2013 -0400
+
+    dri: Fix GLX_Y_INVERTED_EXT fbconfig attribute
+    
+    We're Y-inverted from GL's coordinates, so this is correct.  gnome-shell
+    doesn't seem to check this - somewhat reasonable since the only server
+    that answered the other way around was Xglx - but kwin does, and
+    upside-down hilarity ensues.
+    
+    Tested-by: maelcum on #xorg-devel
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 29 12:58:14 2013 -0400
+
+    xfree86: Bump video/input/extension ABIs for 1.15
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 899451ae595f5f51a500295c624bf7ad14aca602
+Author: Keith Packard <[e-mail]>
+Date:   Wed Oct 30 08:54:24 2013 -0700
+
+    kdrive/ephyr: Don't discard one-time driver structure at server reset
+    
+    KdScreenInfo is constructed at server startup time, and not
+    re-generated at server reset time. Freeing the 'driver' element at
+    reset time means this information is lost, and the server crashes
+    pretty quickly afterwards.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 85ae44f07fa21b4a48d95d736dc8135bd4f751d0
+Author: Michal Srb <[e-mail]>
+Date:   Wed Oct 30 13:33:51 2013 +0200
+
+    randr: deliver Output and Crtc events of attached output providers.
+    
+    Consider all attached output providers when looking for changed outputs and
+    crtcs.
+    
+    Reviewed-by: Dave Airlie <[e-mail]>
+    Signed-off-by: Michal Srb <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit a9ca93dcf9a711b3d60fbad31cbd44e0c82b6f42
+Author: Michal Srb <[e-mail]>
+Date:   Wed Oct 30 13:33:50 2013 +0200
+
+    randr: send RRResourceChangeNotify event
+    
+    Send RRResourceChangeNotify event when provider, output or crtc was created or
+    destroyed. I.e. when the list of resources returned by RRGetScreenResources and
+    RRGetProviders changes.
+    
+    Reviewed-by: Dave Airlie <[e-mail]>
+    Signed-off-by: Michal Srb <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 4b39ea8a918fe6117bf34dc1cba67a4e56d0d1fb
+Author: Michal Srb <[e-mail]>
+Date:   Wed Oct 30 13:33:49 2013 +0200
+
+    randr: send RRProviderChangeNotify event
+    
+    Send RRProviderChangeNotify event when a provider becomes output source or
+    offload sink.
+    
+    Reviewed-by: Dave Airlie <[e-mail]>
+    Signed-off-by: Michal Srb <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f
+Merge: 04ab07c 9f4afe7
+Author: Keith Packard <[e-mail]>
+Date:   Tue Oct 29 21:00:13 2013 -0700
+
+    Merge remote-tracking branch 'whot/for-keith'
+
+commit 9f4afe7e835cf9c513387ae01eaf8b7a6ba4aac9
+Author: Gaetan Nadon <[e-mail]>
+Date:   Mon Oct 28 18:32:36 2013 -0400
+
+    config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+    
+    Fix Automake warning: AC_OUTPUT should be used without arguments.
+    www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
+    
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit e16dea72d6f45dd6d7788362bb7dbe76263719b1
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 23 15:16:25 2013 +1000
+
+    dmx: queue button events with a flags of 0
+    
+    Setting POINTER_SCREEN with a unset valuator mask causes a jump to 0/0. Set
+    the flags to 0 so we don't generate any motion on a button event.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
+Author: Connor Behan <[e-mail]>
+Date:   Thu Oct 17 18:26:28 2013 -0700
+
+    xfree86: Find primary entity when bus types are nominally different
+    
+    As of server 1.13, systems with DRM and Udev will have BUS_PLATFORM as
+    their primary bus type. However, drivers not implementing a
+    platformProbe function will still create entities of type BUS_PCI. We
+    need to account for this when checking for the primary entity.
+    
+    Signed-off-by: Connor Behan <[e-mail]>
+    Acked-by: Tormod Volden <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1
+Merge: be66809 c671e93
+Author: Keith Packard <[e-mail]>
+Date:   Tue Oct 29 09:37:30 2013 -0700
+
+    Merge remote-tracking branch 'idr/glx-float-fbconfig'
+
+commit be6680967a479eedbcab2fe1718c5f981e1029c7
+Author: Adam Jackson <[e-mail]>
+Date:   Wed Jul 10 10:00:46 2013 -0400
+
+    glx: convert to direct GL dispatch (v2)
+    
+    We now expect to be linked against something that provides the GL API,
+    instead of manually grubbing about in the DRI driver's dispatch table.
+    Since the GLX we expose calls GL functions that are meant to be looked
+    up dynamically, also add a way to thunk through to GetProcAddress.
+    
+    This includes a refresh of the generated sources, which requires a
+    correspondingly new Mesa.
+    
+    The GetProcAddress stubs are at the moment merely enough to make this
+    link against Mesa 9.2, but should really be provided for everything not
+    in the OpenGL 1.2 ABI.
+    
+    v2: Explicitly hide the GetProcAddress stubs so we can't conflict with
+    libGL symbols; fix leading tab/space issues [anholt]
+    
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 8aacf47e1778d8b72811b025a82452b933d3c1f2
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Oct 4 12:58:19 2013 -0400
+
+    glx: Remove DRI1 AIGLX (v2)
+    
+    Mesa doesn't ship DRI1 drivers as of 8.0, which is about 18 months and
+    three releases ago.  The main reason to have wanted DRI1 AIGLX was to
+    get a GLX compositor working, but DRI1's (lack of) memory management API
+    meant that the cost of a GLX compositor was breaking direct GLX apps,
+    which isn't a great tradeoff.
+    
+    Of the DRI1 drivers Mesa has dropped, I believe only mga stands to lose
+    some functionality here, since it and only it has support for
+    NV_texture_rectangle.  Since that's required for every extant GLX
+    compositor I know of, I conclude that anybody with a savage, say, would
+    probably not notice AIGLX going away, since they wouldn't be running a
+    GLX compositor in the first place.
+    
+    In the future we'd like to use GL in the server in a more natural way,
+    as just another EGL client, including in the GLX implementation itself.
+    Since there's no EGL implemented for DRI1 drivers, this would already
+    doom AIGLX on DRI1 (short of entirely forking the GLX implementation,
+    which I'm not enthusiastic about).
+    
+    v2: Remove DRI1 from AIGLX conditionals in configure.ac [anholt]
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 7f5adf73a0f9a951a6df201532b4031d38054369
+Author: Adam Jackson <[e-mail]>
+Date:   Wed Oct 2 17:38:05 2013 -0400
+
+    glx: Simplify glXDestroyContext
+    
+    We can just free the resource unconditionally here.  ContextGone (which
+    FreeResourceByType will call) already does:
+    
+        cx->idExists = GL_FALSE;
+        if (!cx->currentClient) {
+            __glXFreeContext(cx);
+        }
+    
+    Reviewed-by: Ian Romanick <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 53653f4889dcaea0cf67f8a4180af71eeb4b2f6b
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Aug 5 15:46:11 2013 -0400
+
+    glx: Fix a corner case in DrawableGone
+    
+    Losing the drawable does not change our notion of current client.  Since
+    the GL under us doesn't understand having a current context without
+    current drawables (sigh), we do still need to loseCurrent so that we
+    re-bind the context on the next request.
+    
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65030
+    Reviewed-by: Ian Romanick <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 276d8057aa7f6e36c9c874257a6383f416c5cedd
+Author: Adam Jackson <[e-mail]>
+Date:   Sat Aug 3 09:47:55 2013 -0400
+
+    glx: Fix memory leak in context garbage collection (v2)
+    
+    I broke this, back in:
+    
+        commit a48dadc98a28c969741979b70b7a639f24f4cbbd
+        Author: Adam Jackson <[e-mail]>
+        Date:   Mon Mar 21 11:59:29 2011 -0400
+    
+    	glx: Reimplement context tags
+    
+    In that, I changed the glx client state to not explicitly track the list
+    of current contexts for the client (since that was what we were deriving
+    tags from).  The bug was that I removed the code for same from
+    glxClientCallback without noticing that it had the side effect of
+    effectively de-currenting those contexts, so that ContextGone could free
+    them.  So, if you had a client exit with a context still current, the
+    context's memory would leak.  Not a huge deal for direct clients, but
+    viciously bad for indirect, since the swrast context state at the bottom
+    of Mesa is like 15M.
+    
+    Fix this by promoting Bool isCurrent to ClientPtr currentClient, so that
+    we have a back-pointer to chase when walking the list of contexts when
+    ClientStateGone happens.
+    
+    v2: Explicitly call __glXFreeContext on the ClientStateGone path.  Our
+    current context might be one we got from EXT_import_context and whose
+    creating client has since died.  Without the explicit call, the creating
+    client's FreeClientResources would not free the context because it's
+    still current, and the using client's FreeClientResources would not free
+    the context because it's not an XID it created.  This matches the logic
+    from a48dadc.
+    
+    Reviewed-by: Ian Romanick <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 75b362763cca8b6139582ad85e3b58f0b2e30a1c
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 8 15:02:44 2013 -0400
+
+    glx: Only take a Pixmap reference if creating the GLXPixmap succeeded
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 4292a39c8014f9f4920bed3001802e4a3e523c5e
+Author: Peter Hutterer <[e-mail]>
+Date:   Mon Oct 28 12:10:10 2013 +1000
+
+    Xi: fix logic error when calculating emulated motion events
+    
+    gcc -Wlogical-op
+    exevents.c: In function 'DeliverEmulatedMotionEvent':
+    exevents.c:1480:13: warning: logical 'or' of collectively exhaustive
+    tests is always true [-Wlogical-op]
+    
+    The relevant snippet of exevents.c:
+    
+    1479         if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
+    1480             ti->listeners[0].type != LISTENER_POINTER_GRAB)
+    1481             return;
+    
+    This condition was always true, causing dropped motion events.
+    
+    Reported-by: Alan Coopersmith <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Alan Coopersmith <[e-mail]>
+
+commit c671e935e7c44d4711ba9588ee96cb9796b879e6
+Author: Daniel Czarnowski <[e-mail]>
+Date:   Mon Oct 21 19:48:38 2013 +0200
+
+    glx: Enable GLX_ARB_fbconfig_float for DRI2 drivers
+    
+    v2 (idr): Maintain sort order of extension list.  Fixed rebase error
+    (comment header for initializeExtensions was in front of
+    __glXDRIinvalidateBuffers).  Re-write commit message.
+    
+    Signed-off-by: Daniel Czarnowski <[e-mail]>
+    Signed-off-by: Ian Romanick <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+
+commit ccc8bb1153ec669f7540a174a81a8ec0e0d6dd67
+Author: Daniel Czarnowski <[e-mail]>
+Date:   Wed Oct 23 12:53:59 2013 +0200
+
+    glx: Handle float config types in glxConvertConfigs
+    
+    Replaces old use of floatMode attribute with new, extended range of
+    values in __DRI_ATTRIB_RENDER_TYPE. Also adds new conditions, where the
+    float modes support requires it. Enables support for not only float
+    configs, but packed float configs as well.
+    
+    v2 (idr): Whitespace and formatting fixes.  Refactor render type
+    vs. pbuffer checking to a separate function that includes a quote from
+    the spec.  Re-write commit message.  Fix compiler warnings:
+    
+    glxdricommon.c: In function 'glxConvertConfigs':
+    glxdricommon.c:212:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign]
+    glxdricommon.c:212:35: note: expected 'unsigned int *' but argument is of type 'int *'
+    glxdricommon.c:230:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign]
+    glxdricommon.c:230:35: note: expected 'unsigned int *' but argument is of type 'int *'
+    
+    Signed-off-by: Daniel Czarnowski <[e-mail]>
+    Signed-off-by: Ian Romanick <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+
+commit 4e5eb15b4cc170499cf87e6633c1737f0b1c514b
+Author: Daniel Czarnowski <[e-mail]>
+Date:   Mon Oct 21 19:57:53 2013 +0200
+
+    glx: Correctly set render type enum
+    
+    The type specified is bits, but the context wants an enum.
+    
+    v2 (idr): Fix various whitespace and formatting problems.  Rename
+    convFBconfRenderTypeBits2CtxRenderType to
+    renderTypeBitsToRenderTypeEnum.  Re-write commit message.
+    
+    Signed-off-by: Daniel Czarnowski <[e-mail]>
+    Signed-off-by: Ian Romanick <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+
+commit eabb523aa45f3d8940cadac197ef1225fbfd5c56
+Author: Daniel Czarnowski <[e-mail]>
+Date:   Mon Oct 21 19:45:35 2013 +0200
+
+    glx: Allow float renderType in glXCreateContextAttribsARB
+    
+    This enables GLX_RGBA_FLOAT_TYPE_ARB and
+    GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT as valid renderType parameters to
+    glXCreateContextAttribsARB.
+    
+    v2 (idr) : Use C-style comments and fix word wrapping.  Re-write commit
+    message.
+    
+    Signed-off-by: Daniel Czarnowski <[e-mail]>
+    Signed-off-by: Ian Romanick <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+
+commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893
+Author: Eric Anholt <[e-mail]>
+Date:   Tue Oct 22 14:22:04 2013 -0700
+
+    glx: Add support for the new DRI loader entrypoint.
+    
+    This is going to be exposed (and not the old entrypoint) for some DRI
+    drivers once the megadrivers series lands, and the plan is to
+    eventually transition all drivers to that.  Hopefully this is
+    unobtrusive enough to merge to stable X servers so that they can be
+    compatible with new Mesa versions.
+    
+    v2: typo fix in the comment
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 83bb366e71ef41165998eed2934208f84714a37e
+Author: Strake <[e-mail]>
+Date:   Thu Oct 17 23:20:20 2013 -0500
+
+    unbreak KdEnableInput
+    
+    pi = ki = 0 here, so not follow them.
+    
+    Signed-off-by: Strake <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 8db4121a3c7104548fd4a138ac1d1bdea5fd22d9
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 18 17:31:01 2013 -0700
+
+    Update to version 1.14.99.3
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit e3220d7bae4548bf64e5879c981ad070ac1f78f7
+Merge: 73b2660 2523a44
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 18 17:22:52 2013 -0700
+
+    Merge commit '2523a445a09a75a8baf642608d099a5e12d5437f'
+    
+    This is merging the commits along Peter's for-keith branch, without
+    also merging in the spurious merge at the top of that branch.
+
+commit f8662a133690773692dfa392ecfa3b8b56af8fa9
+Merge: 7cf1b59 2523a44
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Oct 18 16:50:12 2013 +1000
+
+    Merge branch 'xsync-transition-bug-59644' into for-keith
+
+commit 2523a445a09a75a8baf642608d099a5e12d5437f
+Author: Peter Hutterer <[e-mail]>
+Date:   Thu Oct 17 12:02:27 2013 +1000
+
+    sync: split updating and triggering a counter up
+    
+    Now that the brackets are always the nearest change points (regardless of
+    transition) we need to update the counters whenever we check for any updates.
+    
+    Otherwise we end up with a situation where counter->value is out of date and
+    an alarm doesn't trigger because we're still using the value from last time
+    something actually triggered.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit e57ec99b03b2ad840c384a97ab2766ce9da0f5cc
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 16 16:31:15 2013 +1000
+
+    sync: always set the brackets (#59644)
+    
+    The current code sets bracket_greater to the first trigger after the current
+    value, and bracket_less to the last trigger before the current value.
+    
+    For example, the idle timer with three negative and three positive transitions
+    would set this:
+    
+             nt1       nt2                 nt3
+    |--------|------|--|------- idle --|---|--|-----> t
+                   pt1                pt2    pt3
+    bracket_less == nt2
+    bracket_greater == pt2
+    
+    This is an optimization so we can skip code paths in the block/wakeup handlers
+    if the current value doesn't meet any of the trigger requirements. Those
+    handlers largely do a
+       if (bracket_less is less than current value &&
+           bracket_greater is greater than current value)
+            return, nothing to do
+    
+    However, unless the bracket values are updated at the correct time, the
+    following may happen:
+    
+                                          nt
+    |--------------|---------- idle ------|--------> t
+                   pt
+    
+    In this case, neither bracket is set, we're past the pos transition and not
+    yet at the neg transition. idle may now go past nt, but the brackets are not
+    updated. If idle is then reset to 0, no alarm is triggered for nt. Likewise,
+    idle may now go past pt and no alarm is triggered.
+    
+    Changing an alarm or triggering an alarm will re-calculate the brackets, so
+    this bug is somewhat random. If any other client triggers an alarm when the
+    brackets are wrongly NULL, the recalculation will set them this bug may not
+    appear.
+    
+    This patch changes the behavior, so that the brackets are always the nearest
+    positive or negative transitions to the current counter value. In the example
+    above, nt will trigger a wakeup and a re-calculation of the brackets, so that
+    going past it in the negative direction will then cause the proper alarm
+    triggers.
+    
+    Or, in Keith's words:
+    
+      Timer currently past a positive trigger
+          No bracket values, because no trigger in range
+    
+      Timer moves backwards before the positive trigger
+          Brackets not reset, even though there is now a trigger in range
+    
+      Timer moves forward past the positive trigger
+          Trigger doesn't fire because brackets not set
+    
+    Setting the LT bracket in this case will cause everything to get
+    re-evaluated when the sync value moves backwards before the trigger
+    value.
+    
+    X.Org Bug 59644 <http://bugs.freedesktop.org/show_bug.cgi?id=59644>
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 06b87aa528d7a739ba20101a1f83b1a428691a01
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 16 10:08:46 2013 +1000
+
+    sync: if the idle time was reset, force alarms to trigger (#70476)
+    
+    The time between the idle reset and the IdleTimeWakeupHandler to be called is
+    indeterminate. Clients with an PositiveTransition or NegativeTransition alarm
+    on a low threshold may miss an alarm.
+    
+    Work around this by keeping a reset flag for each device. When the
+    WakeupHandler triggers and the reset flag is set, we force a re-calculation of
+    everything and pretend the current idle time is zero. Immediately after is the
+    next calculation with the real idle time.
+    
+    Relatively reproducible test case: Set up a XSyncNegativeTransition alarm for
+    a threshold of 1 ms. May trigger, may not.
+    
+    X.Org Bug 70476 <http://bugs.freedesktop.org/show_bug.cgi?id=70476>
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit efc1035ca958f2c9d266338a308518a0834b1773
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 16 09:36:01 2013 +1000
+
+    dix: provide accessor methods for the last device event time
+    
+    And now that we have the accessors, localize it. No functional changes, just
+    preparing for a future change.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit b7c9bd9cf276e92a73be57ff2ed32b47a80f13fb
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 16 09:21:47 2013 +1000
+
+    sync: supply the counter from IdleTimeBlockHandler
+    
+    The main idletime counter has an initialized deviceid, might as well be
+    supplying it properly. Without this, we'd only ever check the XIAllDevices
+    counter, so the wait would never be adjusted for the device-specific triggers.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 2efe49c1029f959fe80879bcf50df42e8b80451d
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Oct 16 13:01:01 2013 +1000
+
+    sync: always call BracketValues when recalculating upper/lower brackets
+    
+    Both ServertimeBracketValues and IdleTimeBracketValues copy the value into
+    there SysCounter privates. Call it for a NULL set as well, so we don't end up
+    with stale pointers and we can remove the block/wakeup handlers.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 5c7cfd4c6978834551848e1be62af240102e39b5
+Author: Peter Hutterer <[e-mail]>
+Date:   Tue Oct 15 10:11:20 2013 +1000
+
+    sync: compress two if statements
+    
+    No functional changes, just merges a > and == condition into a >= condition.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+
+commit 73b2660d7273d175d279d22f8ca0c3932a14ff1c
+Author: Alan Coopersmith <[e-mail]>
+Date:   Mon Sep 16 21:47:16 2013 -0700
+
+    Avoid use-after-free in dix/dixfonts.c: doImageText() [CVE-2013-4396]
+    
+    Save a pointer to the passed in closure structure before copying it
+    and overwriting the *c pointer to point to our copy instead of the
+    original.  If we hit an error, once we free(c), reset c to point to
+    the original structure before jumping to the cleanup code that
+    references *c.
+    
+    Since one of the errors being checked for is whether the server was
+    able to malloc(c->nChars * itemSize), the client can potentially pass
+    a number of characters chosen to cause the malloc to fail and the
+    error path to be taken, resulting in the read from freed memory.
+    
+    Since the memory is accessed almost immediately afterwards, and the
+    X server is mostly single threaded, the odds of the free memory having
+    invalid contents are low with most malloc implementations when not using
+    memory debugging features, but some allocators will definitely overwrite
+    the memory there, leading to a likely crash.
+    
+    Reported-by: Pedro Ribeiro <[e-mail]>
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 8afe20d4e34adcfd29bdf43a01d55335ea2c5dba
+Author: Alan Coopersmith <[e-mail]>
+Date:   Mon Sep 16 21:45:29 2013 -0700
+
+    Update GLX dependencies now that DRI & DRI2 are builtins, not modules
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+
+commit 2704bdb24a2c7bac65b90e05f1a68438b34ecf58
+Author: Alan Coopersmith <[e-mail]>
+Date:   Tue Sep 3 22:53:28 2013 -0700
+
+    DMX glxproxy: Don't allocate & copy data just to free it unused
+    
+    Two functions in the DMX glxproxy code loop over all the backend
+    screens, starting at the highest numbered and counting down to
+    the lowest.
+    
+    Previously, for each screen, the code would allocate a buffer
+    large enough to read the reply from the backend, copy that reply
+    into the buffer, and then if it wasn't the final screen, free it.
+    Only the buffer from the final screen is used, to pass on to the
+    client in the reply.
+    
+    This modifies it to just immediately discard the responses from
+    the screens as we loop through it, only doing the allocate & copy
+    work for the one buffer we pass back to the client.
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+    Reviewed-by: Alex Deucher <[e-mail]>
+
+commit 6c06c268adbab63ebe7490489aa030724cbdc54b
+Author: Alan Coopersmith <[e-mail]>
+Date:   Sun Aug 18 18:02:49 2013 -0700
+
+    Skip damage calls if DamageCreate fails in exa functions
+    
+    Fixes parfait errors such as:
+       Null pointer dereference (CWE 476): Write to null pointer pDamage
+            at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
+              Function DamageCreate may return constant 'NULL' at line 1775,
+                  called at line 232 of exa/exa_migration_mixed.c
+                  in function 'exaPrepareAccessReg_mixed'.
+              Constant 'NULL' passed into function DamageRegister,
+                  argument pDamage, from call at line 237.
+              Null pointer introduced at line 1775 of miext/damage/damage.c
+                  in function 'DamageCreate'.
+       Null pointer dereference (CWE 476): Write to null pointer pDamage
+            at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
+              Function DamageCreate may return constant 'NULL' at line 1775,
+                  called at line 104 of exa/exa_mixed.c
+                  in function 'exaCreatePixmap_mixed'.
+              Constant 'NULL' passed into function DamageRegister,
+                  argument pDamage, from call at line 109.
+              Null pointer introduced at line 1775 of miext/damage/damage.c
+                  in function 'DamageCreate'.
+    
+    Checks are similar to handling results of other calls to DamageCreate.
+    
+    [ This bug was found by the Parfait 1.3.0 bug checking tool.
+      http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]
+    
+    Signed-off-by: Alan Coopersmith <[e-mail]>
+
+commit 7cf1b595c8c8f9776a39559d2878cf90af3f2859
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Sep 4 15:34:29 2013 +1000
+
+    dix: only deliver for the current grab type
+    
+    Use the grabtype to determine which type of event to send - all other events
+    are pointless and may result in erroneous events being delivered.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 78944d62ffc7fec6f75b6f514ab7a139ba9bc77b
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Sep 4 15:34:28 2013 +1000
+
+    dix: don't attempt to deliver an event for a different grabtype
+    
+    For an active grab, grab->eventMask can be either the core or the XI1 mask.
+    With the overlap of event filters, calling DeliverOneGrabbedEvent(XI1) for a
+    ProximityOut event will trigger if the client has selected for enter events -
+    the filter is the same for both.
+    
+    Thus, we end up delivering a proximity event to a client not expecting one.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 6159811a1aaf848016dbfa7bde68df097027870c
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Sep 4 15:34:27 2013 +1000
+
+    include: change grabtypes to start at 1
+    
+    Avoid erroneous detection of an unset grabtype as CORE
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit be6ea80b79b3d6eb97106ea142e01acbdf059995
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Sep 4 15:34:26 2013 +1000
+
+    dix: only allow button and key events to freeze a sync'd pointer
+    
+    If a client calls XAllowEvents(SyncPointer) it expects events as normal until
+    the next button press or release event - that freezes the device. An e.g.
+    proximity event must thus not freeze the pointer.
+    
+    As per the spec, only button and key events may do so, so narrow it to these
+    cases.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 93a27b2dd0d7ed51120f42456a91a7c59902ebc2
+Author: Michele Baldessari <[e-mail]>
+Date:   Sun Sep 15 19:30:38 2013 +0100
+
+    Xephyr: restore cursor visibility
+    
+      Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69388
+    
+    Commit c100211034ab69ce453a1644fb61c6808d7e3eda (dix: only show the cursor
+    if a window defines one (#58398)) broke the default cursor behaviour in
+    Xephyr (unless run with -retro). Restore the default cursor visibility
+    so that '-retro' or '-host-cursor' are not needed to have a visible
+    cursor.
+    
+    Signed-off-by: Michele Baldessari <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    
+    as of ba387cf21f7d95987211f75d8024601e7d64e322 "ephyr: Use host (HW) cursors
+    by default." this only applies if -sw-cursor is given on the cmdline.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 70efc799cbeec26f19831b3b14c0d4646198a077
+Author: Michele Baldessari <[e-mail]>
+Date:   Sun Sep 15 19:56:34 2013 +0100
+
+    Fix Xephyr compilation when DEBUG is enabled
+    
+    When DEBUG is enabled Xephyr compilation fails:
+    ephyrdriext.c:343:133: error: 'is_ok' undeclared (first use in this
+    function)
+         EPHYR_LOG("leave. is_ok:%d\n", is_ok);
+    
+    Just reemove bogus is_ok variable.
+    
+    Signed-off-by: Michele Baldessari <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 5ac4bfca64bd75474e550b26bc1195a5ca245752
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Sep 10 14:18:18 2013 -0400
+
+    input: calloc minimization for xi2mask_new
+    
+    There's no reason to do this as (nmasks + 2) callocs, and it's a
+    surprisingly hot path.  Turns out you hit this ~once per passive grab,
+    and you do a few bajillion passive grab changes every time you enter or
+    leave the overview in gnome-shell.  According to a callgrind of Xorg
+    with gnome-shell-perf-tool run against it:
+    
+    Ir before: 721437275
+    Ir after:  454227086
+    
+    Signed-off-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 44d502c6f1d03a9e548f0941cde0228b6fde8394
+Author: Jon TURNEY <[e-mail]>
+Date:   Sun Oct 6 16:45:52 2013 +0100
+
+    hw/xwin: Fix for "glx: Remove screen number from __GLXconfig"
+    
+    Fix compilation after commit c3c976f54c3c282d6fa6c8360688e036bc43d210 "glx:
+    Remove screen number from __GLXconfig"
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 6a9bd103cb993e873cb82664b677ceed73c0bd85
+Merge: ea3b7db 8aae28e
+Author: Keith Packard <[e-mail]>
+Date:   Mon Oct 7 17:29:38 2013 -0700
+
+    Merge remote-tracking branch 'jeremyhu/master'
+
+commit ea3b7db4b747f883ef7b8b524ee13bf8a63add14
+Author: Emil Velikov <[e-mail]>
+Date:   Mon Oct 7 18:29:25 2013 +0100
+
+    configure.ac: Include missing proto declarations in SDK_REQUIRED_MODULES
+    
+    Commits a1d41e311c21e, 7d859bd87834d & 3ed2c6e11298c made extinit.h require
+    the XF86 Big Font, XRes & ScrnSaver proto headers, but failed to add them
+    to the SDK_REQUIRED_MODULES so pkg-config would find them for driver builds.
+    
+    Signed-off-by: Emil Velikov <[e-mail]>
+    Reviewed-by: Daniel Stone <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 8aae28e3cbdd49bfa8d940a4a517c94a53b94f86
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Oct 6 09:20:45 2013 -0700
+
+    XQuartz: Dont't set screen on __GLXConfig
+    
+    Fixes regression introduced by c3c976f54c3c282d6fa6c8360688e036bc43d210
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit c5f8eb968efa970201712105a1ac880b517e7b6d
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Oct 6 09:18:15 2013 -0700
+
+    rootless: Use miCopyRegion instead of fbCopyRegion
+    
+    Fixes regression introduced by e657635dbe6b92875b0e88370557c2cbab673a49
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
+Author: Pino Toscano <[e-mail]>
+Date:   Wed Aug 28 17:15:03 2013 +0200
+
+    os: move <arpa/inet.h> for any !win32 system
+    
+    It is needed in IPv6 configurations (for inet_pton) also when
+    SIOCGIFCONF is not defined.
+    
+    Signed-off-by: Pino Toscano <[e-mail]>
+    Acked-by: Samuel Thibault <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit c079b8e675dd2762c9e07fe5d8c07612299dceb7
+Author: Pino Toscano <[e-mail]>
+Date:   Wed Aug 28 17:04:48 2013 +0200
+
+    xfree86/hurd: include <hurd.h>
+    
+    Needed for using get_privileged_port.
+    
+    Signed-off-by: Pino Toscano <[e-mail]>
+    Acked-by: Samuel Thibault <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit f0659a7f68a5a334879af01a6a63742eab1bf5de
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 4 16:44:46 2013 -0700
+
+    Bump version to 1.14.99.2
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit f2d149b6d10edea7233d93c7e19f71decf11dc62
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 4 16:43:41 2013 -0700
+
+    kdrive/ephyr: Remove duplicate ephyrExtensions and ephyrExtensionInit decls
+    
+    These were duplicated when GLX support was re-added on two different branches.
+    
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit e0a678f0596f3547b98d74d5f0438b484b059458
+Author: Gaetan Nadon <[e-mail]>
+Date:   Sat Sep 28 15:26:38 2013 -0400
+
+    xfree86: add a comment as to why the logdir is created
+    
+    Without the logdir, the xserver will write the content of the log file on the
+    terminal stating that it cannot be written and will stop.
+    
+    Refer to https://bugs.freedesktop.org/show_bug.cgi?id=3889
+    
+    Reviewed-By:  Matt Dew <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 5bdbf2dba3f7da4a593b286020eab0c7857e940c
+Author: Gaetan Nadon <[e-mail]>
+Date:   Sat Sep 28 15:26:37 2013 -0400
+
+    xfree86: Use $(MKDIR_P) for better code portability
+    
+    Still true that we should not use the lower case $(mkdir_p) version.
+    However, remove the 2005 comment as the MKDIR_P is widely used now.
+    
+    Reviewed-By:  Matt Dew <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit b8cfb0dc8426754b477b561bc158b8a24c143ddf
+Author: Gaetan Nadon <[e-mail]>
+Date:   Sat Sep 28 15:26:36 2013 -0400
+
+    Uninstall X link and CYGWIN libXorg.exe.a in local install targets
+    
+    It is our duty to uninstall any files and/or directories that we installed
+    through install-data-local and install-exec-hook.
+    
+    Currently the X symbolic link to Xorg remains on disk after running
+    make uninstall.
+    
+    Note the exception for logdir which is usually shared by other modules.
+    
+    Reviewed-By:  Matt Dew <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 35a528e49269c3df75486cc606e51a8c1c083c06
+Author: Gaetan Nadon <[e-mail]>
+Date:   Sat Sep 28 15:26:35 2013 -0400
+
+    Xorg binary: use install-exec-hook rather than install-exec-local
+    
+    The former was explicitly designed to execute additional code after the binary
+    has been installed. The latter can be executed in any order, hence it's
+    current dependency on install-binPROGRAMS as a workaround.
+    
+    The CYGWIN libXorg.exe.a target is an installation target rather than
+    a post-installation one, so it should not be done as a hook. It does not depend
+    on the Xorg executable being installed.
+    
+    Automake:
+    "These hooks are run after all other install rules of the appropriate type,
+    exec or data, have completed. So, for instance, it is possible to perform
+    post-installation modifications using an install hook".
+    
+    "With the -local targets, there is no particular guarantee of execution order;
+    typically, they are run early, but with parallel make, there is no way
+    to be sure of that".
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit a1d87576a30008253eb0cc92b44c9718f6665062
+Author: Gaetan Nadon <[e-mail]>
+Date:   Sat Sep 28 15:26:34 2013 -0400
+
+    Use $(LN_S) provided by AC_PROG_LN_S macro to create links
+    
+    For better code portability.
+    
+    Reviewed-By:  Matt Dew <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 28c8e1910797970dbf1d40794f1804a8fcc812bc
+Author: Gaetan Nadon <[e-mail]>
+Date:   Sat Sep 28 15:26:33 2013 -0400
+
+    The Xorg binary is missing the extension $(EXEEXT) in the makefile
+    
+    This is not a problem on UNIX platforms, but on CYGWIN it creates a broken
+    link to Xorg rather than a link to Xorg.exe.
+    
+    From the CYGWIN log on tinderbox, we can see that the executable Xorg.exe is
+    installed correctly. We can see the command used to create the link:
+    
+    (cd /jhbuild/install/[...]/install/bin && rm -f X && ln -s Xorg X)
+    
+    Note that the "relink" makefile target correctly appends $(EXEEXT) to Xorg.
+    
+    Reviewed-By:  Matt Dew <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit f3b529bf25db2700addbafc7aa4fc5b126ba9929
+Merge: 4399bd3 abc2bfc
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 4 14:04:48 2013 -0700
+
+    Merge remote-tracking branch 'anholt/ephyr-fixes'
+
+commit 4399bd38326b81f7b92365346504d7c6354772a9
+Author: Gaetan Nadon <[e-mail]>
+Date:   Mon Sep 30 13:30:46 2013 -0400
+
+    miext/shadow: missing c2p_core.h breaks "make distcheck" target.
+    
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 9ccb4a63982942fdce19609d2cadbd8e51708462
+Merge: 5d2ec69 da5e201
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 4 13:54:55 2013 -0700
+
+    Merge remote-tracking branch 'whot/for-keith'
+
+commit 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5
+Merge: 7d3d4ae 6ee4d9f
+Author: Keith Packard <[e-mail]>
+Date:   Fri Oct 4 13:50:04 2013 -0700
+
+    Merge remote-tracking branch 'ajax/xserver-next'
+
+commit da5e20127a5b6e11a47eb6e61f3ea87b056cdf5f
+Author: Gaetan Nadon <[e-mail]>
+Date:   Thu Sep 19 19:13:35 2013 -0400
+
+    test: add new os executable to .gitignore
+    
+    Signed-off-by: Gaetan Nadon <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit c73c36b537f996574628e69681833ea37dec2b6e
+Author: Laércio de Sousa <[e-mail]>
+Date:   Wed Sep 18 13:42:17 2013 -0300
+
+    xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478)
+    
+    This patch contributes to fill the remaining gaps which make
+    systemd-multi-seat-x wrapper still necessary in some multiseat setups.
+    
+    This also replaces previous evdev patch that does the same thing
+    for that particular driver.
+    
+    When option "-seat" is passed with an argument different from "seat0",
+    option "GrabDevice" for input devices is enabled by default
+    (no need of enabling it in xorg.conf's "InputClass" section).
+    
+    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478
+    
+    Signed-off-by: Laércio de Sousa <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 160c2db32d0b9ee5316a44179a6af4f4722e3d0a
+Author: Peter Hutterer <[e-mail]>
+Date:   Wed Sep 18 16:04:44 2013 +1000
+
+    dmx: provide enough space for axis mappings
+    
+    relmap/absmap is used as a evdev-axis-to-x-axis mapping. ABS_X maps to
+    axis 0, ABS_Y to 1, etc. skipping over non-existing axes so that the third bit
+    set in the ABS_* range is axis 2, and so on. This requires us to actually have
+    enough space to have all the ABS_*/REL_* range.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Alan Coopersmith <[e-mail]>
+
+commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
+Author: Keith Packard <[e-mail]>
+Date:   Fri Sep 20 14:43:41 2013 -0500
+
+    damage: Must translate initial window damage by window offset
+    
+    Damage is reported relative to the drawable origin, but the window
+    borderClip is absolute. Translate the region by the window position
+    before reporting damage to adjust.
+    
+    Reported-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 8010d3a48bd0b224dcb0883e39c2351ad364d846
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Sep 15 08:10:33 2013 -0700
+
+    XQuartz: pbproxy: Fix build with -DDEBUG
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+
+commit 39c548da0cf0522ad246630605b96751ab6d39c0
+Author: Jeremy Huddleston Sequoia <[e-mail]>
+Date:   Sun Sep 15 08:07:44 2013 -0700
+
+    XQuartz: Fix build with moved pseudoramiX
+    
+    Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+
+commit 6ee4d9f94ae2cc27c39381d7554134d9b4807a65
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Jul 9 11:19:11 2013 -0400
+
+    glx: Fill in some missing attributes from DoGetFBConfigs
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit b257fabff00ae925bb7e70364dd1d738634087c9
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Jul 4 10:31:40 2013 -0400
+
+    glx: Remove a dead comment
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit abd086502123086ce3d1fba25c159bb022d2750f
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Jul 8 17:01:13 2013 -0400
+
+    glx: Catch another failure case in drawable creation
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit c3c976f54c3c282d6fa6c8360688e036bc43d210
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Jul 8 12:28:56 2013 -0400
+
+    glx: Remove screen number from __GLXconfig
+    
+    Not used.  There's no real reason to match against this instead of
+    matching against fbconfig or visual ID anyway.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 1d1484e9bd55d1fa8316b1574754f28d5d31a076
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Jul 8 12:09:13 2013 -0400
+
+    glx: Remove pixmapMode from __GLXconfig
+    
+    This has never been filled in with anything meaningful afaict, and you
+    can't get to it from the client in any event.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 34e6e60105796ad015469c10921c5ff09acf7eb0
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Jul 2 12:33:36 2013 -0400
+
+    glx: Remove support for NV_vertex_program and NV_fragment_program
+    
+    Mesa doesn't implement these anymore, never really did outside of swrast
+    anyway.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit acf14c1de766c4ea206cd7ce7f25b780a589d33c
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Jul 2 10:35:19 2013 -0400
+
+    glx: realloc style fix in RenderLarge
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 9ebf739a6864c9ec38bf72f63ef2e3b9cd1951db
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Jul 2 10:30:40 2013 -0400
+
+    glx: Eliminate a small malloc from QueryContext
+    
+    No reason to have that be a failure path.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit b99f7975407f111b99d772cd28224d7dc1b34fe4
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 18:05:27 2012 -0500
+
+    glx: Handle failure to create the pixmap backing the pbuffer
+    
+    We happen not to sanitize the width/height we pass to CreatePixmap here,
+    oops.  It's not exploitable, but it's certainly a crash, so let's just
+    throw BadAlloc instead.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 22fbfdcb31f335c22053a0e29f0e73c03cd70a76
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 17:52:12 2012 -0500
+
+    glx: Implement GLX_PRESERVED_CONTENTS drawable attribute
+    
+    We back pixmaps with pbuffers so they're never actually clobbered.  Say
+    so when asked.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 2e20b8382cdf37ae5a2802f85b8f06a370f9645d
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 17:12:49 2012 -0500
+
+    glx: Implement GLX_FBCONFIG_ID in GetDrawableAttributes
+    
+    Required by GLX 1.4, section 3.3.6, "Querying Attributes".
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 0d76191baeee005982754ac18ca995742e32d8c1
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 17:10:57 2012 -0500
+
+    glx: Implement GLX_{WIDTH,HEIGHT} in GetDrawableAttributes
+    
+    Required by GLX 1.4, section 3.3.6, "Querying Attributes".
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit d11f13e383dda1e9cabe32793d261d46edc44418
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 17:07:20 2012 -0500
+
+    glx: Compute number of attributes in GetDrawableAttributes on the fly
+    
+    This doesn't have any effect yet, but is needed to properly build the
+    reply for pbuffers.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 468b57324f838144d79e3a9d85a0bde853578c4b
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 16:48:16 2012 -0500
+
+    glx: Style fixes
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 2b181ad0952851f47f23dcb1a36471685313c13e
+Author: Adam Jackson <[e-mail]>
+Date:   Fri Nov 9 16:33:54 2012 -0500
+
+    glx: Pull GLX vendor string out of __GLXscreen
+    
+    Given how we're currently implementing GLX this can't meaningfully vary
+    per-screen.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit b9c489cf13e1ad35b7d9bea9de8d85e929374d17
+Author: Adam Jackson <[e-mail]>
+Date:   Wed Oct 31 10:05:24 2012 -0400
+
+    glx: Remove unused bits from the context struct
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit f579cc85c29f52b575c62e6ae1e16eb87c506bd3
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Jul 4 10:08:40 2013 -0400
+
+    glxproxy: Don't track GLCLientm{aj,in}orVersion
+    
+    Basically just a port of 62f06b0d to glxproxy.
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e549ffb5f19cf044bc3e2d368a6f081f8b84bfaa
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 30 18:20:43 2012 -0400
+
+    dmx/glx: Remove unused __glXNop
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit d962b8ed272d4a8921c0dadf16cd926484e30d10
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Aug 22 16:42:23 2013 -0400
+
+    damageext: Style fix
+    
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit c90add0f1ce0c85aea7a60635de765848d778266
+Author: Adam Jackson <[e-mail]>
+Date:   Wed Aug 21 11:57:24 2013 -0400
+
+    damage: Remove "post-rendering" hooks
+    
+    This is a revert of 974db58f5b730c3770ee461665a02dd4334d1dea.  There are
+    no consumers of this API, we must not need it.
+    
+    Reviewed-by: Chris Wilson <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 0f3f8e4295d4c05f33b93e0ffd2f6f8cd5759bf7
+Author: Adam Jackson <[e-mail]>
+Date:   Wed Aug 21 11:13:11 2013 -0400
+
+    damage: Don't rewrite Text ops to GlyphBlt ops
+    
+    There's no particularly good reason to, and it breaks Xnest.
+    
+    Bugzilla: http://bugs.freedesktop.org/2454
+    Reviewed-by: Chris Wilson <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit d08966227e7d567df8d26eebc80f35f886e59a4a
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Aug 26 14:03:51 2013 -0400
+
+    damage: Simplify DamageUnregister
+    
+    You can only register one drawable on a given damage, so there's no
+    reason to require the caller to specify the drawable, the damage is
+    enough.  The implementation would do something fairly horrible if you
+    _did_ pass mismatched drawable and damage, so let's avoid the problem
+    entirely.
+    
+    v2: Simplify xf86RotateDestroy even more [anholt]
+    
+    Reviewed-by: Chris Wilson <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 28708a045de7d9043d20fb06b61c44a46eb5526b
+Author: Adam Jackson <[e-mail]>
+Date:   Mon Aug 26 13:52:14 2013 -0400
+
+    damage: Implicitly unregister on destroy
+    
+    There's no reason not to, and it simplifies quite a few callers.
+    
+    Reviewed-by: Chris Wilson <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e657635dbe6b92875b0e88370557c2cbab673a49
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 18 14:24:23 2012 -0400
+
+    fb: Remove unused compatibility wrappers
+    
+    Originally added in early 2009, not being used elsewhere anymore.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e4b15125bb06c97f1f34f7074fcdb597e718399c
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 18 14:24:22 2012 -0400
+
+    mipointer: Remove deprecated miPointerCurrentScreen
+    
+    The only remaining use was in some debugging code in DMX.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Mark Kettenis <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit b5d66b9513a0f1e13f5c5bc9e0958f4eac9bf6c3
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 18 14:24:21 2012 -0400
+
+    xfree86: Remove deprecated unimplemented xf86MapReadSideEffects
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Mark Kettenis <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit abbd85742a390e18497b96902a0c0d976739e3bd
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 18 14:24:20 2012 -0400
+
+    dix: FIXES is not optional
+    
+    It's already not optional at configure time, this just makes it so at
+    build time too.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit dff81687f5eac3eac9b49f58d4654cc30add2547
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 18 14:24:19 2012 -0400
+
+    vbe: Don't try to load the ddc submodule
+    
+    DDC is built into the server now.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit bb82191bcfa8042f8d98ec8b1c6616dc31d2c5c8
+Author: Adam Jackson <[e-mail]>
+Date:   Thu Oct 18 14:24:18 2012 -0400
+
+    misprite: Delete some dead private storage
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 3639ab4ce25dc82a3f8592b7322198f1d2aca5f9
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:25 2012 -0400
+
+    dri2: Don't bother with xf86LoaderCheckSymbol("DRI2Connect")
+    
+    The DRI2 code is now built-in to the server, even for Xorg.  The only
+    thing this could protect against is trying to run a libglx built with
+    DRI2 support against an Xorg built without it, which is firmly in
+    "doctor it hurts when I do this" territory.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Ian Romanick <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 13b507409f9e01adebba50e7eb801b52e52692ba
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:23 2012 -0400
+
+    list: Avoid using X types
+    
+    In particular, Bool.  This is not an ABI break:
+    
+    /usr/include/X11/Xdefs.h:typedef int Bool;
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit dbe10ef0e35659ee0e5db73f29670a3894a3e3f5
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:22 2012 -0400
+
+    dbe: Fold the window private private into the window private
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 1489637d567b0034a916f88079b5f360e7fce99c
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:21 2012 -0400
+
+    dbe: Fold midbe reset into dix
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 44d770750069486a8452fb2384f9b85745268e61
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:20 2012 -0400
+
+    dbe: Drop the unused idiom support
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 8cce0cf4d378f6fa52bc2cd277737b8986ab683c
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:19 2012 -0400
+
+    damage: Remove the 'damage window' resource type.
+    
+    Note that the existing code never actually creates a resource of this
+    type, so it can't possibly do anything.  This is clearly meant to track
+    window destruction and clean up any associated Damages, but that's
+    already handled by miext/damage's DestroyWindow wrapper.
+    
+    Previous discussion:
+    http://lists.freedesktop.org/archives/xorg-devel/2011-March/020847.html
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e674815e0a217ac01ec2d6a8517f8466b27fb39f
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:18 2012 -0400
+
+    dmx: Remove ShadowFB support
+    
+    This has been listed as deprecated ever since DMX was merged.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 19d3a7cb5db3188210830efa746987ba50d839e9
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:17 2012 -0400
+
+    dix: Remove a dead parameter from DoGetImage
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 4dca026880da90cff9734cf5787c5b57c02e7310
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:16 2012 -0400
+
+    mipointer: Remove EnqueueEvent from miPointerScreenFuncRec
+    
+    No DDX overrode this, and we never actually called through that slot
+    anyway.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit ad076dc6e82019defa422500710b3b42c6309e39
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:15 2012 -0400
+
+    mipointer: Flatten calls to mieqSwitchScreen
+    
+    No DDX was overriding this.
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit e2b14a1d3bb27e86ff1d7aaf59af850d06263ef5
+Author: Adam Jackson <[e-mail]>
+Date:   Tue Oct 16 14:56:14 2012 -0400
+
+    os: Factor out some common code in input buffer handling
+    
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 65fca558848acd907483d3c85c7cd4db5560f1b4
+Author: Radek Doulik <[e-mail]>
+Date:   Tue Aug 13 08:45:47 2013 +0200
+
+    xnest: Ignore GetImage() error in xnestGetImage()
+    
+    When an Xnest instance is not viewable it will crash when a client in
+    that instance calls GetImage. This is because the Xnest server will
+    itself receives a BadMatch error.
+    This patch ignores the error. The application which has requested the
+    image will receive garbage - this however is fully legal according
+    to the specs as obscured areas will always contain garbage if there
+    isn't some sort of backing store as discussed in
+    https://bugs.freedesktop.org/show_bug.cgi?id=9488
+    The applied patch is a version from Dadek Doulik.
+    
+    v2: Call XSync() before changing error handlers as suggested by
+        Daniel Stone <[e-mail]>.
+    
+    Reviewed-by: Daniel Stone <[e-mail]>
+    Signed-off-by: Egbert Eich <[e-mail]>
+
+commit b902c8abb6d03e68c93e13881a350523b5ac900c
+Author: Michal Srb <[e-mail]>
+Date:   Tue Aug 6 16:56:53 2013 +0200
+
+    Xnest: Implement xnestModifyPixmapHeader
+    
+    Xnest variant of ModifyPixmapHeader that creates new Pixmap in parent X
+    server if it's size is modified from 0x0 to anything bigger.
+    
+    xnestCreatePixmap doesn't create pixmap in parent X server if it has
+    dimensions 0x0. If it is later resized and accessed, Xnest will be
+    aborted with BadDrawable error from parent X server because it will
+    use XID 0. This happens with ScratchPixmap, for example as used from
+    XaceCensorImage. Applications using XACE crash Xnest.
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 132507eba93e4dfd466d5c30c9b818cdc6f8536e
+Author: Peter Harris <[e-mail]>
+Date:   Mon Jul 15 19:44:45 2013 -0400
+
+    security: Don't count RetainPermanent clients twice
+    
+    If a RetainPermanent client is subsequently killed by a KillClient
+    request, the reference count is decremented twice. This can cause the
+    server to prematurely kill other clients using the same Authorization.
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Peter Harris <[e-mail]>
+
+commit 20c2a3bcb11b5baf564e2c73a477ba23f5ae2b10
+Author: Peter Harris <[e-mail]>
+Date:   Mon Jul 15 19:44:29 2013 -0400
+
+    mi: Avoid stack smash when drawing dashed lines
+    
+    X.org Bug 54013 <https://bugs.freedesktop.org/show_bug.cgi?id=54013>
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Peter Harris <[e-mail]>
+
+commit 9bf46610a9d20962854016032de4567974e87957
+Author: Chris Wilson <[e-mail]>
+Date:   Fri Jun 21 22:58:31 2013 +0100
+
+    os: Immediately queue initial WriteToClient
+    
+    If we immediately put the WriteToClient() buffer into the socket's write
+    queue, not only do we benefit from sending the response back to client
+    earlier, but we also avoid the overhead of copying the data into our own
+    staging buffer and causing extra work in the next select(). The write is
+    effectively free as typically we may only send one reply per client per
+    select() call, so the cost of the FlushClient() is the same.
+    
+    shmget10:   26400 -> 110000
+    getimage10: 25000 -> 108000
+    
+    shmget500:   3160 -> 13500
+    getimage500: 1000 -> 1010
+    
+    The knock-on effect is that on a mostly idle composited desktop, the CPU
+    overhead is dominated by the memmove in WriteToClient, which is in turn
+    eliminated by this patch.
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Chris Wilson <[e-mail]>
+
+commit ceffb34774d44ada83cc1994d20c8d65b46bd555
+Author: Laurent Carlier <[e-mail]>
+Date:   Sat Jun 8 00:43:56 2013 +0200
+
+    ephyr: restore GLX support
+    
+    It was removed since version 1.13
+    
+    Signed-off-by: Sebastien Bacher <[e-mail]>
+    Acked-by: Daniel Stone <[e-mail]>
+
+commit f37972f4a67b49ba9649310a6778bd1bf31e0130
+Author: Keith Packard <[e-mail]>
+Date:   Wed Apr 24 14:58:27 2013 -0700
+
+    miext/sync: Fix multi-screen support in SyncFence initialization
+    
+    miSyncSetup was checking to see if the screen private key had been
+    registered, and if so, skipping the setup of the provided screen.
+    
+    Instead, it should register the private index only once, but then
+    initialize the screen unless it has already been initialized. This
+    latter step allows drivers to initialize the sync private structures
+    before the Sync extension itself is initialized.
+    
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Signed-off-by: Keith Packard <[e-mail]>
+
+commit 1c8beedfe4343377fa3504f8ab71430cc137b22c
+Author: Adam Jackson <[e-mail]>
+Date:   Wed Aug 21 14:12:52 2013 -0400
+
+    randr: Fix a copypasta bug in CRTC confinement
+    
+    Reviewed-by: Michel Dänzer <[e-mail]>
+    Signed-off-by: Adam Jackson <[e-mail]>
+
+commit 47ff382d1fce25a8b097d45b79489e891f1f1228
+Merge: 6f89ae3 3752a81
+Author: Keith Packard <[e-mail]>
+Date:   Mon Sep 9 15:13:42 2013 -0700
+
+    Merge remote-tracking branch 'jturney/master'
+
+commit 6f89ae3e64c4dfeea508813e546c10ba1da3ea8e
+Author: Thomas Klausner <[e-mail]>
+Date:   Wed Sep 4 20:06:07 2013 +0200
+
+    Fix typo in configure warning.
+    
+    Signed-off-by: Thomas Klausner <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 47218a6e09549781fd61dbf5e0d3d5c81da64323
+Author: Thomas Klausner <[e-mail]>
+Date:   Wed Sep 4 20:05:51 2013 +0200
+
+    Fix bug in cursor handling.
+    
+    CreateCursor (Xlib call XCreatePixmapCursor) with a non-bitmap
+    source pixmap and a None mask is supposed to error out with BadMatch,
+    but didn't.
+    
+    From der Mouse <[e-mail]>, changed following
+    comments by Alan Coopersmith <[e-mail]>.
+    
+    Signed-off-by: Thomas Klausner <[e-mail]>
+    Reviewed-by: Jasper St. Pierre <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 1110b71e360195aab040d835b54540ab558638c5
+Author: Chris Clayton <[e-mail]>
+Date:   Wed Sep 4 15:42:04 2013 +1000
+
+    kdrive: fix build error on gcc 4.8 for out-of-bounds array access
+    
+    I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
+    of gcc-4.8:
+    
+    input.c:225:43: error: array subscript is above array bounds
+    [-Werror=array-bounds]
+    
+    This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
+    KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
+    be beyond the end of the array.
+    
+    Signed-off-by: Chris Clayton <[e-mail]>
+    Reviewed-by: Keith Packard <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit abc2bfca16adcd1e5657d4ce54f4e1335d5ed53f
+Author: Sebastien Bacher <[e-mail]>
+Date:   Fri Aug 23 21:21:44 2013 +0200
+
+    kdrive: initialize GLX for xephyr
+    
+    Like commit ac1a60e7b6f06fd075cc5bf55d6bc67206a01d29, re-add
+    initialization of GLX after it was accidentally dropped from non-Xorg
+    servers in 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86.
+    
+    Signed-off-by: Sebastien Bacher <[e-mail]>
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62346
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit aa5534ec6931ffcc81cca76b98785d57de8e0e52
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 11:23:00 2013 -0700
+
+    ephyr: Do grab/ungrab for ctrl+shift, not just shift+ctrl.
+    
+    Given that the window title says "ctrl+shift", having pressing those
+    keys in that order not ungrab you is fairly mean.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 5cc15e1c427bacd73db7381df3474a23f7616624
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 11:19:17 2013 -0700
+
+    ephyr: Flush the X connection when updating the window title.
+    
+    Otherwise when you're doing the ctrl-shift mouse grab thing, you
+    don't know what state you're in until the next rendering occurs.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit ba387cf21f7d95987211f75d8024601e7d64e322
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 11:17:14 2013 -0700
+
+    ephyr: Use host (HW) cursors by default.
+    
+    Unless you're working on the sw cursor rendering code, you surely want
+    to have real hardware cursors.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 0f5a2f13dc284dd5f0f28e2c4323b2e08d253a7d
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 11:04:22 2013 -0700
+
+    ephyr: Garbage collect some DOA host window clipping code.
+    
+    Introduced in 79782726617d4b5a4f9b376f21936d035fc870e1 but never used.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 090de17d361dc9828203a2562565d6499998db46
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 10:56:22 2013 -0700
+
+    ephyr: Garbage collect some dead XV clipping code.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 347d0fa6961c2b3dc4efd4e7cca8ef98cd3ea06e
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 10:44:23 2013 -0700
+
+    ephyr: Remove the helper libs for each of the optional components.
+    
+    Note that EXTRA_DIST was always unnecessary, because automake notices
+    conditional compile of source files and includes them.
+    
+    Copyright header is added because git noted that this was a 61%
+    rewrite.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 74dff87790dbb3dcb23634f1e8cd54018e5ddc9d
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 10:40:52 2013 -0700
+
+    ephyr: Remove the remaining bits of host/server XV split.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 2f994dfe9d1add9ea8cb9c88ddb0d15843854788
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 10:14:36 2013 -0700
+
+    ephyr: Remove the host/server split of the actual XV video operations.
+    
+    I suspect there's more cleanup possible in ephyrHostXVPutImage() by
+    sticking a bunch of the args in the port priv earlier.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 0b7ce74315213ccd31802847e5a83e67090ded14
+Author: Eric Anholt <[e-mail]>
+Date:   Fri Aug 23 10:01:23 2013 -0700
+
+    ephyr: Remove another host/server split for XV image formats.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 1dcc28bcb402d7286d18b41b469062a5c176d7eb
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Aug 22 17:00:41 2013 -0700
+
+    ephyr: Remove the host/server split for video encodings.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 28a37757e11068b4594f4128a0d64c6bc9a53ee0
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Aug 22 17:26:21 2013 -0700
+
+    ephyr: Remove the host/server split for XV formats.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 41134d393a37dd5b971b018a3888fbfea0b9c736
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Aug 22 17:21:37 2013 -0700
+
+    ephyr: Remove the host/server split for XV attributes.
+    
+    v2: Fix leaks of xcb replies (caught by Julien)
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 1342a93c49beb6e4924534304119d57fa587ad0f
+Author: Eric Anholt <[e-mail]>
+Date:   Thu Aug 22 17:26:08 2013 -0700
+
+    ephyr: Remove the host/server split for XV adaptors.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit fad79d2e3e53de4f25b3d1dd7accb558464a4a46
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 20:08:32 2013 +0200
+
+    ephyr: Refactor XV adaptor feature detection.
+    
+    This obviously wanted a helper function beforehand, but even more so
+    now that we have XCB.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 7a9c311add62026972419ef0b04a55680072bfeb
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 20:02:53 2013 +0200
+
+    ephyr: Remove some pointless indirection in the XV code.
+    
+    Now that we have XCB on the server side, we don't need to split these
+    functions out.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 46cf6bf5692ef751ec9d17ae2292565d4b13f14b
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 18:38:29 2013 +0200
+
+    ephyr: Move event processing into ephyr.c.
+    
+    No more extra event structure to translate between hostx.c and
+    ephyr.c!
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 847c856effde482c13cdefcdca8176cee3bf67c4
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 17:28:08 2013 +0200
+
+    ephyr: Move the host screen info into the kdrive screen private.
+    
+    We can include xcb bits from the same place as server headers, so
+    there's no need to hide them any more.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 8dadc78e233f341f1ecb8d404de03d98ab210620
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 16:45:06 2013 +0200
+
+    ephyr: Rename and use the proper type for what was host_screen->info.
+    
+    Now that we can include server headers in talking to host X, we don't
+    need to hide any more.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 18d836f6dde46bcac8b794d34f76032688c28851
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 14:12:45 2013 +0200
+
+    ephyr: Expose a single function for detecting extensions.
+    
+    v2: Fix trying to include xcb-dri in the non-dri-build case (Noted by
+        Julien)
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 3aacb22d6473480c31fb08f0b2527747dbf5be57
+Author: Eric Anholt <[e-mail]>
+Date:   Sun Aug 18 14:01:53 2013 +0200
+
+    ephyr: Drop dead ephyrHostAtomToLocal code.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 4aaad0bfbcef018eb36839b1d034c3f60022694a
+Author: Julien Cristau <[e-mail]>
+Date:   Wed Oct 20 20:10:43 2010 +0200
+
+    Xephyr: we're not using Xlib anymore, no need to undef _XSERVER64
+    
+    Drop obsolete comments about interaction between Xlib code and that
+    macro, and stop undefining it.
+    
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+
+commit 0fc2f9f04a44599f598380d4df992bec60c0e3a1
+Author: Julien Cristau <[e-mail]>
+Date:   Sat Sep 25 16:05:07 2010 +0200
+
+    Xephyr: handle errors in event loop
+    
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+
+commit 3309a73c826f02c4b2e14180a3254546314ec323
+Author: Julien Cristau <[e-mail]>
+Date:   Fri Jun 25 14:20:57 2010 +0100
+
+    Xephyr: drop remaining Xlib dependency
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 7da2174cf93f59b7e0372a6dc9d37a510076e187
+Author: Julien Cristau <[e-mail]>
+Date:   Mon Jun 21 14:39:03 2010 +0100
+
+    Xephyr: move glx code to xcb
+    
+    v2: Rebase on master, notably adding XCB for
+        X_GLXvop_MakeCurrentReadSGI (anholt).
+    v3: Fix use-after-free (caught by Julien).
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]> (v1)
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit 19c2699b954e2978301c4449dfccc7ca40bf6ae6
+Author: Julien Cristau <[e-mail]>
+Date:   Wed Jun 23 18:36:00 2010 +0100
+
+    Xephyr: remove unused DRI1 code
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 68b7db19e8d3c1ac55a811327d3058f4c8fb45ec
+Author: Julien Cristau <[e-mail]>
+Date:   Sun Jun 20 00:07:08 2010 +0100
+
+    Xephyr: move ephyrdri over to xcb
+    
+    Require new xcb-xf86dri to get fixed GetDrawableInfo.
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit aea119cd05807ed77336f96a40f8e4607c6ce169
+Author: Julien Cristau <[e-mail]>
+Date:   Sun Jun 20 11:13:26 2010 +0100
+
+    Xephyr: use xcb-xv instead of libXv
+    
+    v2: Massive, conflict-filled rebase.  I think I resolved everything
+        right, but this host xv code makes my eyes bleed.  Touch-tested XV
+        after the rebase (anholt).
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]> (v1)
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit 3ea75a59d5fec3c4099388724942e216f2344328
+Author: Julien Cristau <[e-mail]>
+Date:   Mon Jun 21 17:20:32 2010 +0100
+
+    Xephyr: use xcb for event handling
+    
+    v2: Rebase on indentation changes, squash in a simpler variant of the
+        later event compression patch, fix server hang or segfault on
+        window close by reimplementing the x_io_error_handler in the new
+        XCB event loop (anholt).
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]> (v1)
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit ff26845252889f7cc3258a0d3aa116189acc6aae
+Author: Julien Cristau <[e-mail]>
+Date:   Thu Jun 24 23:45:16 2010 +0100
+
+    Xephyr: some more hostx.c xcb-ification
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 9b55f76a265aab0d9943a40208a38800e5782ba5
+Author: Julien Cristau <[e-mail]>
+Date:   Thu Jun 24 23:35:15 2010 +0100
+
+    Xephyr: move HostX.visual to xcb
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 126312fb4a6e06024a306341e675163108426390
+Author: Julien Cristau <[e-mail]>
+Date:   Thu Jun 24 23:26:48 2010 +0100
+
+    Xephyr: replace XKeycodeToKeysym with xcb-keysyms
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 8543d3fdfd47d2a0423f3ef8e7429c23c5d6b053
+Author: Julien Cristau <[e-mail]>
+Date:   Thu Jun 24 23:17:32 2010 +0100
+
+    Xephyr: delete unused hostx_get_extension_info function
+    
+    v2: Also remove the prototype (anholt)
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]> (v1)
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit d72c11b9df4a98fd80cb6635d34964483e33bc41
+Author: Julien Cristau <[e-mail]>
+Date:   Mon Jun 21 14:25:11 2010 +0100
+
+    Xephyr: delete unused proxy code
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit a71ea3f96769da157dde82a591e43264820772ac
+Author: Julien Cristau <[e-mail]>
+Date:   Sun Jun 20 23:34:54 2010 +0100
+
+    Xephyr: xcb-ify visual list construction
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit ac2b0348c00d692ec1bd8d6c8ab99e9198e755a7
+Author: Julien Cristau <[e-mail]>
+Date:   Sun Jun 20 23:34:39 2010 +0100
+
+    Xephyr: xcb-ify pointer/keyboard grab
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 1f93e6b350d1b9a058009052a666a2e8796708cb
+Author: Julien Cristau <[e-mail]>
+Date:   Sun Jun 20 23:34:03 2010 +0100
+
+    Xephyr: no need for XDisplayKeycodes
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit 73398e5bf61c30e69a40a19a1057c2263fbb91ef
+Author: Julien Cristau <[e-mail]>
+Date:   Thu Jun 24 23:00:38 2010 +0100
+
+    Xephyr: use xcb-shape instead of XShape*
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]>
+    Reviewed-by: Eric Anholt <[e-mail]>
+    Signed-off-by: Julien Cristau <[e-mail]>
+
+commit a2b73da78de4e627965213d24a6c33f243a60eb6
+Author: Julien Cristau <[e-mail]>
+Date:   Sun Jun 20 00:05:40 2010 +0100
+
+    Xephyr: start converting hostx.c over to xcb
+    
+    v2: Dropped the hostx_load_keymap changes, now that that function is
+        gutted (anholt).
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]> (v1)
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit 762606b4cdfb57c5202ae128ce4dbb8afe172d4e
+Author: Julien Cristau <[e-mail]>
+Date:   Fri Jun 25 17:59:13 2010 +0100
+
+    Xephyr: stop loading the host's keymap
+    
+    This isn't used anywhere.
+    
+    v2: Rebase to the top of the patch series (anholt)
+    
+    Reviewed-by: Mikhail Gusarov <[e-mail]> (v1)
+    Signed-off-by: Julien Cristau <[e-mail]>
+    Signed-off-by: Eric Anholt <[e-mail]>
+
+commit 3752a815800626ae93f64a856f5889aa6636344e
+Author: Marc Haesen <[e-mail]>
+Date:   Sat Aug 10 17:38:38 2013 +0100
+
+    hw/xwin: Remove unnecessary and incorrect HWND casts
+    
+    Signed-off-by: Marc Haesen <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+
+commit 34932cef6cc800fbdf2f375506057ed8cd1e07f6
+Author: Jon TURNEY <[e-mail]>
+Date:   Mon Apr 1 13:43:00 2013 +0100
+
+    hw/xwin: Fix compilation of winauth.c with -Werror=implicit-function-declaration
+    
+    /jhbuild/checkout/xorg/xserver/hw/xwin/winauth.c: In function ‘MitGenerateCookie’:
+    /jhbuild/checkout/xorg/xserver/hw/xwin/winauth.c:87:5: error: implicit declaration of function ‘MitAddCookie’ [-Werror=implicit-function-declaration]
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 2a08554a0bf80b862c15676c31ecd463b616518c
+Author: Jon TURNEY <[e-mail]>
+Date:   Mon Jun 17 23:54:01 2013 +0100
+
+    hw/xwin: Remove unused extern g_fUseUnicode from winclipboardwndproc.c
+    
+    Signed-off-by: Jon TURNEY <[e-mail]
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 69401f38a697c941ea58351028f4cd4b810f9188
+Author: Jon TURNEY <[e-mail]>
+Date:   Mon Jun 17 18:37:26 2013 +0100
+
+    hw/xwin: Remove unneeded forward declaration of winProcessXEventsTimeout()
+    
+    Remove unneeded forward declaration of winProcessXEventsTimeout(), the actual
+    definition immediately follows.
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 9c45a1ad44f12ac25e1c3b7a18a3bceb85a2cf38
+Author: Jon TURNEY <[e-mail]>
+Date:   Mon Jun 17 16:58:47 2013 +0100
+
+    hw/xwin: Remove prototype for non-existent winDeinitClipboard()
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit acc46fc217352b94f77a6b5b14808ea89875a2a1
+Author: Jon TURNEY <[e-mail]>
+Date:   Mon Jun 17 00:40:13 2013 +0100
+
+    hw/xwin: Remove unused externs from winclipboardwrappers.c
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit fcc7767f8cd6c318861b1060ef6a3936750a0dd2
+Author: Jon TURNEY <[e-mail]>
+Date:   Mon Jun 10 17:31:12 2013 +0100
+
+    hw/xwin: Remove unused winProcQueryTreeOrig variable
+    
+    Unused since 47c7b6d3e626497747ae2780f259a15b8e6c846f "Remove no-longer needed
+    tricks used to prevent the clipboard client from being killed"
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 8fa882a980abea6f05b4b59447a187aea2c793a1
+Author: Jon TURNEY <[e-mail]>
+Date:   Sat Aug 10 12:41:07 2013 +0100
+
+    hw/xwin: Fix ARGB cursor conversion on x86_64
+    
+    Fix erroneous use of unsigned long * for lpBits in winXCursorToHCURSOR() which
+    leads to ARGB cursors being vertically streched on x86_64 by interleaving blank
+    rows of pixels.
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 4bfb2dce5eea4923eaf86eca33b96087b28235f5
+Author: Jon TURNEY <[e-mail]>
+Date:   Sun Apr 7 23:59:44 2013 +0100
+
+    hw/xwin: Fix an issue in winSetSpansNativeGDI() identifed by -Warray-bounds
+    
+    The BITMAPINFO local only has room for a single RBGQUAD in bmiColors, but we
+    access two (black and white for a mono-color DIB).  Fix by changing to a dynamic
+    allocation big enough for a BITMAPINFO and a RGBQUAD.
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 784c006adb22c6693ad30dd0b1b05369cfaa7b5e
+Author: Jon TURNEY <[e-mail]>
+Date:   Sat Aug 10 11:55:23 2013 +0100
+
+    hw/xwin: Fix -Warray-bounds warning in winXCursorToHCURSOR()
+    
+    Rewrite winXCursorToHCURSOR() so access to BITMAPINFO bmiColors member doesn't
+    trigger an -Warray-bounds warning.
+    
+    Note that the underlying storage is allocated as a BITMAPV4HEADER, so has
+    sufficent room for the extra RGBQUADs bmiColors after the BITMAPINFO bmiHeader.
+    
+    wincursor.c: In function 'winSetCursor':
+    wincursor.c:293:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:294:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:295:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:296:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:297:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:298:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:299:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    wincursor.c:300:24: error: array subscript is above array bounds [-Werror=array-bounds]
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 41d03c9ccce665b919b180bbb819b78c750aa325
+Author: Marc Haesen <[e-mail]>
+Date:   Fri Aug 2 18:19:22 2013 +0100
+
+    hw/xwin: Correct size of _WINDOWSWM_NATIVE_HWND property on x86_64
+    
+    Use the correct size of a HWND on x86_64 in XChangeProperty() and
+    XGetWindowProperty() calls for the _WINDOWSWM_NATIVE_HWND property.
+    
+    Signed-off-by: Marc Haesen <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+
+commit 390cfec10ef7d52391f890c7593ac82a7d77d856
+Author: Colin Harrison <[e-mail]>
+Date:   Fri Aug 9 16:48:12 2013 +0100
+
+    hw/xwin: Correct winprefs.c function signatures for x64.
+    
+    Correct SetupRootMenu(), SetupSysMenu(), HandleCustomWM_INITMENU() and
+    HandleCustomWM_COMMAND() function signatures which use unsigned long parameters,
+    where just a specific HWND or HMENU handle type should have been used.
+    
+    Signed-off-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit e716baedc4d8e52a60f43ef21aba771b340d8c8b
+Author: Jon TURNEY <[e-mail]>
+Date:   Sat Mar 31 14:42:45 2012 +0100
+
+    Move pseudoramiX code where it can be shared between Xwin and Xquartz
+    
+    Move pseudoramiX code to a separate top-level directory.  Link Xwin and Xquartz
+    with libPseudoramiX
+    
+    I'm not sure moving this to a top-level directory is appropriate, but I'm not
+    sure where else it fits.
+    
+    Future work: pseudoramiX can probably be consolidated with the rrxinerama code
+    (which I think provides fake xinerama data when real XINERAMA is disabled and we
+    only have one screen)
+    
+    v2: fix distcheck
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit ce0217b98261dcf8b20cfb743831965dda1950ec
+Author: Jon TURNEY <[e-mail]>
+Date:   Sat Aug 10 12:35:55 2013 +0100
+
+    hw/xwin: Fix winglobals.h for MinGW64 build
+    
+    Include pthread.h in winglobals.h to fix build with latest MinGW64 headers
+    
+    In file included from
+    winmultiwindowicons.c:47:0:
+    winglobals.h:92:1: error: unknown type name ‘pthread_mutex_t’
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit b27756dbe6a1be4633ec47a8fe92a4c217f68f93
+Author: Jon TURNEY <[e-mail]>
+Date:   Sun Aug 11 12:15:11 2013 +0100
+
+    hw/xwin: Fix inclusion of shlobj.h in MinGW64 build
+    
+    Fix build with latest MinGW64 headers by wrapping Status type in shlobj.h as well
+    
+    In file included from InitOutput.c:51:0:
+    /usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1231:44: error: expected identifier or ‘(’ before ‘int’
+    /usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1248:44: error: expected identifier or ‘(’ before ‘int’
+    
+    Signed-off-by: Jon TURNEY <[e-mail]>
+    Reviewed-by: Colin Harrison <[e-mail]>
+    Reviewed-by: Marc Haesen <[e-mail]>
+
+commit 94d4e29aedc69431fa9b299ca1b67947173d7a24
+Author: Peter Hutterer <[e-mail]>
+Date:   Mon Aug 26 15:51:46 2013 +1000
+
+    Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554)
+    
+    XIAllowEvents changed length in XI 2.2 (for the touchid). A bug in libXi
+    causes libXi to always use the new request length if the server supports
+    2.2, regardless of the client's XIQueryVersion request.
+    
+    The server takes the client's XIQueryVersion request into account though,
+    resulting in a BadLength error if a 2.[0,1] client calls XIAllowEvents on a
+    XI 2.2+ server.
+    
+    Can't fix this in libXi, so work around this in the server.
+    
+    X.Org Bug 68554 <http://bugs.freedesktop.org/show_bug.cgi?id=68554>
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 82939e02392cbb880313fe92957091ff89ce2f2b
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Aug 16 15:30:59 2013 +1000
+
+    dix: check for grab type before checking XI2 mask
+    
+    if the grab type isn't XI2, grab->xi2mask is random. That random data may
+    have the enter/leave mask set, leading to events sent to the client that the
+    client can't handler.
+    
+    Source of these errors:
+      _xgeWireToEvent: Unknown extension 131, this should never happen.
+    
+    Simplest reproducer:
+       Start Xephyr, press button inside window, move out. As the pointer leaves
+       the Xephyr window, the errors appear.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 16894df1ffb6fe21bf723dd954578e8d934799ca
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Aug 16 10:55:09 2013 +1000
+
+    Xi: replace loop with memset
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit 8f2292b683f591052da2fe94fb3831a3c9a5aa61
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Aug 16 11:05:49 2013 +1000
+
+    include: wrap EMASKSIZE in parentheses
+    
+    Otherwise things like EMASKSIZE * foo will yield interesting results.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+    Reviewed-by: Adam Jackson <[e-mail]>
+
+commit d803f296c616ccf55711cf0af9e7d3eae2edda16
+Author: Peter Hutterer <[e-mail]>
+Date:   Fri Aug 23 09:04:01 2013 +1000
+
+    test: fix the gcc diagnostics pragma
+    
+    pop without push restores the commandline options. The proper way is to
+    push, then ignore, then pop.
+    
+    And while we're at it, change the pop argument to a comment - pop ignores
+    the argument, but be proper about it.
+    
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit 05ea6307fa4f0bee3d3bf536396059f3906791a0
+Author: Egbert Eich <[e-mail]>
+Date:   Fri Aug 16 19:52:16 2013 +0200
+
+    DIX/Xi: Pass correct client to CheckDeviceGrabAndHintWindow()
+    
+    If we have a client which has registered for a DeviceButton grab
+    be sure to pass this to CheckDeviceGrabAndHintWindow(). Since the
+    order of clients is arbitrary there is no guarantee that the last
+    client in the list is the one that belongs to this class.
+    
+    Signed-off-by: Egbert Eich <[e-mail]>
+    Reviewed-by: Peter Hutterer <[e-mail]>
+    Signed-off-by: Peter Hutterer <[e-mail]>
+
+commit e01a3f65d3e6d92f92ef2992b338cc9625bde082
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 14:50:37 2013 +0200
+
+    ephyr: Fix warning about XID vs unsigned long * by changing function args
+    
+    There's no reason to pass the data back out to the caller, since the
+    caller was dropping it on the floor.  The original data is a CARD32,
+    so no need to mess with weird unsigned longs.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit f1cefe020bd21c07dfcc9f204e79939499abbd35
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 14:38:08 2013 +0200
+
+    ephyr: Drop is_ok logging.
+    
+    The only cases that lead to !is_ok are already EPHYR_LOG_ERROR, and it
+    fixes set-but-unused compiler warnings.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 77c7a2014e3942b55c0b78308edf02eab33f2e60
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 14:36:09 2013 +0200
+
+    kdrive: Fix const cast warnings in arguments processing.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 7107937e473a3557c37d719cb100b2e9b09075dd
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 13:11:17 2013 +0200
+
+    kdrive: Fix const cast warnings in driver name handling.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 56c405d46a86853771a0b808da4c8a9ef626960c
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 13:07:23 2013 +0200
+
+    kdrive: Fix a few easy cast warnings.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit a9c48a07eea50468fa47ab178cdd91edb0b5727f
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 13:06:23 2013 +0200
+
+    kdrive: Drop dead code.
+    
+    This is unused as of the introduction of a helper in
+    e7150db5350bc2113ff4126019b489847a4dc217
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 873ae962bdb7559c952b5955ba262285701982a8
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 13:01:57 2013 +0200
+
+    ephyr: Fix dead code warning.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 34af2eebe19e2f8afe35a5614d4d44fa4fd89d6b
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 13:01:32 2013 +0200
+
+    ephyr: Fix const-cast warnings for setting window title.
+    
+    Signed-off-by: Eric Anholt <[e-mail]>
+    Reviewed-by: Julien Cristau <[e-mail]>
+
+commit 7edf5066db48434739ac64e0576fbb4fdf0f37f9
+Author: Eric Anholt <[e-mail]>
+Date:   Sat Aug 17 12:54:33 2013 +0200
+
+    ephyr: Fix const cast warnings in ephyrhostvideo.