Update to xserver 1.19.7. Tested by jca@ and stsp@.

1 files changed, 544 insertions, 0 deletions

diff --git a/xserver/ChangeLog b/xserver/ChangeLog
index ecf0d41b5..cf67c422e 100644
--- a/xserver/ChangeLog
+++ b/xserver/ChangeLog
@@ -1,3 +1,547 @@
+commit 937391523eef6459d1f8b1ae25fe7e1f77b8a12a
+Author: Kevin Brace <kevinbrace@gmx.com>
+Date:   Sat Mar 2 14:13:20 2019 -0800
+
+    xserver 1.19.7
+    
+    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
+
+commit a93f8f74b54accfb94a8c56357e566db76c24b22
+Author: Kevin Brace <kevinbrace@gmx.com>
+Date:   Sat Mar 2 14:10:41 2019 -0800
+
+    Update configure.ac bug URL for gitlab migration
+    
+    It is based on Alan Coopersmith's commit for various fd.o projects.
+    
+    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
+
+commit af63efe470417cde8a64068b1e6965b2677d92d9
+Author: Kevin Brace <kevinbrace@gmx.com>
+Date:   Thu Dec 13 22:32:27 2018 -0600
+
+    Add 24-bit color support to exaGetPixmapFirstPixel
+    
+    It appears that people who developed EXA forgot that there used to be
+    graphics devices that used 24-bits (3 bytes) instead of 32-bits (4 bytes)
+    in order to display one pixel. The lack of 24-bit color support inside
+    exaGetPixmapFirstPixel causes SiS 6326 to crash when running Xfce since
+    SiS 6326 does not support 32-bit color.
+    
+    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
+
+commit 56547b196660e246e37132960723819972b99c8c
+Author: Mario Kleiner <mario.kleiner.de@gmail.com>
+Date:   Mon Feb 5 11:20:41 2018 +0100
+
+    glx: Only assign 8 bpc fbconfigs for composite visuals.
+    
+    Commit 91c42093b248 ("glx: Duplicate relevant fbconfigs for
+    compositing visuals") adds many new depth 32 fbconfigs as
+    composite visuals. On a X-Screen running at depth 24, this
+    also adds bgra 10-10-10-2 fbconigs, as they also have
+    config.rgbBits == 32, but these are not displayable on a
+    depth 24 screen, leading to visually corrupted desktops
+    under some compositors, e.g., fdo bug 104597 "Compton
+    weird colors" when running compton with
+    "compton --backend glx".
+    
+    Be more conservative for now and only select fbconfigs with
+    8 bpc red, green, blue components for composite visuals.
+    
+    Fixes: 91c42093b248 ("glx: Duplicate relevant fbconfigs for
+                          compositing visuals")
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104597
+    Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+    Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit bebcc8477c8070ade9dd4be7299c718baeab3d7a)
+
+commit e96bd477395af3c2c3157ebda0f55ea4b672a114
+Author: Lyude Paul <lyude@redhat.com>
+Date:   Tue Feb 6 12:41:47 2018 -0500
+
+    xwayland: Don't process cursor warping without an xwl_seat
+    
+    Unfortunately, on my machine Xwayland immediately crashes when I try to
+    start it. gdb backtrace:
+    
+     #0  0x00007ffff74f0e79 in wl_proxy_marshal () from target:/lib64/libwayland-client.so.0
+     #1  0x0000000000413172 in zwp_confined_pointer_v1_destroy (zwp_confined_pointer_v1=0x700000000)
+         at hw/xwayland/Xwayland@exe/pointer-constraints-unstable-v1-client-protocol.h:612
+     #2  0x0000000000418bc0 in xwl_seat_destroy_confined_pointer (xwl_seat=0x8ba2a0)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-input.c:2839
+     #3  0x0000000000418c09 in xwl_seat_unconfine_pointer (xwl_seat=0x8ba2a0)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-input.c:2849
+     #4  0x0000000000410d97 in xwl_cursor_confined_to (device=0xa5a000, screen=0x8b9d80, window=0x9bdb70)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland.c:328
+     #5  0x00000000004a8571 in ConfineCursorToWindow (pDev=0xa5a000, pWin=0x9bdb70, generateEvents=1,
+         confineToScreen=0) at /home/lyudess/Projects/xserver/dix/events.c:900
+     #6  0x00000000004a94b7 in ScreenRestructured (pScreen=0x8b9d80)
+         at /home/lyudess/Projects/xserver/dix/events.c:1387
+     #7  0x0000000000502386 in RRScreenSizeNotify (pScreen=0x8b9d80)
+         at /home/lyudess/Projects/xserver/randr/rrscreen.c:160
+     #8  0x000000000041a83c in update_screen_size (xwl_output=0x8e7670, width=3840, height=2160)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-output.c:203
+     #9  0x000000000041a9f0 in apply_output_change (xwl_output=0x8e7670)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-output.c:252
+     #10 0x000000000041aaeb in xdg_output_handle_done (data=0x8e7670, xdg_output=0x8e7580)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-output.c:307
+     #11 0x00007ffff50e9d1e in ffi_call_unix64 () at ../src/x86/unix64.S:76
+     #12 0x00007ffff50e968f in ffi_call (cif=<optimized out>, fn=<optimized out>, rvalue=<optimized out>,
+         avalue=<optimized out>) at ../src/x86/ffi64.c:525
+     #13 0x00007ffff74f3d8b in wl_closure_invoke () from target:/lib64/libwayland-client.so.0
+     #14 0x00007ffff74f0928 in dispatch_event.isra () from target:/lib64/libwayland-client.so.0
+     #15 0x00007ffff74f1be4 in wl_display_dispatch_queue_pending () from target:/lib64/libwayland-client.so.0
+     #16 0x00007ffff74f200b in wl_display_roundtrip_queue () from target:/lib64/libwayland-client.so.0
+     #17 0x0000000000418cad in InitInput (argc=12, argv=0x7fffffffd9c8)
+         at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-input.c:2867
+     #18 0x00000000004a20e3 in dix_main (argc=12, argv=0x7fffffffd9c8, envp=0x7fffffffda30)
+         at /home/lyudess/Projects/xserver/dix/main.c:250
+     #19 0x0000000000420cb2 in main (argc=12, argv=0x7fffffffd9c8, envp=0x7fffffffda30)
+        at /home/lyudess/Projects/xserver/dix/stubmain.c:34
+    
+    This appears to be the result of xwl_cursor_confined_to() and
+    xwl_screen_get_default_seat(). While not against protocol, mutter ends
+    up sending xdg_output before wl_seat. xwl_screen_get_default_seat()
+    makes the naïve assumption that we always have a valid seat, we end up
+    returning a pointer to the empty list itself instead of an actual seat
+    and causing ourselves to segfault.
+    
+    So, actually return NULL in xwl_screen_get_default_seat() if the seat
+    list is empty, and skip any pointer confinement processing in
+    xwl_cursor_confined_to() when we don't have a seat setup yet.
+    
+    Signed-off-by: Lyude Paul <lyude@redhat.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 98edb9a35e2cdd61355656b82975d7f2b6a9f0e6)
+
+commit 61d3f56877b23241757490efcdb759b905caca1d
+Author: Alex Goins <agoins@nvidia.com>
+Date:   Mon Jan 8 18:44:25 2018 -0800
+
+    randr: Fix rotation check in ProcRRSetScreenSize()
+    
+    ProcRRSetScreenSize() does bounds checking to ensure that none of the CRTCs have
+    a viewport that extends beyond the new screen size. In doing so, it accounts for
+    if the CRTC is rotated 90 or 270 degrees, swapping width and height.
+    
+    However, it does so by testing if crtc->rotation is equal to RR_Rotate_90 or
+    RR_Rotate_270. crtc->rotation is a bit mask, and it includes reflection as well
+    as rotation. If a CRTC is reflected as well as rotated, it will incorrectly fail
+    this test, resulting in incorrect dimensions being used to verify the validity
+    of the new screen size. In some cases, this can cause valid uses of
+    ProcRRSetScreenSize() to fail with BadMatch.
+    
+    This patch fixes the issue by testing that the bits RR_Rotate_90 or
+    RR_Rotate_270 are set, rather than testing for equality.
+    
+    Signed-off-by: Alex Goins <agoins@nvidia.com>
+    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+    (cherry picked from commit 6b26a7bda9efa93440734ede0382a3e9a6761365)
+
+commit cb908a7840487e4b81aa16c5b3a4b609ff1153fc
+Author: Jeff Smith <whydoubt@gmail.com>
+Date:   Fri Jan 26 06:25:22 2018 -0600
+
+    glamor: tidy up some gradient color formulas
+    
+    - Avoid some needlessly complex equations for calculating the color at a
+      point in a gradient field.
+    - Avoid calculating certain values multiple times.
+    - Use similar variable names across the two versions of the get_color
+      function where practical.
+    
+    Signed-off-by: Jeff Smith <whydoubt@gmail.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit ff410c56bfd6dcdf5d252ef0ba3f4c6fde91774b)
+
+commit b41bb8147e706cb8e615842e08a548b7e8afd279
+Author: Jeff Smith <whydoubt@gmail.com>
+Date:   Fri Jan 26 06:25:21 2018 -0600
+
+    glamor: remove unused variables in linear gradient shader
+    
+    Signed-off-by: Jeff Smith <whydoubt@gmail.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 3bd17dff1ac5a4685a5da92a9982f621effee658)
+
+commit c715645c14ec00cd49e6bb86340351fa97ab6ea0
+Author: Jeff Smith <whydoubt@gmail.com>
+Date:   Fri Jan 26 06:25:20 2018 -0600
+
+    glamor: fix no-reflect case for gradients
+    
+    When compositing a no-reflect gradient, 'before' the gradient is empty,
+    but 'after' the gradient is padded with the final color.  Both sides are
+    supposed to be empty.
+    
+    This is fixed by moving the virtual stops to match the first and last
+    client-supplied stops for no-reflect gradients, then causing everything
+    'before' the initial virtual stop and 'after' the final virtual stop to
+    emit rgba(0,0,0,0).  This does not impact gradients using the other
+    reflect modes.
+    
+    Signed-off-by: Jeff Smith <whydoubt@gmail.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 5815c7b5951fd46d69e5c40144b64e516c7afdbf)
+
+commit 38e6fb757386e2cb2c51a27e52346473d4ffb9a1
+Author: Jeff Smith <whydoubt@gmail.com>
+Date:   Fri Jan 26 06:25:19 2018 -0600
+
+    glamor: fix repeat-reflect case in linear gradient shader
+    
+    If _pt_distance is negative, it causes the final distance to be negative
+    in the repeat-reflect case.  Moving the scaling by _pt_distance earlier
+    avoids this problem, and simplifies some equations as a bonus.
+    
+    Bugzilla: https://bugs.freedesktop.org/98508
+    Signed-off-by: Jeff Smith <whydoubt@gmail.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 3e377e238f7257fd01e56a4a25dfd77e033673e4)
+
+commit f6cd99ed79c17e3aa04b8821d10ca95939bd8675
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date:   Wed Jan 24 17:45:37 2018 +0100
+
+    xwayland: remove dirty window unconditionally on unrealize
+    
+    This is a rare occurrence of a crash in Xwayland for which I don't have
+    the reproducing steps, just a core file.
+    
+    The backtrace looks as follow:
+    
+      #0  raise () from /usr/lib64/libc.so.6
+      #1  abort () from /usr/lib64/libc.so.6
+      #2  OsAbort () at utils.c:1361
+      #3  AbortServer () at log.c:877
+      #4  FatalError () at log.c:1015
+      #5  OsSigHandler () at osinit.c:154
+      #6  <signal handler called>
+      #7  xwl_glamor_pixmap_get_wl_buffer () at xwayland-glamor.c:162
+      #8  xwl_screen_post_damage () at xwayland.c:514
+      #9  block_handler () at xwayland.c:665
+      #10 BlockHandler () at dixutils.c:388
+      #11 WaitForSomething () at WaitFor.c:219
+      #12 Dispatch () at dispatch.c:422
+      #13 dix_main () at main.c:287
+    
+    The crash is caused by dereferencing “xwl_pixmap->buffer” in
+    xwl_glamor_pixmap_get_wl_buffer() because “xwl_pixmap” is NULL.
+    
+    Reason for this is because the corresponding pixmap is from the root
+    window and xwayland is rootless by default.
+    
+    This can happen if the window was mapped, redirected, damaged and
+    unredirected immediately, before the damage is processed by Xwayland.
+    
+    Make sure to remove the dirty window from the damage list on unrealize
+    to prevent this from happening.
+    
+    Credit goes to Adam Jackson <ajax@nwnk.net> and Daniel Stone
+    <daniel@fooishbar.org> for finding the root cause the issue.
+    
+    Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+    Reviewed-by: Daniel Stone <daniels@collabora.com>
+    (cherry picked from commit 3362422e8413dd9f231cfac50ce0a0862525b1bf)
+
+commit 9cd243f75dc52e1c649178963ab22583db52cd54
+Author: Michal Srb <msrb@suse.com>
+Date:   Mon Nov 27 09:59:01 2017 +0100
+
+    os/inputthread: Force unlock when stopping thread.
+    
+    The inputthread is kept locked all the time while X server's VT is not active.
+    If the X server is terminated while not active, it will be stuck forever in
+    InputThreadFini waiting for the thread to join, but it wouldn't because it is
+    locked.
+    
+    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103782
+    Signed-off-by: Michal Srb <msrb@suse.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 71348e99a8e6a95542e483b93839168ca8f51f81)
+
+commit 5c456b6e2a9a579e67ba577f9147642406f2ce99
+Author: Peter Harris <pharris@opentext.com>
+Date:   Thu Dec 14 12:21:19 2017 -0500
+
+    composite: Propagate damagedDescendants when reparented
+    
+    If a window that is fully covered by an automatic-redirected descendant
+    (even implicitly, eg. via BackingStores) is reparented, the automatic
+    updates could be broken if the new parent is not marked as having
+    damaged descendants.
+    
+    Fix this issue by propagating the damagedDescendants flag whenever a
+    window is reparented.
+    
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    Signed-off-by: Peter Harris <pharris@opentext.com>
+    (cherry picked from commit d5c23b29487d5ff440abf5ed0beb22c00f21e387)
+
+commit df319f889ddc952dd065bbb3252d045b90baaf8e
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jan 24 12:28:38 2018 +0100
+
+    xf86XvMCScreenInit: Clear pScreenPriv->dixinfo when freeing pAdapt
+    
+    Fixes double-free later in xf86XvMCCloseScreen, which would generally
+    cause fireworks.
+    
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+    (cherry picked from commit 75408f53d4e203e462b2f13ea4b06264f0e59ad2)
+
+commit d0d1a694f967af770fba0d36043fd5218ff20984
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jan 24 11:40:50 2018 +0100
+
+    Revert "present: Only send PresentCompleteNotify events to the presenting client"
+    
+    This reverts commit 5c00e693631475679c1c2504e03177652ec7de28.
+    
+    It broke the Gallium nine state tracker, which makes PresentPixmap
+    requests on one display connection and processes the corresponding
+    events on another one.
+    
+    The issue that motivated this change is prevented on the client side by
+    https://cgit.freedesktop.org/mesa/mesa/commit/?id=7b0e8264dd21ae05521d08d41fecd84139401fef
+    
+    Bugzilla: https://bugs.freedesktop.org/104678
+    (cherry picked from commit 76732f498f1e73fb081841a04faf068660f3d5c7)
+
+commit 8be1dbeacf5f29c0b538414e87d47c9d5af08d9d
+Author: Martin Wilck <mwilck@suse.com>
+Date:   Tue Jan 9 20:33:09 2018 +0100
+
+    xfree86: add default modes for 16:9 and 16:10
+    
+    Improve the user experience for users with wide screens by adding standard
+    16:9 and 16:10 modes to extramodes, as suggested previously
+    (https://lists.x.org/archives/xorg-devel/2016-February/048866.html).
+    Tested successfully on my laptop. Feedback welcome.
+    
+    See also https://bugs.freedesktop.org/show_bug.cgi?id=37858.
+    
+    Signed-off-by: Martin Wilck <mwilck@suse.com>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit a5e9bcad7ad0887f804905b482894b85751519fb)
+
+commit 71269c6e57cec82bbf81b1c99c8019098303d6a3
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Dec 13 14:53:56 2017 -0500
+
+    os: Fix a type error in the IPv6 XDMCP code
+    
+    Building with strict-aliasing rightly chirps here:
+    
+    ../os/xdmcp.c: In function ‘XdmcpRegisterConnection’:
+    ../os/xdmcp.c:489:31: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
+                         &((struct sockaddr_in6 *) &address)->sin6_addr.s6_addr[12];
+                                   ^~~~~~~~~~~~
+    
+    We have "const char *address", so &address here is a char ** (i.e., it
+    points to the slot on the stack containing the pointer to the character
+    array passed in as an argument). Casting that to a struct sockaddr_in6 *
+    is wrong, because it means that area of the stack will be reinterpreted
+    as a struct sockaddr_in6.
+    
+    Instead, cast address, not &address.
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 652913cd9474946bcb29271602bacfd98f46ad0b)
+
+commit 8f11ab2b475623d5c00e146a7d6108f356a16b52
+Author: Helmut Grohne <helmut@subdivi.de>
+Date:   Thu Dec 21 11:48:15 2017 +0100
+
+    build: guess availability of monotonic clock for cross compilation
+    
+    When cross compiling, the value of MONOTONIC_CLOCK would be "cross
+    compiling", because AC_RUN_IFELSE doesn't work. However when enabling
+    wayland, a monotonic clock is required and configure aborts.
+    
+    We change detection of CLOCK_MONOTONIC to degrade it gracefully from a
+    run check to a declaration check in case of cross compilation based on
+    the assumption that most systems will have a monotonic clock and those
+    that don't won't be able to run Xwayland anyway. The trade-off
+    essentially is either "always fail cross compilation" or "produce an
+    unusable Xwayland for unusual platform" and this commit switches to the
+    latter.
+    
+    Signed-off-by: Helmut Grohne <helmut@subdivi.de>
+    Bug-Debian: https://bugs.debian.org/882531
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit c601c8faf54ff9e3bcbc653421828d71042deef7)
+
+commit 7cec7fb7bc34ea857e2d40ad32ead8a328dbe1a1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jan 5 11:58:42 2018 +1000
+
+    config: fix NULL value detection for ID_INPUT being unset
+    
+    Erroneous condition caused us to keep going with all devices that didn't have
+    ID_INPUT set.
+    
+    Fixes: 5aad81445c8c3d6
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit a309323328d9d6e0bf5d9ea1d75920e53b9beef3)
+
+commit 16896d05a6a2a91fd53cf6af56ce5e79f6abb500
+Author: Corentin Rossignon <corentin.rossignon@gmail.com>
+Date:   Thu Jan 4 08:34:01 2018 +0100
+
+    glamor: Specify GLSL version for xv shader
+    
+    SAMPLE is a GLSL keyword in newer OpenGL version.
+    This fix issue with gnome-shell and playing video using xv
+    
+    Signed-off-by: Corentin Rossignon <corentin.rossignon@gmail.com>
+    Bugzilla: https://bugs.freedesktop.org/104405
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit dbfbe58b94ec07a45fd6170f96bffec55051724e)
+
+commit 5e83ebd76738455c443a66024b0b5eb92930b36c
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jan 9 10:54:05 2018 -0500
+
+    animcur: Fix transitions between animated cursors
+    
+    We weren't cancelling the old timer when changing cursors, making things
+    go all crashy. Logically we could always cancel the timer first, but
+    then we'd have to call TimerSet to re-arm ourselves, and GetTimeInMillis
+    is potentially expensive.
+    
+    Reported-by: https://devtalk.nvidia.com/default/topic/1028172/linux/titan-v-ubuntu-16-04lts-and-387-34-driver-crashes-badly/post/5230967/#5230967
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+    Tested-by: Aaron Plattner <aplattner@nvidia.com>
+    (cherry picked from commit de60245e05c0d2528d4ff42557a044387e53315c)
+
+commit 693f0e21d55d6e9fe792d91e76e4168aa813db71
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 26 15:24:39 2017 -0400
+
+    animcur: Run the timer from the device, not the screen
+    
+    This is very slightly more efficient since the callback now doesn't need
+    to walk every input device, instead we know exactly which device's
+    cursor is being updated. AnimCurTimerNotify() gets outdented nicely as a
+    result. A more important side effect is that we can stop using the
+    TimerAbsolute mode and just pass in the relative delay.
+    
+    In AnimCurSetCursorPosition, we no longer need to rearm the timer with
+    the new screen; it is enough to update the device's state. In
+    AnimCurDisplayCursor we need to notice when we're switching from
+    animated cursor to regular and cancel the existing timer.
+    
+    Reviewed-by: Robert Morell <rmorell@nvidia.com>
+    Tested-by: Robert Morell <rmorell@nvidia.com>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 094a63d56fbfb9e23210cc9ac538fb198af37cee)
+
+commit 354c48304d27f75b7c33c03a0adb050c37788ccf
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 26 13:53:06 2017 -0400
+
+    animcur: Return the next interval directly from the timer callback
+    
+    If the return value is non-zero here, DoTimer() will automatically rearm
+    the timer for the new (relative) delay. 'soonest' is in absolute time,
+    so subtract off 'now' and return that.
+    
+    Reviewed-by: Robert Morell <rmorell@nvidia.com>
+    Tested-by: Robert Morell <rmorell@nvidia.com>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit cc3241a712684f8c7147f5688e9ee3ecb5a93b87)
+
+commit 26841b2c9ea03fda8b2d0da254e0344fd2a3afce
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Oct 26 13:40:57 2017 -0400
+
+    animcur: Use fixed-size screen private
+    
+    Reviewed-by: Robert Morell <rmorell@nvidia.com>
+    Tested-by: Robert Morell <rmorell@nvidia.com>
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 3abbdb7318018584a27220737bd92081ce8ee67c)
+
+commit 725b4b46ff59a8db84d8c12fec02c6b1d94b27ce
+Author: Lukáš Krejčí <lskrejci@gmail.com>
+Date:   Sat Dec 30 23:46:45 2017 +0100
+
+    Xorg.wrap: Ensure correct ordering of post-install hook
+    
+    The install rule of Xorg.wrap is currently a dependency of the
+    install-data target instead of the install-exec target. The build also
+    uses install-exec-hook to change the ownership and set the SUID bit on
+    the Xorg.wrap binary. The problem is that install-exec-hook is only
+    ordered respective to the install-exec target, the rules of install-data
+    may or may not have been executed.
+    
+    If install-exec-hook runs before the Xorg.wrap binary is in place,
+    a message similar to the following will be present in the build log:
+    
+    chown: cannot access '/pkgdir/usr/lib/xorg-server/Xorg.wrap': No such file or directory
+    make[6]: [Makefile:1151: install-exec-hook] Error 1 (ignored)
+    
+    All that needs to be done is to change the name of the program variable
+    to contain 'exec' for the install rule to depend on the install-exec
+    target.
+    
+    Excerpt from the Automake manual, chapter 12.2 The Two Parts of Install:
+    "Any variable using a user-defined directory prefix with ‘exec’ in the
+    name (e.g., myexecbin_PROGRAMS) is installed by install-exec. All other
+    user-defined prefixes are installed by install-data."
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=104419
+    
+    Signed-off-by: Lukáš Krejčí <lskrejci@gmail.com>
+    Acked-by: Hans de Goede <hdegoede@redhat.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit f615cb62d47cb24ea31718e8226df53ce6651c91)
+
+commit 16fd18479d2f617adf0e6de922586441be3808eb
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date:   Fri Dec 15 16:43:47 2017 +0100
+
+    xwayland: avoid race condition on new keymap
+    
+    When the Wayland compositor notifies of a new keymap, for the first X11
+    client using the keyboard, the last slave keyboard used might still not
+    be set (i.e. “lastSlave” is still NULL).
+    
+    As a result, the new keymap is not applied, and the first X11 window
+    will have the wrong keymap set initially.
+    
+    Apply the new keymap to the master keyboard as long as there's one.
+    
+    Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=791383
+    Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    (cherry picked from commit 170c95978530f6373bdf4488116902b273f3abf4)
+
+commit a13271f2feb6e480b2e698d4efa3b94150a6808b
+Author: Tapani Pälli <tapani.palli@intel.com>
+Date:   Tue Nov 28 09:23:29 2017 +0200
+
+    glx: do not pick sRGB config for 32-bit RGBA visual
+    
+    This fixes blending issues seen with kwin and gnome-shell when
+    32bit visual has sRGB capability set.
+    
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+    Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655
+    (cherry picked from commit c2954b16c8730c7ed8441fd8dba25900f3aed265)
+
 commit ebfb06b11955a6c32500b7086be912ab96b753a7
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Dec 20 14:23:57 2017 -0500