~thopiekar/xorg-server/+git/xorg-xserver-displaylink.Spintzyk:server-1.12-branch

Last commit made on 2012-10-15
Get this branch:
git clone -b server-1.12-branch https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-xserver-displaylink.Spintzyk

Branch merges

Branch information

Recent commits

01aac1f... by Jeremy Sequoia

XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2

<rdar://problem/12338921>
http://bugs.winehq.org/show_bug.cgi?id=31751

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>
(cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)

9422321... by Peter Hutterer

xfree86: add xf86UpdateDesktopDimensions()

This call is required for external drivers (specifically NVIDIA) that do
not share the xfree86 infrastructure to update the desktop dimensions.
Without it, the driver would update the ScreenRecs but not update the total
dimensions the input code relies on for transformation.

This call is a thin wrapper around the already-existing internal call and
should be backported to all stable series servers, with the minor ABI bump.

Signed-off-by: Peter Hutterer <email address hidden>
CC: Andy Ritger <email address hidden>
Reviewed-by: Aaron Plattner <email address hidden>
(cherry picked from commit 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf)

Conflicts:
 hw/xfree86/common/xf86.h
 hw/xfree86/common/xf86Helper.c
 hw/xfree86/common/xf86Module.h

78c7735... by Jeremy Sequoia

list: Use offsetof() and typeof() to determine member offsets within a structure

Some compilers have difficulty with the previous implementation which
relies on undefined behavior according to the C standard. Using
offsetof() from <stddef.h> (which most likely just uses
__builtin_offsetof on modern compilers) allows us to accomplish this
without ambiguity.

This fix also requires support for typeof(). If your compiler does not
support typeof(), then the old implementation will be used. If you see
failures in test/list, please try a more modern compiler.

v2: Added fallback if typeof() is not present.

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
(cherry picked from commit b8ab93dfbc7f292b5bfe7e9113e1af824ccbd1a8)

dd36e13... by Jeremy Sequoia

test/list: Fix test_xorg_list_del test

We never use child[2], so it's state is undefined.

This issue seems to have existed since the test was first
written: 92788e677be79bd04e5ef140f4ced50ad8b1bf8e

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
(cherry picked from commit c75c947b6e9bc725821b28835f3667c4aabef9ee)

dfc03ef... by Jeremy Sequoia

configure.ac: Version bump to 1.12.4

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>

8995fcf... by Jeremy Sequoia

XQuartz: Bump version to 2.7.3

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>

a6d7400... by Jeremy Sequoia

configure.ac: Version bump to 1.12.3.902 (1.12.4 RC2)

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>

0754f74... by Jeremy Sequoia

XQuartz: console_redirect: Properly zero-out the tail of the array on realloc()

We forgot to multiply by sizeof(), so it wasn't fully zeroed out.

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>
(cherry picked from commit 7c3d2e4828deb4e8ec38e8ef88d6f92b2d931033)

2141f21... by Jeremy Sequoia

XQuartz: console_redirect: Set the correct location for reading into the buffer

Prior to this change, it was possible that a large message would have some
of its data prepended to subsequent messages due to our not incorrectly
setting the location to write into the buffer.

Signed-off-by: Jeremy Huddleston Sequoia <email address hidden>
(cherry picked from commit a32e01802ff1c938c0afe0cc007a273b9ada8610)

73d62f1... by Keith Packard

Only free Render filter names on last screen close

Hotplugging screens causes the render filter names to get freed while
still in use; wait for the last core screen to be closed before
freeing them. That only happens at server reset, when we want them to
be freed.

Signed-off-by: Keith Packard <email address hidden>
Reviewed-by: Dave Airlie <email address hidden>
(cherry picked from commit 19772670e3041fe1c7f5bbf32fa039a6d8245ccb)