xorg-server: Changes to 'debian-unstable'
ChangeLog | 384 +
Xext/xvmc.c | 11
Xi/xichangehierarchy.c | 2
configure.ac | 4
debian/changelog | 9
debian/control | 2
debian/patches/20-workaround-36986.diff | 14
debian/patches/series | 1
dix/devices.c | 40
dix/events.c | 2
dix/window.c | 2
fb/fbbltone.c | 4
glx/Makefile.am | 1
glx/glapi.h | 3
glx/glapi_gentable.c | 7589 ++++++++++++++++++++++++++++++++
hw/xfree86/os-support/linux/lnx_init.c | 83
hw/xquartz/GL/indirect.c | 1079 ----
hw/xquartz/X11Application.m | 27
include/input.h | 2
include/privates.h | 2
randr/rrcrtc.c | 2
randr/rrdispatch.c | 32
randr/rrscreen.c | 12
test/input.c | 3
test/xi2/protocol-common.c | 2
25 files changed, 8188 insertions(+), 1124 deletions(-)
New commits:
commit f9560731930f51ce274d5e562bad674b4ecdef0d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 2 11:59:00 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 10a0f68..b1ff9c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.10.2.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.2.902-1) unstable; urgency=low
* New upstream release (1.10.3 rc2):
- DIX: Set backgroundState correctly for root window (Closes: #632134).
* Drop 20-workaround-36986.diff, fixed upstream.
* Bump Standards-Version to 3.9.2 (no changes).
- -- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:34:25 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:58:58 +0200
xorg-server (2:1.10.2-2) unstable; urgency=low
commit 7c6f5d16669186f12c916da9727ab2e06a6693eb
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 2 11:58:52 2011 +0200
Bump Standards-Version to 3.9.2 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 8070b17..10a0f68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.10.2.902-1) UNRELEASED; urgency=low
* New upstream release (1.10.3 rc2):
- DIX: Set backgroundState correctly for root window (Closes: #632134).
* Drop 20-workaround-36986.diff, fixed upstream.
+ * Bump Standards-Version to 3.9.2 (no changes).
-- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:34:25 +0200
diff --git a/debian/control b/debian/control
index a164787..1e162a6 100644
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Build-Depends:
libglib2.0-dev,
xkb-data,
x11-xkb-utils,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
commit 64c731a92b3ea749be1a59afd77bb3171b3cca2e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 2 11:51:02 2011 +0200
Drop 20-workaround-36986.diff, fixed upstream.
diff --git a/debian/changelog b/debian/changelog
index 986076c..8070b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.10.2.902-1) UNRELEASED; urgency=low
* New upstream release (1.10.3 rc2):
- DIX: Set backgroundState correctly for root window (Closes: #632134).
+ * Drop 20-workaround-36986.diff, fixed upstream.
-- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:34:25 +0200
diff --git a/debian/patches/20-workaround-36986.diff b/debian/patches/20-workaround-36986.diff
deleted file mode 100644
index 24b3cb9..0000000
--- a/debian/patches/20-workaround-36986.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
---- a/test/input.c
-+++ b/test/input.c
-@@ -1213,8 +1213,10 @@
-
- g_assert(v);
- g_assert(v->numAxes == num_axes);
-+#if 0
- g_assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0);
- g_assert(((void*)v->axes - (void*)v) % sizeof(double) == 0);
-+#endif
- num_axes ++;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index a9c30f6..2e0f947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
07-xfree86-fix-build-with-xv-disabled.diff
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
-20-workaround-36986.diff
commit 84f2ef116edb1919a68e9d0cd80e9b6ca04d5d74
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 2 11:50:11 2011 +0200
Close dix/background bug.
diff --git a/debian/changelog b/debian/changelog
index 4cf8117..986076c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.10.2.902-1) UNRELEASED; urgency=low
- * New upstream release (1.10.3 rc2).
+ * New upstream release (1.10.3 rc2):
+ - DIX: Set backgroundState correctly for root window (Closes: #632134).
-- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:34:25 +0200
commit 6fa74ef04b220c7b22c12a61092e45cf0f9623d2
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 2 11:35:41 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index a914e76..0f8c5eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,387 @@
+commit bc3c539e8a2b0b95a19e40258bcb18824d7700cd
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Jul 1 11:34:08 2011 -0700
+
+ configure.ac: Bump version to 1.10.2.902 (1.10.3 RC2)
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 79ef102c3adf7cae8982b05320109d0439e6587c
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon Jun 27 15:06:16 2011 +0100
+
+ Guard use of backtrace() with HAVE_BACKTRACE
+
+ Guard the use of backtrace() with HAVE_BACKTRACE, since we already
+ have the autoconf machinery for setting that.
+
+ For the moment, assume dladdr() is available when backtrace() is
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 38d55f06cfbf4b05fee0aef8f97f90e835beaacb)
+
+commit f0ee98584c909b503691d72c01f76602d0a28ba2
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Jun 21 21:14:46 2011 -0700
+
+ XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
+
+ In addition, this change will not call into the X11 activation unless an X11
+ window was active when we deactivated. We can't rely on the event and current
+ key windows because the key window will be nil until activated, and the event
+ will only reference the window if the window was clicked (whereas it will be
+ nil if we activated via dock or cmd-tab).
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit c8b80a82d97d92d445c1c0af6dba42c9de7c56cd)
+
+commit 1834e82b42a876195d12dda28c80004d37c4fa0c
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Tue May 24 18:33:11 2011 +0200
+
+ Xext: Fix buggy checks.
+
+ XvMCScreenKey is defined as XvMCScreenKeyRec's address, so will never be
+ NULL. Use the check proposed by Alan Coopersmith and Jeremy Huddleston
+ instead.
+
+ Those warnings go away accordingly:
+ | CC xvmc.lo
+ | xvmc.c: In function 'ProcXvMCListSubpictureTypes':
+ | xvmc.c:490:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
+ | xvmc.c: In function 'XvMCExtensionInit':
+ | xvmc.c:671:21: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
+ | xvmc.c: In function 'XvMCFindXvImage':
+ | xvmc.c:749:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ (cherry picked from commit 9da5aa09d70e26dd4d2ef878a21317dae7bf24de)
+
+commit 9fab8b475de99848866c07bde962a5f6ed01b987
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Apr 15 14:06:20 2011 +1000
+
+ input: Only release SD buttons for explicit floating/reattachment (#36146)
+
+ Grabbing an SD device temporary floats the device but we must not release
+ the buttons. Introduced in
+
+ commit 9d23459415b84606ee4f38bb2d19054c432c8552
+ Author: Peter Hutterer <peter.hutterer@who-t.net>
+ Date: Fri Feb 25 11:08:19 2011 +1000
+
+ dix: release all buttons and keys before reattaching a device (#34182)
+
+ X.Org Bug 36146 <http://bugs.freedesktop.org/show_bug.cgi?id=36146>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit bf2059b07a97e5e579c13c2c9d49707093427dc2)
+
+ Conflicts:
+
+ dix/devices.c
+
+commit 160a412e36fd945119e4c10f5d22682fcd0cc637
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Feb 25 11:08:19 2011 +1000
+
+ dix: release all buttons and keys before reattaching a device (#34182)
+
+ Testcase:
+ xinput float <keyboard name>
+
+ results in the keyboard's enter key being repeated as the device is detached
+ while the key is still physically down. To avoid this, release all keys and
+ buttons before reattaching the device.
+
+ X.Org Bug 34182 <http://bugs.freedesktop.org/show_bug.cgi?id=34182>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
+ (cherry picked from commit 9d23459415b84606ee4f38bb2d19054c432c8552)
+ (cherry picked from commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a)
+
+commit c9336d13a6b231edf16412706c52318947fcd000
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Jun 17 10:11:15 2011 -0700
+
+ configure.ac: Bump version to 1.10.2.901 (1.10.3 RC1)
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 0abfba08a080747b1a6310c19f3bea74a6460363
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Jun 2 20:04:04 2011 -0700
+
+ XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch table
+
+ This will allow XQuartz built on older systems to pickup capabilities on
+ newer systems and prevent runtime failures when building on newer systems and
+ running on older ones.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+ This commit squashes three cherry-picks:
+ (cherry picked from commit 3fa5d27e46ea8af55dcaaad7a99973c38bd11967)
+ (cherry picked from commit feab04397de2684568dedaaaa8f299cac9f44f8b)
+ (cherry picked from commit 34e2598f0ad247071bd6a4312d9014d6e3b2305a)
+
+commit 830239ae4271a264e3fd4f1151de271f59b4d9fa
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Jun 14 12:51:04 2011 -0700
+
+ glx: Add _glapi_create_table_from_handle
+
+ _glapi_create_table_from_handle was recently added to mesa to ease creation of
+ a _glapi_table. This commit brings this API over to xserver for use in
+ XQuartz (next commit).
+
+ The API was generated with scripts from current mesa followed by various
+ script-foo to remove entries that are not in the server and add those which
+ are still in the server but not in mesa (CullParameterdvEXT and
+ CullParameterfvEXT)
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit ecec578e35f91a2cbc5d07bc8d45241af7bb585f)
+
+commit b9e5f94e3ca5f93f228393fd599ef35f8fc71fe1
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Jun 5 21:59:13 2011 -0400
+
+ XQuartz: Add missing include for <pthread.h>
+
+ BuildFix for Leopard and earlier.
+
+ https://trac.macports.org/ticket/29717
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit c3df4df40761760b281a21f63336ca955670f7bc)
+
+commit 9551f5041915fa00ca243a279efb55de2ff11a00
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue May 31 14:48:33 2011 +1000
+
+ dix: fix an error message.
+
+ event type, not device type.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit f94898928dfaf8df648bc3eea7d304826b7ac1b8)
+
+ Conflicts:
+
+ dix/events.c
+
+commit 75f75d12cf69ba9b7f14ddf04338ad2df7315550
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 19 14:50:17 2011 +1000
+
+ test: don't test for double alignment on i386. (#36986)
+
+ i386 is one of the few architectures that doesn't need double alignment.
+
+ X.Org Bug 36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 8ef0974874f322e3ce2f3e6be4ab3c7e73a7b380)
+
+ Conflicts:
+
+ test/input.c
+
+commit 2647867c7c8e12fac29b4bd9805efb40d6d87c70
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun May 22 13:50:14 2011 -0700
+
+ fbbltone.c: Mark bitmasks as unsigned ints
+
+ Clears many Sun compiler warnings:
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: initializer will be sign-extended: -16777216
+ "fbbltone.c", line 491: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 491: warning: initializer will be sign-extended: -1
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: initializer will be sign-extended: -256
+ "fbbltone.c", line 495: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 495: warning: initializer will be sign-extended: -1
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: initializer will be sign-extended: -65536
+ "fbbltone.c", line 499: warning: integer overflow detected: op "<<"
+ "fbbltone.c", line 499: warning: initializer will be sign-extended: -1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 1b2d17748f0154da142e9b421d4f6a46e4e5a18c)
+
+commit caaf263b93b17367a96483dec73573415ead9b14
+Author: Nicolas Kaiser <nikai@nikai.net>
+Date: Mon Jun 6 16:53:41 2011 +0200
+
+ randr: void function cannot return value
+
+ Providing an argument to return in a function with void return type
+ is not allowed by the C standard, and makes the Sun compilers unhappy.
+
+ Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 21eec367d0d9c142458f973062e17add4f693033)
+
+commit fe4af41314a6537b3fcc66955ccb6895639738b1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jun 1 10:24:43 2011 +1000
+
+ test: fix memset size for WindowRec (#37801)
+
+ X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda)
+
+commit a4725afa0e77e9fcf6570001dc0de23a7a9ee6cb
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue May 31 13:01:05 2011 -0700
+
+ XQuartz: GLX: Create a new dispatch table rather than modifying the existing one
+
+ Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b
+
+ 0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
+ 1 X11.bin 0x00000001001315b0 DoCreateContext + 163
+ 2 X11.bin 0x000000010013509f __glXDispatch + 211
+ 3 X11.bin 0x00000001000c7dad Dispatch + 785
+ 4 X11.bin 0x00000001000b97e5 dix_main + 1022
+ 5 X11.bin 0x00000001000122bc server_thread + 50
+ 6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
+ 7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
+
+ http://lists.apple.com/archives/X11-users/2011/May/msg00045.html
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 38df706c6b8a339c4267cae7be0881c4362f36da)
+
+commit 6a16c4c268962fd09a52e4e78116aaa3bb1c47d5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 1 21:42:07 2011 -0700
+
+ "privates.h", line 198: warning: void function cannot return value
+
+ Providing an argument to return in a function with void return type
+ is not allowed by the C standard, and makes the Sun compilers unhappy.
+ (They actually flag it as an error, unless using a new enough version
+ to be able to downgrade it to a warning with "-features=extensions".)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ (cherry picked from commit bc04065b5ce277f3ac3491ff221a60ef3c7605cf)
+
+commit 5752cc473648bf73f9ca71b7ccffc03b23e9195b
+Author: Marko Macek <Marko.Macek@gmx.net>
+Date: Sat May 21 13:30:59 2011 +0100
+
+ DIX: Set backgroundState correctly for root window
+
+ When we change the root window's background to None, and we've run with
+ -wr or -br for a forced solid background, make sure we also change the
+ background state to BackgroundPixel, so we don't try to lookup either
+ pScreen->whitePixel or pScreen->blackPixel as a pixmap.
+
+ Signed-off-by: Marko Macek <Marko.Macek@gmx.net>
+ Reviewed-by: Walter Harms <wharms@bfs.de>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a)
+
+commit 4bfb22e7667c4cd55da5e7a31af29ce5769ecc65
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Apr 18 08:23:48 2011 -0700
+
+ linux: Retry VT ioctls while errno == EINTR
+
+ When the smart scheduler is enabled, the VT ioctls (particularly
+ VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs.
+ Previously, this caused the server to immediately continue on to
+ ScreenInit, almost certainly causing a crash or failure because the X
+ server that owned the VT hadn't finished cleaning up. As of commit
+ 7ee965a300c9eddcc1acacf9414cfe3e589222a8, it causes a FatalError
+ instead.
+
+ Retrying the ioctl as long as it fails with errno == EINTR fixes the
+ problem and allows server regenerations to trigger VT switches that
+ actually succeed.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 88c4622b594a1725d0cee86bc82ad640d241c520)
+
+commit 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Tue May 24 16:02:42 2011 -0700
+
+ randr: check rotated virtual size limits correctly
+
+ Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
+ the RandR path that cause RRSetScreenConfig requests to fail if the
+ size is too large. Unfortunately, when RandR 1.1 rotation is enabled
+ it compares the rotated screen dimensions to the unrotated limits,
+ which causes 90- and 270-degree rotation to fail unless your screen
+ happens to be square:
+
+ X Error of failed request: BadValue (integer parameter out of range for operation)
+ Major opcode of failed request: 153 (RANDR)
+ Minor opcode of failed request: 2 (RRSetScreenConfig)
+ Value in failed request: 0x780
+ Serial number of failed request: 14
+ Current serial number in output stream: 14
+
+ Fix this by moving the check above the code that swaps the dimensions
+ based on the rotation.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Tested-by: Robert Hooker <robert.hooker@canonical.com>
+ Tested-by: Kent Baxley <kent.baxley@canonical.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3)
+
+commit 613e0e9ef74c4542ed458200165adbcdfdf3cd17
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Apr 13 11:51:30 2011 -0700
+
+ Send events that were missing from RRSelectInput
+
+ The RANDR spec (randrproto.txt) specifies that RRSelectInput will send out
+ events corresponding to the event mask, if there have been changes to
+ CRTCs or outputs. Only screen events were being generated, however.
+
+ Fixes http://bugs.freedesktop.org/21760
+
+ Signed-off-by: Federico Mena Quintero <federico@novell.com>
+ Reviewd-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit b2997431fd426ab318bc5dfd2cd43956d733ebec)
+
commit d784fd09dc277610d5f4e98d577c4fdcd9215f9c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 28 16:59:05 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 09ad810..4cf8117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.10.2.902-1) UNRELEASED; urgency=low
+
+ * New upstream release (1.10.3 rc2).
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:34:25 +0200
+
xorg-server (2:1.10.2-2) unstable; urgency=low
* Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the
commit bc3c539e8a2b0b95a19e40258bcb18824d7700cd
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jul 1 11:34:08 2011 -0700
configure.ac: Bump version to 1.10.2.902 (1.10.3 RC2)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 9aa8211..b6c651d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.10.2.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-06-17"
+AC_INIT([xorg-server], 1.10.2.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-07-01"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 79ef102c3adf7cae8982b05320109d0439e6587c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 27 15:06:16 2011 +0100
Guard use of backtrace() with HAVE_BACKTRACE
Guard the use of backtrace() with HAVE_BACKTRACE, since we already
have the autoconf machinery for setting that.
For the moment, assume dladdr() is available when backtrace() is
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 38d55f06cfbf4b05fee0aef8f97f90e835beaacb)
diff --git a/glx/glapi_gentable.c b/glx/glapi_gentable.c
index a9ba3af..b49ae20 100644
--- a/glx/glapi_gentable.c
+++ b/glx/glapi_gentable.c
@@ -31,7 +31,10 @@
#include <dix-config.h>
#endif
+#ifdef HAVE_BACKTRACE
#include <execinfo.h>
+#endif
+
#include <dlfcn.h>
#include <stdlib.h>
#include <stdio.h>
@@ -46,6 +49,8 @@
static void
__glapi_gentable_NoOp(void) {
const char *fstr = "Unknown";
+
+#ifdef HAVE_BACKTRACE
void *frames[2];
if(backtrace(frames, 2) == 2) {
@@ -54,6 +59,7 @@ __glapi_gentable_NoOp(void) {
if(info.dli_sname)
fstr = info.dli_sname;
}
+#endif
LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\n", fstr);
}
commit f0ee98584c909b503691d72c01f76602d0a28ba2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jun 21 21:14:46 2011 -0700
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
In addition, this change will not call into the X11 activation unless an X11
window was active when we deactivated. We can't rely on the event and current
key windows because the key window will be nil until activated, and the event
will only reference the window if the window was clicked (whereas it will be
nil if we activated via dock or cmd-tab).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit c8b80a82d97d92d445c1c0af6dba42c9de7c56cd)
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index a5159b6..17e6b27 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -334,18 +334,21 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
case NSAppKitDefined:
switch ([e subtype]) {
+ static BOOL x_was_active = NO;
+
case NSApplicationActivatedEventType:
for_x = NO;
- if ([self modalWindow] == nil) {
+ if ([e window] == nil && x_was_active) {
BOOL order_all_windows = YES, workspaces, ok;
for_appkit = NO;
-
- /* FIXME: hack to avoid having to pass the event to appkit,
- which would cause it to raise one of its windows. */
+
+ /* FIXME: This is a hack to avoid passing the event to AppKit which
+ * would result in it raising one of its windows.
+ */
_appFlags._active = YES;
-
- [self activateX:YES];
-
+
+ X11ApplicationSetFrontProcess();
+
/* Get the Spaces preference for SwitchOnActivate */
(void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);
@@ -366,8 +369,9 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
* If there are no active windows, and there are minimized windows, we should
* be restoring one of them.
*/
- if ([e data2] & 0x10) // 0x10 is set when we use cmd-tab or the dock icon
+ if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);
+ }
}
break;
@@ -377,7 +381,10 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
case NSApplicationDeactivatedEventType:
for_x = NO;
- [self activateX:NO];
+
+ x_was_active = _x_active;
+ if(_x_active)
+ [self activateX:NO];
break;
}
break;
commit 1834e82b42a876195d12dda28c80004d37c4fa0c
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:11 2011 +0200
Xext: Fix buggy checks.
XvMCScreenKey is defined as XvMCScreenKeyRec's address, so will never be
NULL. Use the check proposed by Alan Coopersmith and Jeremy Huddleston
instead.
Those warnings go away accordingly:
| CC xvmc.lo
| xvmc.c: In function 'ProcXvMCListSubpictureTypes':
| xvmc.c:490:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
| xvmc.c: In function 'XvMCExtensionInit':
| xvmc.c:671:21: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
| xvmc.c: In function 'XvMCFindXvImage':
| xvmc.c:749:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
(cherry picked from commit 9da5aa09d70e26dd4d2ef878a21317dae7bf24de)
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 8fbdfae..61ba95f 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -487,8 +487,8 @@ ProcXvMCListSubpictureTypes(ClientPtr client)
pScreen = pPort->pAdaptor->pScreen;
- if(XvMCScreenKey == NULL) /* No XvMC adaptors */
- return BadMatch;
+ if (!dixPrivateKeyRegistered(XvMCScreenKey))
+ return BadMatch; /* No XvMC adaptors */
if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))
return BadMatch; /* None this screen */
@@ -668,8 +668,8 @@ XvMCExtensionInit(void)
{
ExtensionEntry *extEntry;
- if(XvMCScreenKey == NULL) /* nobody supports it */
- return;
+ if (!dixPrivateKeyRegistered(XvMCScreenKey))
+ return;
if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes,
"XvMCRTContext")))
@@ -746,7 +746,8 @@ XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
XvMCAdaptorPtr adaptor = NULL;
int i;
- if(XvMCScreenKey == NULL) return NULL;
+ if (!dixPrivateKeyRegistered(XvMCScreenKey))
+ return NULL;
if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))
return NULL;
commit 9fab8b475de99848866c07bde962a5f6ed01b987
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 15 14:06:20 2011 +1000
input: Only release SD buttons for explicit floating/reattachment (#36146)
Grabbing an SD device temporary floats the device but we must not release
the buttons. Introduced in
commit 9d23459415b84606ee4f38bb2d19054c432c8552
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 25 11:08:19 2011 +1000
dix: release all buttons and keys before reattaching a device (#34182)
X.Org Bug 36146 <http://bugs.freedesktop.org/show_bug.cgi?id=36146>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit bf2059b07a97e5e579c13c2c9d49707093427dc2)
Conflicts:
dix/devices.c
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index 21c74ed..15eb5c9 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -353,6 +353,7 @@ detach_slave(ClientPtr client, xXIDetachSlaveInfo *c, int flags[MAXDEVICES])
goto unwind;
}
+ ReleaseButtonsAndKeys(dev);
AttachDevice(client, dev, NULL);
flags[dev->id] |= XISlaveDetached;
@@ -404,6 +405,7 @@ attach_slave(ClientPtr client, xXIAttachSlaveInfo *c,
goto unwind;
}
+ ReleaseButtonsAndKeys(dev);
AttachDevice(client, dev, newmaster);
flags[dev->id] |= XISlaveAttached;
diff --git a/dix/devices.c b/dix/devices.c
index 827c328..aa391a1 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2410,7 +2410,7 @@ RecalculateMasterButtons(DeviceIntPtr slave)
* Generate release events for all keys/button currently down on this
* device.
*/
-static void
+void
ReleaseButtonsAndKeys(DeviceIntPtr dev)
{
EventListPtr eventlist = InitEventList(GetMaximumEventsNum());
@@ -2479,8 +2479,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
free(dev->spriteInfo->sprite);
}
- ReleaseButtonsAndKeys(dev);
-
oldmaster = dev->u.master;
dev->u.master = master;
diff --git a/include/input.h b/include/input.h
index 908e595..95aae43 100644
--- a/include/input.h
+++ b/include/input.h
@@ -495,6 +495,8 @@ extern _X_EXPORT int GetMotionHistory(
ScreenPtr pScreen,
BOOL core);
+extern void ReleaseButtonsAndKeys(DeviceIntPtr dev);
+
extern int AttachDevice(ClientPtr client,
DeviceIntPtr slave,
DeviceIntPtr master);
commit 160a412e36fd945119e4c10f5d22682fcd0cc637
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 25 11:08:19 2011 +1000
dix: release all buttons and keys before reattaching a device (#34182)
Testcase:
xinput float <keyboard name>
results in the keyboard's enter key being repeated as the device is detached
while the key is still physically down. To avoid this, release all keys and
buttons before reattaching the device.
X.Org Bug 34182 <http://bugs.freedesktop.org/show_bug.cgi?id=34182>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
(cherry picked from commit 9d23459415b84606ee4f38bb2d19054c432c8552)
(cherry picked from commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a)
diff --git a/dix/devices.c b/dix/devices.c
index fed05f5..827c328 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2407,6 +2407,46 @@ RecalculateMasterButtons(DeviceIntPtr slave)
}
/**
+ * Generate release events for all keys/button currently down on this
+ * device.
+ */
+static void
+ReleaseButtonsAndKeys(DeviceIntPtr dev)
+{
+ EventListPtr eventlist = InitEventList(GetMaximumEventsNum());
+ ButtonClassPtr b = dev->button;
+ KeyClassPtr k = dev->key;
+ int i, j, nevents;
+
+ if (!eventlist) /* no release events for you */
+ return;
+
+ /* Release all buttons */
+ for (i = 0; b && i < b->numButtons; i++)
+ {
+ if (BitIsOn(b->down, i))
+ {
+ nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL);
+ for (j = 0; j < nevents; j++)
+ mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);
+ }
+ }
+
+ /* Release all keys */
+ for (i = 0; k && i < MAP_LENGTH; i++)
+ {
+ if (BitIsOn(k->down, i))
+ {
+ nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);
+ for (j = 0; j < nevents; j++)
+ mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);
+ }
+ }
+
+ FreeEventList(eventlist, GetMaximumEventsNum());
+}
+
+/**
* Attach device 'dev' to device 'master'.
* Client is set to the client that issued the request, or NULL if it comes
* from some internal automatic pairing.
@@ -2439,6 +2479,8 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
free(dev->spriteInfo->sprite);
}
+ ReleaseButtonsAndKeys(dev);
+
oldmaster = dev->u.master;
dev->u.master = master;
commit c9336d13a6b231edf16412706c52318947fcd000
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jun 17 10:11:15 2011 -0700
configure.ac: Bump version to 1.10.2.901 (1.10.3 RC1)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 398d16f..9aa8211 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.10.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-05-28"
+AC_INIT([xorg-server], 1.10.2.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-06-17"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 0abfba08a080747b1a6310c19f3bea74a6460363
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jun 2 20:04:04 2011 -0700
XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch table
This will allow XQuartz built on older systems to pickup capabilities on
newer systems and prevent runtime failures when building on newer systems and
running on older ones.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit squashes three cherry-picks:
(cherry picked from commit 3fa5d27e46ea8af55dcaaad7a99973c38bd11967)
(cherry picked from commit feab04397de2684568dedaaaa8f299cac9f44f8b)
(cherry picked from commit 34e2598f0ad247071bd6a4312d9014d6e3b2305a)
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index db4fe83..c46ba9d 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -2,7 +2,7 @@
* GLX implementation that uses Apple's OpenGL.framework
* (Indirect rendering path -- it's also used for some direct mode code too)
*
- * Copyright (c) 2007, 2008, 2009 Apple Inc.
+ * Copyright (c) 2007-2011 Apple Inc.
* Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
* Copyright (c) 2002 Greg Parker. All Rights Reserved.
*
@@ -35,126 +35,28 @@
#include <dix-config.h>
#endif
-#include "dri.h"
-
#include <AvailabilityMacros.h>
-#define GL_GLEXT_WUNDEF_SUPPORT
+#include <dlfcn.h>
#include <OpenGL/OpenGL.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
Reply to: