Re: xwayland pull request for 1.19 branch

2017-03-15 Thread Adam Jackson
On Mon, 2017-03-13 at 06:06 -0400, Olivier Fourdan wrote:
> Hi,
> 
> I have cherry-picked a couple of fixes for Xwayland for the 
> server-1.19-branch.
> 
> _Important_: I squashed two commits from upstream for 1.19, namely:
> 
>   64ca14b xwayland: make sure client is not gone in sync callback
>   937527f xwayland: Monitor client states to destroy callbacks
> 
> I used "cherry-pick -x" and kept the original commit from the the best fix in 
> the squash commit message, i.e. 937527f.
> 
> I hope this is OK (I reckon it makes sense for the stable branch to get the 
> right code in one go).

Not just okay, preferred. Merged, thanks:

To ssh://git.freedesktop.org/git/xorg/xserver
   db1326c..18fcb66  server-1.19-branch -> server-1.19-branch

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

xwayland pull request for 1.19 branch

2017-03-13 Thread Olivier Fourdan
Hi,

I have cherry-picked a couple of fixes for Xwayland for the server-1.19-branch.

_Important_: I squashed two commits from upstream for 1.19, namely:

  64ca14b xwayland: make sure client is not gone in sync callback
  937527f xwayland: Monitor client states to destroy callbacks

I used "cherry-pick -x" and kept the original commit from the the best fix in 
the squash commit message, i.e. 937527f.

I hope this is OK (I reckon it makes sense for the stable branch to get the 
right code in one go).

Anyway, *if* this is OK, here follows a pull request:

The following changes since commit db1326cd6625747e4036e6cdc75bc7a0e1b0426b:

  present: disable page flip only when a slave crtc is active (2017-03-10 
11:05:36 -0500)

are available in the git repository at:

  git://people.freedesktop.org/~ofourdan/xserver xwayland-1.19-branch

for you to fetch changes up to 18fcb66688057f5676952e2535d4bb9942371199:

  xwayland: Monitor client states to destroy callbacks (2017-03-13 09:56:24 
+0100)


Olivier Fourdan (2):
  xwayland: clear cursor frame callback
  xwayland: Monitor client states to destroy callbacks

 hw/xwayland/xwayland-cursor.c | 14 --
 hw/xwayland/xwayland-glamor.c | 60 

 2 files changed, 64 insertions(+), 10 deletions(-)

Cheers,
Olivier
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel