ChangeLog | 610 +++++++++++++++++++++++++++----------------
Makefile.am | 4
Xext/xselinux.c | 159 +++++++----
Xext/xtest.c | 14
Xi/xiproperty.c | 129 +++++++++
configure.ac | 8
debian/changelog | 8
glx/Makefile.am | 1
glx/glxcmds.c | 44 ++-
glx/glxdrawable.h | 5
glx/glxdri.c | 2
glx/glxdri2.c | 2
glx/glxdriswrast.c | 2
glx/glxext.c | 42 ++
glx/glxext.h | 1
glx/glxutil.h | 9
hw/xfree86/modes/xf86Crtc.c | 4
include/dix-config.h.in | 2
include/exevents.h | 12
include/xserver-properties.h | 4
randr/rrdispatch.c | 2
xkb/xkbUtils.c | 4
22 files changed, 744 insertions(+), 324 deletions(-)
New commits:
commit ad6663e57f329e6f1bf6277116583c44d32d7bc9
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Apr 15 13:31:03 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5ea40c3..3713af9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.6.1-1) UNRELEASED; urgency=low
+xorg-server (2:1.6.1-1) unstable; urgency=low
[ Julien Cristau ]
* Disable dri2 on hurd-i386. Thanks, Samuel Thibault!
@@ -6,7 +6,7 @@ xorg-server (2:1.6.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
- -- Brice Goglin <bgog...@debian.org> Wed, 15 Apr 2009 13:20:46 +0200
+ -- Brice Goglin <bgog...@debian.org> Wed, 15 Apr 2009 13:30:51 +0200
xorg-server (2:1.6.0-1) unstable; urgency=low
commit 7aaae1dbe930c33b56b5cf10f14c685e85e4d6c2
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Apr 15 13:21:12 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 1a8319a..4e012b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,175 @@
+commit cd321badf0c185854b3e0c038f3851a3ac7864ea
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Apr 14 16:08:11 2009 -0400
+
+ xserver 1.6.1
+
+commit fcffa3a178683ede0d15656c432fccf23ebca5ef
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Mar 25 15:51:43 2009 +1000
+
+ Xext: set POINTER_SCREEN flag in XTestFakeInput if necessary. (RH #490984)
+
+ The POINTER_SCREEN flag must be set explicitly for XTest core events to
avoid
+ out-of-range events when the lastSlave was an SD with an explicit axis
range.
+ Device events sent through XTest don't need this flag, they are expected
to be
+ in the valuator range of the device anyway.
+
+ Red Hat Bug 490984 <https://bugzilla.redhat.com/show_bug.cgi?id=490984>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 603db34337a61754e0c5f71525011d10eab78411)
+
+commit 6ff60c626141771b365d557fe64bc93f200d1c9c
+Author: Kristian Høgsberg <k...@redhat.com>
+Date: Thu Apr 9 13:16:37 2009 -0400
+
+ glx: Fix drawable private leak on destroy
+
+ When a drawable goes away, we don't destroy the GLX drawable in full,
+ since it may be current for a context. This means that when the drawable
+ is destroyed in full later, the backend doesn't get a chance to
+ destroy resources associated with the drawable (the DRI2Drawable).
+
+ With this patch, we destroy the GLX drawable in full when it goes away
+ and then track down all contexts that reference it and NULL their
+ pointers.
+
+ (cherry picked from commit 7b6400a1b8d2f228fcbedf17c30a7e3924e4dd2a)
+
+commit 50894e13545538ed93f20823f7ba81d1ab8906bb
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Thu Apr 9 02:48:04 2009 -0400
+
+ xselinux: Don't BadAlloc in List* requests if there are no items to list.
+ (cherry picked from commit 682d7b55699cacbb2dbcd84a5e816bf6e2d2f02a)
+
+commit feb01d7d6e98fa77f9069b08aaa9727368ef3aaf
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Wed Apr 8 15:10:16 2009 -0400
+
+ xselinux: Don't require incoming context strings to be null-terminated.
+ (cherry picked from commit e8b324102f6e21ae2b8292a6f50d016dd6254dd6)
+
+commit b7dc7374bbcb708eee6eec26ff141619f914d8eb
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Mon Mar 9 17:28:40 2009 -0400
+
+ Correct access mode in call to dixLookupWindow() within RRSelectInput.
+
+ Reported by Alan Coopersmith.
+ (cherry picked from commit 6544490700051b3b5e88ac1890d71b35634c9100)
+
+commit 38b0f9edca80e43b4c8c364cfebc25c835d24cbd
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Mar 27 16:49:45 2009 -0400
+
+ Fix distcheck with dolt
+
+commit 509986d6f0255588f37446173ea76640895c9886
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Mar 27 16:28:26 2009 -0400
+
+ Fix Changelog generation
+
+commit 0f9fd02dacf4363c0efd69825bc804bfb55599bf
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Mar 16 13:24:48 2009 -0400
+
+ selinux: Add support for avc_acquire_netlink_fd()
+
+ Requires libselinux 2.0.79 or newer. Without this, libselinux will
+ check for policy updates on the netlink socket on basically every policy
+ lookup. Statistically speaking, they never happen, and the check
+ translates to at least one more syscall on basically every operation.
+
+ Instead, take control of the fd from the library, and check it in
+ WakeupHandler if it polls readable.
+ (cherry picked from commit 3992dd38caf33b343affd8d732c94880d1099dcf)
+
+commit b3484c848040ae29b8ca1327d3b142db30c38387
+Author: Adam Jackson <a...@redhat.com>
+Date: Sat Feb 21 19:56:20 2009 -0500
+
+ selinux: Don't bother relabeling resources that are being destroyed
+
+ Makes window destroy about 40x faster in Xvfb.
+ (cherry picked from commit b030f858f2f1ce1fd27a73ebf7f9ec5db541a668)
+
+commit 08ac9140f6042ce3faa618613fc8443c92924a21
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Feb 13 09:56:22 2009 +1000
+
+ xkb: Fix wrong colour reference in XKB geometry copying. #20081
+
+ base_color and label_color need to reference the color in the destination,
not
+ in the source.
+
+ X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+ (cherry picked from commit f5bf1fdaf36163d5c2f1b9b51df96326ebbb0e9c)
+
+commit 124da1da5cd3ac85edd7f0e30f61ee842d49a6a4
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Mar 9 08:59:01 2009 +1000
+
+ Xi: don't crash on a NULL property name, just return None.
+
+ strcmp doesn't like NULL-pointers.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ (cherry picked from commit 0d9a42dc0380d1583889b6b6521bd5a2451735d4)
+
+commit ea9f51fd42ae0285aed707b7efa44c558dad4e4b
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Dec 5 16:24:57 2008 +1000
+
+ Xi: add XATOM_FLOAT to server-defined properties.
+
+ This property is used to denote type float for input properties. Such
+ properties can be accessed easily through the XIPropToFloat() function.
+
+ Code originally written by Simon Thum.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@redhat.com>
+ (cherry picked from commit a48c81dcdf569a3f634ac23e08d2491354de6a36)
+
+commit 6ad6b6f900e9c3a55e4ee509bdc9ff0ddec9a59a
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Wed Nov 19 15:50:57 2008 +1000
+
+ Xi: add XIPropToInt() auxiliary function.
+
+ Converts an XIPropertyValuePtr to an integer, provided that type and
format is
+ right.
+
+ Code originally written by Simon Thum.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@redhat.com>
+ (cherry picked from commit 669f6810af9a89187d6149841925fe765f3988ff)
+
+commit 667865b9eb98ed73461028b3d38be19619712533
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Mar 2 14:26:23 2009 -0500
+
+ randr: Fix thinko in xf86TargetPreferred
+
+ The only-one-output case would only work right if that also happened to
+ be the zeroth output. Oops.
+ (cherry picked from commit 8a6ed44a8b2fc5f14729dc54fec17607ced03859)
+
+commit f469726fec502ce29999eda6919c3c3d26c127d8
+Author: Eric Paris <epa...@redhat.com>
+Date: Tue Mar 3 13:15:39 2009 -0500
+
+ This patch changes all places in the X code to use _raw functions. The
+ X server should never see, translate, or deal with a munged context.
+ Display managers which show contexts to the user should take care of
+ translating these to human readable form.
+ (cherry picked from commit c7cf926d25523d5d0d8e5c83671c901660070d71)
+
commit 60c161545af80eb78eb790a05bde79409dfdf16e
Author: Keith Packard <kei...@keithp.com>
Date: Wed Feb 25 12:05:44 2009 -0800
@@ -385,7 +557,7 @@ Date: Mon Feb 2 10:20:13 2009 +1000
Signed-off-by: Keith Packard <kei...@keithp.com>
commit 536748aa88f82e4157b86ed1a02b798b1510bdb8
-Merge: 8c6ddbf... be21199...
+Merge: 8c6ddbf be21199
Author: Keith Packard <kei...@keithp.com>
Date: Tue Feb 17 18:52:04 2009 -0800
@@ -944,7 +1116,7 @@ Date: Tue Dec 9 23:48:18 2008 -0800
(cherry picked from commit 1962af7ee3bdf54cfa674187dea67b9ad36cd5a1)
commit fdfc70ea0a183daaabb9bb436f2b0cbf95f47e88
-Merge: 8cfb353... 82f4273...
+Merge: 8cfb353 82f4273
Author: Keith Packard <kei...@keithp.com>
Date: Mon Jan 12 10:40:04 2009 -0800
@@ -2365,7 +2537,7 @@ Date: Tue Nov 25 23:15:35 2008 -0800
New version of dolt
commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b
-Merge: 9ffc671... ed597f1...
+Merge: 9ffc671 ed597f1
Author: Keith Packard <kei...@keithp.com>
Date: Tue Nov 25 22:19:08 2008 -0800
@@ -3246,7 +3418,7 @@ Date: Fri Nov 21 12:21:45 2008 +1000
Signed-off-by: Peter Hutterer <peter.hutte...@redhat.com>
commit 387563b77743d92be83420d982eaf57f5459a883
-Merge: 85f650c... f6e01fa...
+Merge: 85f650c f6e01fa
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Sun Nov 23 13:15:46 2008 +0100
@@ -3648,7 +3820,7 @@ Date: Fri Nov 14 12:36:20 2008 -0500
Signed-off-by: James Cloos <cl...@jhcloos.com>
commit ba4e08244ed3923eecf26842dfc1df17c696e053
-Merge: 81fd17f... 5bad5d2...
+Merge: 81fd17f 5bad5d2
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Thu Nov 13 15:04:18 2008 -0500
@@ -10646,7 +10818,7 @@ Date: Mon May 26 17:56:08 2008 +0930
Signed-off-by: Peter Hutterer <pe...@cs.unisa.edu.au>
commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709
-Merge: 5fe5778... 2958610...
+Merge: 5fe5778 2958610
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 26 17:37:31 2008 +0930
@@ -11125,7 +11297,7 @@ Date: Wed May 21 21:51:27 2008 +0930
Big boss says UniSA isn't unique enough. Who am I to argue?
commit 7509fb498c02fe1cebe4139612b8871ec877c130
-Merge: 2ae3bed... dfb7de6...
+Merge: 2ae3bed dfb7de6
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Wed May 21 16:25:35 2008 +0930
@@ -11185,7 +11357,7 @@ Date: Tue May 20 10:54:32 2008 +0930
fb: shut up two compiler warnings.
commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958
-Merge: fc7e256... 0178b6a...
+Merge: fc7e256 0178b6a
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Tue May 20 10:20:14 2008 +0930
@@ -11785,7 +11957,7 @@ Date: Fri May 9 15:38:44 2008 -0700
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
commit 7b3066d9b9099135d9c49e0682161d5568fc535b
-Merge: 2a3d142... 315f089...
+Merge: 2a3d142 315f089
Author: Drew Parsons <d...@emerall.com>
Date: Sat May 10 00:01:15 2008 +1000
@@ -11885,7 +12057,7 @@ Date: Thu May 8 16:04:24 2008 -0400
Bug #13104: Remove broken XAA a1 glyph fast path.
commit ddaecfa13cefee7c66b39b606c8640c6544d4943
-Merge: 9c2e087... cf20df3...
+Merge: 9c2e087 cf20df3
Author: Adam Jackson <a...@redhat.com>
Date: Thu May 8 14:33:58 2008 -0400
@@ -12143,7 +12315,7 @@ Date: Fri May 2 14:56:58 2008 +0930
xfree86: don't try to repaint the cursor before cursors exist.
commit 334456952930cb3e55c02fcdada2d0c074cd0520
-Merge: 8e56fd9... 3b8d534...
+Merge: 8e56fd9 3b8d534
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Fri May 2 11:00:14 2008 +0930
@@ -13052,7 +13224,7 @@ Date: Mon Apr 21 22:06:38 2008 -0700
(cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
commit 8190ef87547b704848231bde10b1cdffc6442790
-Merge: 179a082... 2ddbfd3...
+Merge: 179a082 2ddbfd3
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Tue Apr 22 18:04:05 2008 +0930
@@ -13690,7 +13862,7 @@ Date: Mon Apr 14 09:58:49 2008 +0200
EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8.
commit 1a9d7205cd5640eb65f019336097d86301942ea7
-Merge: 90f491c... 6866e84...
+Merge: 90f491c 6866e84
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon Apr 14 16:25:58 2008 +0930
@@ -13875,7 +14047,7 @@ Date: Fri Feb 22 11:01:51 2008 +1030
X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
commit 90f491cf8eb869f27c4278b26c1bb84432b12d63
-Merge: cbe01b3... b4380d8...
+Merge: cbe01b3 b4380d8
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Fri Apr 11 08:29:52 2008 +0930
@@ -14068,7 +14240,7 @@ Date: Tue Apr 8 20:37:25 2008 -0700
(cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
commit cbe01b3083eb65c9d4259b1071683febebf11600
-Merge: 5ffbcfe... 389dae7...
+Merge: 5ffbcfe 389dae7
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Wed Apr 9 10:46:46 2008 +0930
@@ -14168,7 +14340,7 @@ Date: Thu Apr 3 14:50:05 2008 -0400
EXA: Fix TS origin computation when implementing RenderComposite with
tiling.
commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab
-Merge: b46a009... 6c0cfe3...
+Merge: b46a009 6c0cfe3
Author: Peter Hutterer <w...@potoroo.wearablelab.ml.unisa.edu.au>
Date: Mon Apr 7 07:56:41 2008 +0930
@@ -14180,7 +14352,7 @@ Date: Mon Apr 7 07:56:41 2008 +0930
dix/dispatch.c
commit 539bf3c2836727e7560c64144071b086f8ea32fe
-Merge: 3ab33e7... 6c0cfe3...
+Merge: 3ab33e7 6c0cfe3
Author: Sascha Hlusiak <saschahlus...@arcor.de>
Date: Mon Apr 7 00:10:16 2008 +0200
@@ -14641,7 +14813,7 @@ Date: Thu Mar 27 15:18:39 2008 +1000
RH BZ 435216
commit 9df915b84d45d39aed7557c98883b20a66da2e96
-Merge: 47eb658... 333e712...
+Merge: 47eb658 333e712
Author: Sascha Hlusiak <saschahlus...@arcor.de>
Date: Tue Mar 25 17:50:50 2008 +0100
@@ -15183,7 +15355,7 @@ Date: Tue Mar 4 02:44:48 2008 -0500
XACE: Check the return value of the selection create hook call.
commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd
-Merge: 23ae68a... 453661a...
+Merge: 23ae68a 453661a
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Tue Mar 4 18:11:10 2008 +1030
@@ -16642,7 +16814,7 @@ Date: Fri Feb 1 14:13:29 2008 +1030
Reviewed-by: Peter Hutterer <pe...@cs.unisa.edu.au>
commit e5e531ce96264518f278f572a4d0bfcd345aa618
-Merge: 6c38682... 1692dcf...
+Merge: 6c38682 1692dcf
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Thu Jan 31 16:36:17 2008 +1030
@@ -16759,14 +16931,14 @@ Date: Mon Jan 28 12:18:43 2008 -0800
(cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)
commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f
-Merge: 1a88aed... e915a26...
+Merge: 1a88aed e915a26
Author: David Nusinow <dnusi...@debian.org>
Date: Sat Jan 26 16:13:25 2008 -0500
Merge commit 'upstream/master'
commit 0ac175597712edfeae676f536746a4d26d625e30
-Merge: 210eeef... e915a26...
+Merge: 210eeef e915a26
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Sat Jan 26 13:55:07 2008 +1030
@@ -17220,7 +17392,7 @@ Date: Wed Jan 9 19:52:00 2008 -0800
More Xv extension byte swapping fixes
commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca
-Merge: 4e85c7c... 0883e83...
+Merge: 4e85c7c 0883e83
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Thu Jan 10 13:38:46 2008 +1030
@@ -17456,7 +17628,7 @@ Date: Thu Jan 3 18:09:56 2008 +1030
dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc.
commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d
-Merge: eace889... ae869fc...
+Merge: eace889 ae869fc
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Thu Jan 3 17:04:54 2008 +1030
@@ -18095,7 +18267,7 @@ Date: Fri Dec 14 00:53:54 2007 -0500
Bump video driver ABI and extension ABI for devPrivates rework.
commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629
-Merge: 1c1a4bc... cb0d7e2...
+Merge: 1c1a4bc cb0d7e2
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Fri Dec 14 00:32:24 2007 -0500
@@ -18143,7 +18315,7 @@ Date: Thu Dec 13 15:55:28 2007 -0800
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
commit c8feb73f5841e7812d8dfdb91f1064e2033d028c
-Merge: 9a7ce57... a125ce4...
+Merge: 9a7ce57 a125ce4
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Thu Dec 13 18:38:25 2007 -0500
@@ -19610,7 +19782,7 @@ Date: Mon Nov 19 21:01:22 2007 -0500
during merge conflict resolution.
commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94
-Merge: 60be452... ea9c63e...
+Merge: 60be452 ea9c63e
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Mon Nov 19 18:10:46 2007 -0500
@@ -19938,7 +20110,7 @@ Date: Thu Nov 8 17:25:36 2007 -0500
Don't sleep(1) at server exit.
commit 1603130236c55ddabc3854d4ba62d544debcf1f5
-Merge: f207e69... f7dd0c7...
+Merge: f207e69 f7dd0c7
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Wed Nov 14 13:35:50 2007 -0500
@@ -20315,7 +20487,7 @@ Date: Thu Nov 8 10:00:35 2007 +1030
Also clean up to return error codes instead of sending the error manually.
commit 184a7b8917a15bb2c719153b9b016c03aab42101
-Merge: a8808ac... 0b72905...
+Merge: a8808ac 0b72905
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Thu Nov 8 09:34:35 2007 +1030
@@ -20326,7 +20498,7 @@ Date: Thu Nov 8 09:34:35 2007 +1030
Xi/opendev.c
commit e94ab0b502160376d1956345196f7e1c7e2e886f
-Merge: 26e1fc7... 9bee1c6...
+Merge: 26e1fc7 9bee1c6
Author: Dodji Seketeli <do...@openedhand.com>
Date: Wed Nov 7 19:04:24 2007 +0100
@@ -20365,7 +20537,7 @@ Date: Wed Nov 7 18:43:16 2007 +0100
XNEST_LIBS contains the right thing.
commit 0b729051c04da7068f1e6dd319190bd0a362b2c0
-Merge: b7ee005... d7c5e8b...
+Merge: b7ee005 d7c5e8b
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Wed Nov 7 15:37:23 2007 +1030
@@ -20464,7 +20636,7 @@ Date: Tue Nov 6 16:26:09 2007 -0500
on the x11perf benchmark.
commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500
-Merge: 868e303... ddce48e...
+Merge: 868e303 ddce48e
Author: Dodji Seketeli <do...@openedhand.com>
Date: Tue Nov 6 16:25:40 2007 +0100
@@ -20491,7 +20663,7 @@ Date: Tue Nov 6 09:40:14 2007 +0000
to subsequent assertion failure in libdbus.
commit a52c9b2a59f27266557ff9d5d2c08492e04135a6
-Merge: c7e18be... 5833289...
+Merge: c7e18be 5833289
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Mon Nov 5 19:08:36 2007 -0500
@@ -20519,7 +20691,7 @@ Date: Mon Nov 5 15:01:13 2007 -0500
xselinux: Register SELinux extension protocol names.
commit 632c33c5c18b3e091c4fce98280af4d583e99640
-Merge: 4113f04... dda10c9...
+Merge: 4113f04 dda10c9
Author: Dodji Seketeli <do...@openedhand.com>
Date: Mon Nov 5 17:52:33 2007 +0100
@@ -21189,7 +21361,7 @@ Date: Thu Oct 25 12:35:01 2007 -0400
xselinux: Label the default device directly with the process context.
commit b633d54b94d746d26e13014634d9f63bbb7e8f7d
-Merge: 4b05f19... 48ca596...
+Merge: 4b05f19 48ca596
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Thu Oct 25 12:19:30 2007 -0400
@@ -21391,7 +21563,7 @@ Date: Fri Oct 19 16:34:54 2007 -0700
they should be.
commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a
-Merge: a358b87... 7e1cada...
+Merge: a358b87 7e1cada
Author: Eric Anholt <e...@anholt.net>
Date: Fri Oct 19 15:44:17 2007 -0700
@@ -21597,7 +21769,7 @@ Date: Wed Oct 17 16:09:40 2007 -0400
Need to merge so this type of thing stops happening.
commit c3f7b862550fa8f46633162f83db8c27e46fc672
-Merge: af4dde0... feac075...
+Merge: af4dde0 feac075
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Wed Oct 17 15:00:54 2007 -0400
@@ -22177,7 +22349,7 @@ Date: Sun Oct 14 14:59:12 2007 -0400
Fix GLX byteswapping.
commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8
-Merge: ccda4b6... 17ffc34...
+Merge: ccda4b6 17ffc34
Author: Kristian Høgsberg <k...@redhat.com>
Date: Fri Oct 12 19:28:39 2007 -0400
@@ -22457,7 +22629,7 @@ Date: Fri Oct 5 12:19:03 2007 +0930
regardless of who is the pairing client.
commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8
-Merge: ab11bad... 3549a12...
+Merge: ab11bad 3549a12
Author: Dodji Seketeli <do...@openedhand.com>
Date: Thu Oct 4 13:07:50 2007 +0200
@@ -22530,7 +22702,7 @@ Date: Thu Oct 4 11:38:01 2007 +0200
it for them completely.
commit 604ebb5a6de372e6a8a96e0ee997db7929126860
-Merge: 1365aef... 4ba76a7...
+Merge: 1365aef 4ba76a7
Author: Dodji Seketeli <do...@openedhand.com>
Date: Wed Oct 3 16:13:16 2007 +0200
@@ -22668,7 +22840,7 @@ Date: Tue Oct 2 13:13:51 2007 -0700
Also fix incorrect library inclusion by kdrive which broke the build.
commit 439edc768eea17667846ce573c843b8377e0dfb4
-Merge: c8ccf46... 93ae6fe...
+Merge: c8ccf46 93ae6fe
Author: Eric Anholt <e...@anholt.net>
Date: Tue Oct 2 12:14:04 2007 -0700
@@ -23601,7 +23773,7 @@ Date: Thu Sep 27 11:44:03 2007 +0930
This is hopefully better than hardcodey calling CoreProcessPointerEvent.
commit 27612748e0ec20f3a23839f0a12e39f598dd722c
-Merge: b614614... 3b114f2...
+Merge: b614614 3b114f2
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Wed Sep 26 07:47:29 2007 -0400
@@ -24022,7 +24194,7 @@ Date: Wed Sep 19 04:46:10 2007 -0700
hey -- you have to start somewhere. ;)
commit 97c150b61bbe436453b05d3c07cd2173870aac40
-Merge: 57907e0... 547ad21...
+Merge: 57907e0 547ad21
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Wed Sep 19 07:25:55 2007 -0400
@@ -24147,7 +24319,7 @@ Date: Sat Sep 15 14:01:57 2007 +0200
Initialize output->pendingProperties.
commit b9f7aeb20015290a8acf938a11bf9272bf3527cf
-Merge: e4d11e5... 06d27f8...
+Merge: e4d11e5 06d27f8
Author: Eric Anholt <e...@anholt.net>
Date: Thu Sep 13 00:15:45 2007 +0000
@@ -24561,7 +24733,7 @@ Date: Wed Sep 5 17:46:23 2007 -0700
broken uses.
commit e332335241af28ef0ab66b102d0cbc4e5c73ac68
-Merge: 7381e91... accd71b...
+Merge: 7381e91 accd71b
Author: Ben Byer <bb...@bbyer.apple.com>
Date: Wed Sep 5 15:51:23 2007 -0700
@@ -24606,7 +24778,7 @@ Date: Wed Sep 5 14:31:01 2007 -0700
so it doesn't make sense to require it when building on OSX/Darwin.
commit ff01e44e33fd072958fb0157dae072f1b1c88944
-Merge: 8ba8c16... 47300ed...
+Merge: 8ba8c16 47300ed
Author: Ben Byer <bb...@bbyer.apple.com>
Date: Wed Sep 5 13:56:08 2007 -0700
@@ -24756,7 +24928,7 @@ Date: Tue Sep 4 14:49:49 2007 -0700
Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is
smart.
commit bf5948518763b5e21eff806a0a9abc5f7757fa10
-Merge: 4062db4... 735da3d...
+Merge: 4062db4 735da3d
Author: Matthieu Herrb <matth...@bluenote.herrb.com>
Date: Tue Sep 4 22:40:31 2007 +0200
@@ -25072,7 +25244,7 @@ Date: Tue Aug 28 09:28:25 2007 -0400
FontRec privates.
commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5
-Merge: 860a09c... 7d54399...
+Merge: 860a09c 7d54399
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Tue Aug 28 07:25:21 2007 -0400
@@ -25172,7 +25344,7 @@ Date: Fri Aug 24 16:00:31 2007 -0700
Bump video driver ABI for pci-rework.
commit 91f358336f77c0e4f577be65cca977d17298e36c
-Merge: b9a806f... 8b6b40b...
+Merge: b9a806f 8b6b40b
Author: Ian Romanick <i...@us.ibm.com>
Date: Fri Aug 24 15:04:21 2007 -0700
@@ -25226,7 +25398,7 @@ Date: Fri Aug 24 13:04:48 2007 +0200
case.
commit 8b6b40b7271acd81a9548f502c18f46f3b640640
-Merge: ab7a6d8... 3305d17...
+Merge: ab7a6d8 3305d17
Author: Ian Romanick <i...@us.ibm.com>
Date: Thu Aug 23 18:19:17 2007 -0700
@@ -25363,7 +25535,7 @@ Date: Wed Aug 22 16:54:29 2007 +0100
Fix <pixman.h> include to <pixman/pixman.h>
commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0
-Merge: 53941c8... 6ef4ecd...
+Merge: 53941c8 6ef4ecd
Author: Søren Sandmann Pedersen <sandm...@redhat.com>
Date: Tue Aug 21 14:26:34 2007 -0400
@@ -25675,7 +25847,7 @@ Date: Mon Aug 13 10:43:48 2007 -0400
current interface.
commit f367285fd5825e0adc271982a529c9904ad65c89
-Merge: b1272ee... ff4bd3a...
+Merge: b1272ee ff4bd3a
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Sun Aug 12 15:31:10 2007 +0930
@@ -26050,7 +26222,7 @@ Date: Wed Jul 25 14:57:13 2007 -0700
ProcRenderAddGlyphs: Convert while loops to for loops where more natural
commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74
-Merge: 32c0dcc... f3955c0...
+Merge: 32c0dcc f3955c0
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Thu Aug 2 14:27:03 2007 -0400
@@ -27358,7 +27530,7 @@ Date: Wed Jun 20 18:42:00 2007 +0200
can't actually occur when swapped out.
commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c
-Merge: 5dee64f... 2e7fef7...
+Merge: 5dee64f 2e7fef7
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Tue Jun 19 17:20:52 2007 +0930
@@ -27400,7 +27572,7 @@ Date: Tue Jun 19 11:28:07 2007 +0930
device to interact, so this seems like a reasonable solution.
commit ab7a6d860d4a275a810a64b1ba7b13726ed10575
-Merge: e9130b8... 2e7fef7...
+Merge: e9130b8 2e7fef7
Author: Ian Romanick <i...@us.ibm.com>
Date: Mon Jun 18 16:51:13 2007 -0700
@@ -27482,7 +27654,7 @@ Date: Mon Jun 11 21:25:42 2007 -0400
Delete fbBltmmx().
commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0
-Merge: 878cac7... 3f9adb1...
+Merge: 878cac7 3f9adb1
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Mon Jun 11 15:29:11 2007 -0400
@@ -27806,7 +27978,7 @@ Date: Tue May 29 14:54:27 2007 -0600
Remove wscons keyboard handling stuff that doesn't belong there anymore.
commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0
-Merge: 3a6549a... 2f13b7c...
+Merge: 3a6549a 2f13b7c
Author: Matthieu Herrb <matth...@deville.herrb.com>
Date: Tue May 29 12:14:49 2007 -0600
@@ -27979,7 +28151,7 @@ Date: Wed May 23 12:56:04 2007 -0400
Add missing offsets for window coordinates - reported by Colin Harrison
commit 2a4aa63a23ddd816b647b851a01865861827a7eb
-Merge: 9cee4ec... cc648e6...
+Merge: 9cee4ec cc648e6
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Tue May 22 14:50:26 2007 -0400
@@ -28530,7 +28702,7 @@ Date: Mon Apr 30 10:33:12 2007 -0600
fix __glXErrorCallBack() proto
commit 6b33459bf5aac23c3ecc7002d091c02f327d907a
-Merge: 18252a5... 3c91a99...
+Merge: 18252a5 3c91a99
Author: Brian <br...@yutani.localnet.net>
Date: Mon Apr 30 10:26:19 2007 -0600
@@ -28718,7 +28890,7 @@ Date: Fri Apr 27 08:13:08 2007 -0400
are both 0.
commit f28eea0647f007c2e2415ecc6fceef46201faad4
-Merge: 339b73e... ae04f2c...
+Merge: 339b73e ae04f2c
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Fri Apr 27 16:34:36 2007 +0930
@@ -29249,7 +29421,7 @@ Date: Tue Apr 17 13:46:55 2007 -0400
security: remove debugging code.
commit 1f06d32ef58749d0f0c062193d237ee98f60e90f
-Merge: cf962a8... fc162c6...
+Merge: cf962a8 fc162c6
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Tue Apr 17 12:10:22 2007 -0400
@@ -29420,7 +29592,7 @@ Date: Thu Apr 12 11:16:19 2007 +0930
This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
commit d4dad6f84f82a4ade5005c3aa93511c1295875b8
-Merge: f1f8b56... 33a5d96...
+Merge: f1f8b56 33a5d96
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Thu Apr 12 11:11:03 2007 +0930
@@ -29674,7 +29846,7 @@ Date: Fri Apr 6 13:38:12 2007 +0300
GLcore: fix after moving xf86glx_util.[hc] to Mesa.
commit cf962a849db2b259ca558c6265ea7e3328a4d312
-Merge: 5ad5625... 5a804f2...
+Merge: 5ad5625 5a804f2
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Thu Apr 5 14:41:39 2007 -0400
@@ -29820,7 +29992,7 @@ Date: Tue Apr 3 09:27:57 2007 -0600
about setting the XFree86Server symbol.
commit 1cc8db72816cd079f30255046e10043c350bf683
-Merge: 645d87c... a39f297...
+Merge: 645d87c a39f297
Author: Matthieu Herrb <matth...@roadrock.(none)>
Date: Tue Apr 3 16:04:45 2007 +0200
@@ -29839,7 +30011,7 @@ Date: Tue Apr 3 19:02:14 2007 +0930
Delete all grabs from all devices when deleting a window.
commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3
-Merge: 9b0b340... f09ee16...
+Merge: 9b0b340 f09ee16
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Tue Apr 3 15:07:18 2007 +0930
@@ -29959,7 +30131,7 @@ Date: Mon Apr 2 12:26:27 2007 -0600
formatting fixes
commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0
-Merge: a120547... 96ce17a...
+Merge: a120547 96ce17a
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon Apr 2 15:36:26 2007 +0930
@@ -30024,7 +30196,7 @@ Date: Fri Mar 30 16:05:46 2007 -0600
values of 1280 (my screen width).
commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48
-Merge: 2c6d471... 92e8cdb...
+Merge: 2c6d471 92e8cdb
Author: Ian Romanick <i...@us.ibm.com>
Date: Fri Mar 30 13:39:15 2007 -0700
@@ -30161,7 +30333,7 @@ Date: Wed Mar 28 12:57:11 2007 -0400
xace: provide creation-time resource hook call in CreateWindow().
commit 99b220969f2f8ba829bc8294b27ca90fd9311be4
-Merge: 728ad64... 82a8b99...
+Merge: 728ad64 82a8b99
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Wed Mar 28 12:54:04 2007 -0400
@@ -30174,7 +30346,7 @@ Date: Wed Mar 28 12:03:19 2007 -0400
Refuse to create tiny modes from EDID detailed timing.
commit 2c6d47108880584f1221ff86c6c8947627f9f607
-Merge: c4fe1bc... 8522044...
+Merge: c4fe1bc 8522044
Author: Ian Romanick <i...@us.ibm.com>
Date: Wed Mar 28 08:08:04 2007 -0700
@@ -30244,7 +30416,7 @@ Date: Mon Mar 26 16:04:50 2007 -0700
Fix indentation of fakexa help text.
commit 728ad64d979fd9e5cca28e8c15118c18d707c431
-Merge: 0331c6a... 6a0bed1...
+Merge: 0331c6a 6a0bed1
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Tue Mar 27 13:16:40 2007 -0400
@@ -30281,7 +30453,7 @@ Date: Mon Mar 26 12:44:58 2007 -0700
Update xorg.conf manpage for new RandR 1.2 monitor options.
commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413
-Merge: 84a066c... f7c5aa0...
+Merge: 84a066c f7c5aa0
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Mon Mar 26 10:28:05 2007 -0400
@@ -30646,7 +30818,7 @@ Date: Mon Mar 19 16:11:01 2007 +1030
by the evdev driver).
commit 015d728bcde5b16a72a976579755421e3023626b
-Merge: 65b0eb6... b167583...
+Merge: 65b0eb6 b167583
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon Mar 19 09:42:56 2007 +1030
@@ -30953,7 +31125,7 @@ Date: Wed Mar 7 09:57:02 2007 -0500
devPrivates rework: move reset functions into a single call.
commit bb111291d854b4329e47367ce3c67e8a2785e6e9
-Merge: 74175e0... e9bfb2b...
+Merge: 74175e0 e9bfb2b
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Wed Mar 7 09:03:46 2007 -0500
@@ -31025,7 +31197,7 @@ Date: Tue Mar 6 11:09:30 2007 -0800
updated todo list
commit 81d581e655fc989da3be4256b83849a63b8607b7
-Merge: a05ffca... d5aba03...
+Merge: a05ffca d5aba03
Author: Ben Byer <bb...@bbyer.(none)>
Date: Tue Mar 6 10:37:29 2007 -0800
@@ -31056,7 +31228,7 @@ Date: Tue Mar 6 02:31:59 2007 -0800
moved new event-handling code from X11Application.m to darwinEvents.c in
preparation for making all Darwin servers use it
commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e
-Merge: ec1ef8a... 9b6bb06...
+Merge: ec1ef8a 9b6bb06
Author: Ben Byer <bb...@bbyer.(none)>
Date: Tue Mar 6 01:04:50 2007 -0800
@@ -31131,7 +31303,7 @@ Date: Mon Mar 5 12:34:37 2007 -0500
devPrivates rework: remove some debugging code from dixFreePrivates.
commit 23fc429aad5b2721911862617772c314e1036bb0
-Merge: e684824... fe7b8f4...
+Merge: e684824 fe7b8f4
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Mon Mar 5 12:18:54 2007 -0500
@@ -31177,7 +31349,7 @@ Date: Mon Feb 26 09:40:00 2007 +1100
modes: add commit/prepare hooks
commit 1f0075786fedde538a95e2f39681052e25021d88
-Merge: 57aa5e9... 12175b6...
+Merge: 57aa5e9 12175b6
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon Mar 5 12:37:17 2007 +1030
@@ -31378,7 +31550,7 @@ Date: Wed Feb 28 15:43:06 2007 +1030
between coordinates stored in device and coordinates sent by the event.
commit d9bcb22d199e8444b9762a35754e04d327dd5915
-Merge: 272d934... c16343a...
+Merge: 272d934 c16343a
Author: Ben Byer <bb...@bbyer.apple.com>
Date: Tue Feb 27 16:28:20 2007 -0800
@@ -31803,14 +31975,14 @@ Date: Thu Feb 15 17:07:42 2007 +0200
http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
commit f452507ca9209598401d15da0039aaa4e1fed1a3
-Merge: 0463283... 8116757...
+Merge: 0463283 8116757
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Thu Feb 15 09:47:20 2007 -0500
Merge branch 'master' into my-XACE-SELINUX
commit 04632835b7402456fdcf6c8fa01970cd2804e27c
-Merge: 88f89b9... 9ecf79c...
+Merge: 88f89b9 9ecf79c
Author: Eamon Walsh <ewa...@tycho.nsa.gov>
Date: Thu Feb 15 09:27:05 2007 -0500
@@ -31858,7 +32030,7 @@ Date: Wed Feb 14 17:09:33 2007 +1030
fix: WarpCursor needs to send MotionNotify.
commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a
-Merge: e540d57... d570ff7...
+Merge: e540d57 d570ff7
Author: Ian Romanick <i...@us.ibm.com>
Date: Wed Feb 14 15:39:52 2007 -0800
@@ -31922,7 +32094,7 @@ Date: Mon Feb 12 17:18:29 2007 -0500
Remove spurious LIBADD from xf4bpp
commit 16eb7254f861465f988ae3861ac3449c2c966062
-Merge: 3814862... c4b7e9d...
+Merge: 3814862 c4b7e9d
Author: Ian Romanick <i...@us.ibm.com>
Date: Fri Feb 9 12:38:49 2007 -0800
@@ -32101,7 +32273,7 @@ Date: Mon Jan 29 17:30:59 2007 -0800
Typical results were failure to sync, and a black screen.
commit 3814862a869ee83d307eb01225d5949039f435d8
-Merge: a216de9... 31f2d4a...
+Merge: a216de9 31f2d4a
Author: Ian Romanick <i...@us.ibm.com>
Date: Mon Jan 29 15:14:31 2007 -0800
@@ -32142,7 +32314,7 @@ Date: Mon Jan 29 16:10:03 2007 +1030
mi: Fix cursor rendering issues.
commit 15a81b6325d359990017b8e9f17ce18a7eff1354
-Merge: 3759254... cc3d66d...
+Merge: 3759254 cc3d66d
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Sun Jan 28 17:18:57 2007 +1030
@@ -32155,7 +32327,7 @@ Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9
-Merge: ba547d4... ca5ebe3...
+Merge: ba547d4 ca5ebe3
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Sun Jan 28 17:05:55 2007 +1030
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
