On Thu, Sep 21, 2017 at 7:21 AM, Olivier Fourdan <[email protected]> wrote: > > Hi all, > > It appears the Xserver in 1.19 branch is missing quite a few fixes from > master, so I prepared a branch back-porting fixes at: > > https://cgit.freedesktop.org/~ofourdan/xserver/log/?h=server-1.19-fixes > > I *tried* to pick as many relevant fixes as possible, avoiding new features > (*) and improvements. I hope I haven't introduced any API/ABI breakage along > the way... > > Anyhow, here's a pull request, if that can help... > > Cheers, > Olivier > > (*) For example, I intentionally left the Xwayland tablet patches out, as > these would have introduced a new feature that depends on an updated version > of wayland-protocol.
It doesn't look like my following fix didn't made it into your branch. Overlooked, or didn't make the cut? https://cgit.freedesktop.org/~ofourdan/xserver/commit/?id=2fbf62b2fb3dcb29551251d09aa695715bb754f4 Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... > > ---------------------------------------------------------------- > > The following changes since commit d88937ba8354d6a4e0be2a398037443146701ddc: > > xserver 1.19.3 (2017-03-15 13:44:05 -0400) > > are available in the git repository at: > > git://people.freedesktop.org/~ofourdan/xserver server-1.19-fixes > > for you to fetch changes up to c640c5e9557c20ef5113b9edf271cd066ec98d64: > > glamor: Avoid overflow between box32 and box16 box (2017-09-21 15:35:25 > +0200) > > ---------------------------------------------------------------- > Adam Jackson (4): > parser: Fix crash when xf86nameCompare(s1 = x, s2 = NULL) > ephyr: Don't clobber bitsPerPixel when using glamor > xephyr: Check for host XVideo support before trying to use it > modesetting: Validate the atom for enum properties > > Carlos Garnacho (5): > xwayland: Allow pointer warp on root/None window > xwayland: "Accept" confineTo on InputOnly windows > xwayland: Update root window size when desktop size changes > xwayland: Lock the pointer if it is confined and has no cursor > Xi: Use WarpPointerProc hook on XI pointer warping implementation > > Daniel Stone (1): > modesetting: Set correct DRM event context version > > Eric Anholt (1): > glamor: Fix dashed line rendering. > > Keith Packard (3): > os: un-duplicate code to close client on write failure > os: Mark client as ready to read when closing due to write failure > [100863] > dix: Remove clients from input and output ready queues after closing > > Lyude (1): > xwayland: Don't load extension list more than once > > Martin Peres (1): > modesetting: re-set the crtc's mode when link-status goes BAD > > Michal Srb (5): > Xi: Zero target buffer in SProcXSendExtensionEvent. > dix: Disallow GenericEvent in SendEvent request. > Xi: Verify all events in ProcXSendExtensionEvent. > Xi: Do not try to swap GenericEvent. > Xi: Test exact size of XIBarrierReleasePointer > > Michel Dänzer (1): > glamor: Fix temporary pixmap coordinate offsets > > Olivier Fourdan (9): > glamor: Check for NULL pixmap in glamor_get_pixmap_texture() > Xephyr: Check screen resources creation success > glamor: glamor_set_destination_drawable() can fail > glamor: Check glamor_set_destination_drawable() return value > glamor: avoid a crash if texture allocation failed > glamor: an FBO is not needed for Xv pixmaps > xwayland: Fix a segfault with pointer locking > glamor: handle NULL source picture > glamor: Avoid overflow between box32 and box16 box > > Tobias Stoeckmann (2): > record: Fix OOB access in ProcRecordUnregisterClients > dmx: Fix null pointer dereference > > Xi/sendexev.c | 24 > +++++++++++++++++------- > Xi/xibarriers.c | 9 ++++++--- > Xi/xiwarppointer.c | 4 ++++ > dix/dispatch.c | 4 ++-- > dix/events.c | 6 ++++++ > dix/swapreq.c | 7 +++++++ > glamor/glamor.c | 3 +++ > glamor/glamor_copy.c | 21 ++++++++++++--------- > glamor/glamor_dash.c | 2 +- > glamor/glamor_fbo.c | 4 ++++ > glamor/glamor_glyphblt.c | 26 > ++++++++++++++++---------- > glamor/glamor_largepixmap.c | 11 ++++++----- > glamor/glamor_lines.c | 13 ++++++++----- > glamor/glamor_points.c | 14 ++++++++------ > glamor/glamor_rects.c | 13 ++++++++----- > glamor/glamor_render.c | 5 +++-- > glamor/glamor_segs.c | 14 ++++++++------ > glamor/glamor_spans.c | 13 ++++++++----- > glamor/glamor_transform.c | 11 +++++++++-- > glamor/glamor_transform.h | 2 +- > glamor/glamor_xv.c | 9 ++++++--- > hw/dmx/dmxsync.c | 2 +- > hw/kdrive/ephyr/ephyr.c | 6 ++++-- > hw/kdrive/ephyr/ephyrvideo.c | 5 +++++ > hw/kdrive/ephyr/hostx.c | 6 +++++- > hw/xfree86/drivers/modesetting/drmmode_display.c | 54 > +++++++++++++++++++++++++++++++++++++++++++++++++++++- > hw/xfree86/drivers/modesetting/vblank.c | 2 +- > hw/xfree86/parser/scan.c | 2 ++ > hw/xwayland/xwayland-input.c | 32 > +++++++++++++++++++++++++++++++- > hw/xwayland/xwayland-output.c | 3 +++ > hw/xwayland/xwayland.c | 38 > +++++++++++++++++++++++++++++++++++--- > os/io.c | 38 > +++++++++++++++++++++++++------------- > record/record.c | 3 ++- > 33 files changed, 310 insertions(+), 96 deletions(-) > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: https://lists.x.org/mailman/listinfo/xorg-devel _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
