[PULL] screensaver/dpms fix, sysconfigdir, pointer accel revert

Peter Hutterer peter.hutterer at who-t.net
Sun Jul 13 22:30:05 PDT 2014


Please pull the changes below. The revert explains itself in the commit
message but the long story short here is that it doesn't work for all
devices and fixing it in a sane manner requires lockstep between the server
and synaptics. That requires an ABI bump and given how close we are to the
release I prefer to just restore the previous behaviour and fix this up in a
set of patches as follow-up.

The following changes since commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3:

  Merge remote-tracking branch 'jturney/master' (2014-07-07 16:53:07 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 9a19bf06b5b409fa0d5b5932e29cd4c5545052c5:

  Revert "dix: fix up coordinate scaling when external monitors are present" (2014-07-14 15:05:58 +1000)

Aaron Plattner (1):
      xfree86: Only support one sysconfigdir

Peter Hutterer (3):
      os: prevent negative array index access (#80890)
      xfree86: don't force the screensaver off on DPMS unblank, merely suggest it
      Revert "dix: fix up coordinate scaling when external monitors are present"

 dix/getevents.c                | 80 +++++++++++-------------------------------
 hw/xfree86/common/xf86Config.c |  2 +-
 hw/xfree86/common/xf86DPMS.c   |  2 +-
 os/log.c                       |  2 +-
 4 files changed, 23 insertions(+), 63 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140714/69aef887/attachment.sig>

More information about the xorg-devel mailing list