[pull 1.12] fixes and reverts from debian's 1.12 tree

Julien Cristau jcristau at debian.org
Mon Nov 5 13:59:13 PST 2012

Hi Jeremy,

the fb revert fixes a regression in (which seems to also
affect 1.13).  I don't know if that's the proper fix, but a regression
in stable seems like a bad thing.

The kdrive revert is also a regression in (and is in master),
and the loader revert is a regression from 1.11 (I don't know if it
affects newer releases).

The other two cherry-picks should be straightforward enough.


The following changes since commit 01aac1f533d211c90a50127cc82a56bebb44dd0d:

  XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2 (2012-10-14 17:42:25 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~jcristau/xserver server-1.12-branch

for you to fetch changes up to bea94ca24d95e5b60c219e84f9e68f92cded840c:

  EXA: Track source/mask pixmaps more explicitly for Composite fallback regions. (2012-11-05 20:35:56 +0100)

Julien Cristau (3):
      Revert "kinput: allocate enough space for null character."
      Revert "fb: reorder Bresenham error correction to avoid overshoot."
      Revert "Unload submodules."

Michel Dänzer (1):
      EXA: Track source/mask pixmaps more explicitly for Composite fallback regions.

Stephan Schreiber (1):
      int10: fix pci_device_read_rom usage

 exa/exa_priv.h                 |    1 +
 exa/exa_unaccel.c              |   16 ++++++++++++----
 fb/fbseg.c                     |   18 +++++++++---------
 hw/kdrive/src/kinput.c         |    2 +-
 hw/xfree86/common/xf86Helper.c |    6 ++++++
 hw/xfree86/int10/generic.c     |    3 ++-
 6 files changed, 31 insertions(+), 15 deletions(-)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20121105/9742a98a/attachment.pgp>

More information about the xorg-devel mailing list