xorg-server: Changes to 'debian-experimental'
ChangeLog | 5745 ++++++++++++++++++++++++++++++++++++++++++++------
debian/changelog | 4
debian/copyright | 2
debian/prune/non-free | 1
debian/watch | 2
5 files changed, 5110 insertions(+), 644 deletions(-)
New commits:
commit e270b2b13e270161ac08c66a085632ba2ca50f01
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 14:28:23 2010 +0100
Stop repacking the tarball
The non-modifiable README.DRI was removed upstream.
diff --git a/debian/changelog b/debian/changelog
index 54b6039..e574f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.8.99.904-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Install the upstream changelog in xserver-common, instead of duplicating
its 1MB in all other packages.
+ * Stop repacking the tarball: the non-modifiable README.DRI was removed
+ upstream.
[ Christopher James Halse Rogers ]
* New upstream RC
diff --git a/debian/copyright b/debian/copyright
index 8fe50d2..af52f60 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,5 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/xserver/
-The upstream tarball has been modified to remove the files listed in
-debian/prune/non-free.
Licenses
diff --git a/debian/prune/non-free b/debian/prune/non-free
deleted file mode 100644
index 7bcc911..0000000
--- a/debian/prune/non-free
+++ /dev/null
@@ -1 +0,0 @@
-hw/xfree86/doc/README.DRI
diff --git a/debian/watch b/debian/watch
index 7bc4d4e..249555d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://xorg.freedesktop.org/releases/individual/xserver/ xorg-server-(.*)\.tar\.gz debian debian/xsfbs/repack.sh
+http://xorg.freedesktop.org/releases/individual/xserver/ xorg-server-(.*)\.tar\.gz
commit e4eaa44d4a14b432fa46c1fdc3f927e7fad4cb5c
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 14:27:14 2010 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 3a204a4..5a5e00f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,2532 @@
-commit b65c5be170835db2282192381ef411997e61a6f1
+commit a71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 08:27:05 2010 -0400
+
+ Bump to version 1.8.99.904 (1.9 RC4)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5ea497fc32202ff19c2b7d8ef4eba08889108a87
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Jun 29 16:08:02 2010 +0300
+
+ xfree86: configure: remove vendor and card name matching rules
+
+ Although vendor and board naming are used to create the configure file, the
+ server doesn't actually use it when fetching such file and probing devices.
+
+ Reported-by: Richard Barnette <jrbarnette@chromium.org>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Tested-by: Richard Barnette <jrbarnette@chromium.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 90fd9e40b59e69333d250a795998f44dc3a5dc0c
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Jun 29 16:08:01 2010 +0300
+
+ xfree86: pci: remove superfluous vendor and card name logging
+
+ X server suffers in startup time when relying on the pciaccess's linear search
+ to fetch vendor and video device name from PCI ID file (when existent). Such
+ names are only used to write the log, which may be superfluous. This
+ information often is provided by the drivers or likewise users can get the it
+ using external tools like lspci or scanpci.
+
+ This patch remove the references of those functions from X start up.
+
+ Reported-by: Richard Barnette <jrbarnette@chromium.org>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Richard Barnette <jrbarnette@chromium.org>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f028e70ca714f6956e41754f132cb9b8a1e8db63
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 30 08:33:55 2010 -0700
+
+ Initialize dev privates before using any
+
+ Initializing the dev privates code after allocating the server client
+ dev privates would cause the memory leak check to fire at server
+ startup or reset.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 433d0851cd3e61d841ff374ee0a0f052d5907029
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Jun 25 11:34:44 2010 +0100
+
+ Xephyr: fix Xv adaptor capability tests
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9626eedebf620559652ffb1fefa82b5d659e57be
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Jun 24 18:45:11 2010 +0100
+
+ configure: bail if Xephyr was requested but its dependencies are missing
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e6531ae9d5bdd37775e921268366fb76056e22d5
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Jun 24 18:45:10 2010 +0100
+
+ Xephyr: fix memory leak in XF86DRIOpenConnection
+
+ The allocated bus id string was not being freed.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 390a8466dd1914f4786b811ff8454f6e0c4b6b04
+Author: Ville Syrjälä <ville.syrjala@nokia.com>
+Date: Mon Jun 28 23:26:48 2010 +0300
+
+ xfree86/modes: Allow the driver to specify initial rotation
+
+ When the "Rotate" option isn't specified allow the driver to specify
+ the initial rotation mode. This way the driver can choose to retain
+ the same settings that were used by software that was used prior to
+ starting X.
+
+ Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6052710670953b43b4fff5d101b727163fcb1187
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 30 08:21:04 2010 -0700
+
+ xkb: merge lockedPtrButtons state from all attached SDs.
+
+ Problem:
+ lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button
+ press. Unconditionally clearing the bits may cause stuck buttons in this
+ sequence of events:
+
+ 1. type Shift + NumLock to enable PointerKeys
+ 2. type 0/Ins on keypad to emulate Button 1 press
+ → button1 press event to client
+ 3. press and release button 1 on physical mouse
+ → button1 release event to client
+
+ Button 1 on the MD is now stuck and cannot be released.
+
+ Cause:
+ XKB PointerKeys button events are posted through the XTEST pointer device.
+ Once a press is generated, the XTEST device's button is down. The DIX merges
+ the button state of all attached SDs, hence the MD will have a button down
+ while the XTEST device has a button down.
+
+ PointerKey button events are only generated on the master device to avoid
+ duplicate events (see XkbFakeDeviceButton()). If the MD has the
+ lockedPtrButtons bit cleared by a release event on a physical device, no
+ such event is generated when a keyboard device triggers the PointerKey
+ ButtonRelease trigger. Since the event - if generated - is posted through
+ the XTEST pointer device, lack of a generated ButtonRelease event on the
+ XTEST pointer device means the button is never released, resulting in the
+ stuck button observed above.
+
+ Solution:
+ This patch merges the MD's lockedPtrButtons with the one of all attached
+ slave devices on release events. Thus, as long as one attached keyboard has
+ a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey
+ button is released on all keyboards, the matching release event is emulated
+ from the MD through the XTEST pointer device, thus also releasing the button
+ in the DIX.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 28e33ae6f69f716ece5d68e63fc52557236c5f6e
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed Jun 30 07:59:04 2010 -0700
+
+ OS support: fix writeable client vs IgnoreClient behavior
+
+ When ResetCurrentRequest is called, or IgnoreClient is called when a
+ client has input pending, IgnoredClientsWithInput will be set. However,
+ a subsequent IgnoreClient request will clear the client fd from that fd
+ set, potentially causing the client to hang.
+
+ So add an Ignore/Attend count, and only apply the ignore logic on the
+ first ignore and the attend logic on the last attend. This is
+ consistent with the comments for these functions; callers must pair
+ them.
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27035.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 018c878e9495b21146c8f38617fdd1bf6d8cc73b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jun 25 09:48:10 2010 +1000
+
+ Revert "dix: use the event mask of the grab for TryClientEvents."
+
+ Behaviour of earlier X servers was to deliver the ButtonPress event
+ unconditionally, regardless of the actual event mask being set. Thus, a
+ GrabButton event will always deliver the button press event, a GrabKey
+ always the key press event, etc. Same goes for XI and XI2.
+
+ Reproducible with a simple client requesting a button grab in the form of:
+ XGrabButton(dpy, AnyButton, AnyModifier, win, True, ButtonReleaseMask,
+ GrabModeAsync, GrabModeAsync, None, None);
+
+ On servers before MPX/XI2, the client will receive a button press and
+ release event. On current servers, the client receives only the release.
+ Clients that expect the press event to be delivered unconditionally may
+ leave the user with a stuck grab.
+
+ XTS test results for XGrabButton are identical with and without this patch.
+
+ This reverts commit 48585bd1e3e98db0f3df1ecc68022510216e00cc.
+
+ Conflicts:
+
+ dix/events.c
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3b3c77b87070ddcdbb2acb114a81628485e7a129
+Author: Tiago Vignatti <tiago.vignatti@Nokia.com>
+Date: Wed Jun 23 15:18:04 2010 +0300
+
+ configure: don't check xfont always for each server
+
+ It's already defined inside REQUIRED_LIBS and all DDX are getting it already.
+ No semantical changes.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 75536ee80595c79bba95a1fb6844126ee08486d4
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Wed Jun 23 15:18:03 2010 +0300
+
+ dix: use one single function to register fpe fonts
+
+ X server doesn't need to understand fpe internals, so use
+ register_fpe_functions from libXfont.
+
+ It's required to get new version of libXfont, therefore adjust it to be passed
+ to autoconf.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a68a101a730df7f73421555e381a50b074607c5e
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 22 12:13:26 2010 -0700
+
+ Bump to 1.8.99.903 -- 1.9 RC3
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2c0159d21788b16607e6ebe4571b57fe78545c2a
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Mon Jun 14 09:25:22 2010 -0400
+
+ list.h: Fix list_for_each_entry_safe()
+
+ Can't use next as a macro argument since we're accessing the .next field
+ of struct list.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e2918b67395a48397bf7db545584cc2d4f4e7ccf
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 22 12:11:20 2010 -0700
+
+ Revert "mi: Remove unused overlay support"
+
+ This reverts commit 9120e58556014e514eef9dfe43cdea4b74dc66ae.
+
+ Whoops, please revert this patch -- overlay is in use in nvidia drivers,
+ and it's too late in release cycle to remove it.
+
+ I feel really sorry that I kept this patch in my tree. I will submit
+ another one, removing only XAA overlay hooks which are not used at all.
+
+commit 7673451ade46ebacfdfc02a5190149210198fdd8
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 22 11:49:30 2010 -0700
+
+ Bump to 1.8.99.902 -- 1.9 RC2
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8b65f2edb407521e0ac0e207e5d5358986bd46da
+Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+Date: Tue Jun 22 14:57:20 2010 +0300
+
+ record: Prevent a crash on recording client disconnect.
+
+ Execute the following steps to reproduce the issue.
+
+ 1. Run at least two recording clients simultaneously.
+ $ cnee --record --request-range 1-127 &
+ $ cnee --record --request-range 1-127 &
+ 2. Kill the recording clients.
+ $ killall cnee
+ 3. Give X server something to do so that the clients are closed.
+ $ xinput list
+ $ xinput list
+
+ As a result RecordUninstallHooks accesses NullClient, because
+ RecordAClientStateChange doesn't clean the recording clients up
+ properly.
+
+ Fix RecordUninstallHooks to fail locally on an assertion instead of
+ much later in privates code, if NullClient is still accessed because
+ of some other bug. Fix RecordAClientStateChange to iterate through all
+ contexts so that modifications of the iterated array during iteration
+ don't cause contexts to be skipped.
+
+ Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 660f6ab5494a728c3ca7ba00c305e9ff06c8ecb2
+Author: Simon Farnsworth <simon.farnsworth@onelan.com>
+Date: Tue Jun 22 10:13:30 2010 +0100
+
+ Don't crash when asked if a client that has disconnected was local
+
+ ProcDRI2Dispatch uses LocalClient to determine if it's safe to respond
+ to a client that has made DRI2 requests which aren't sensible for
+ remote clients (anything but version). When the client has disappeared
+ mid-request stream (e.g. as a result of a kill -9, or a client-side
+ bug), LocalClient causes the X server to follow suit, as
+ ((OsCommPtr)client->osPrivate)->trans_conn is NULL at this point.
+
+ The simple and obvious fix is to just return "not local" when
+ trans_conn is NULL, which fixes the crash I was seeing; however Keith
+ Packard pointed out that just checking trans_conn isn't enough;
+ quoting Keith:
+
+ "This looks almost right to me -- I reviewed the os code to see when
+ _XSERVTransClose is called (which is what frees the trans_conn data) and
+ found that every place which called that immediately set trans_conn to
+ NULL, except for the call in CloseDownFileDescriptor which is only
+ called from CloseDownConnection and which is immediately followed by
+ freeing the OsCommRec and setting client->osPrivate to NULL. So, I'd
+ suggest checking client->osPrivate in addition to the above check."
+
+ Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 82d41ada993d8cbdcdfea878d1a5b031afe4e593
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jun 21 16:33:55 2010 +1000
+
+ composite: fix freeing of old pixmap until after move/resize/cbw (bug 28345)
+
+ The fixes for the composite reallocation failure, were freeing the oldpixmap
+ straight after reallocating the new one, however this led to some wierd
+ effects in e16 compositing, and I think in a few other places. This patch
+ moves the freeing of the pixmap into the post wrapped stage. I'm not sure if
+ we are actually better off breaking ABI and adding another callback from the
+ ConfigureWindow to composite to make sure the old pixmap is always freed,
+ but this should be satisfactory as we should always hit one of the freeing
+ paths or else its a bug in the DIX.
+
+ bug: https://bugs.freedesktop.org/show_bug.cgi?id=28435
+
+ Reported-by: Andrew Randrianasulu <randrik@mail.ru>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c6bc52cb6663138d1273447cb7661fa6e958f539
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jun 21 14:08:50 2010 +1000
+
+ dri2: avoid crash with old dri drivers.
+
+ I built latest server and copied over a mesa 7.8 dri2 driver to use with it,
+ and it crashed in here starting compiz. Looks like we need to validate the
+ flush extension is registered before calling invalidate.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Michel Dänzer <michel@daenzer.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 80d1a548d6ce73c2ff097536c1bc7044bf74965d
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jun 21 10:05:08 2010 +1000
+
+ rotation: fix cursor and overlap of one pixel.
+
+ Commit 77c7a64e8885696665556c9fbcb3cffb552e367a was introduced to fix
+ a cursor off by one on Intel hw, however it also move the whole crtc
+ into an off by one position and you could see gnom-eshell overlapping.
+
+ This commit reverts that and instead fixes the cursor hotspot
+ translation to work like pixman does. We add 0.5 to the cursor vector
+ before translating, and floor the value afterwards.
+
+ Thanks to Soeren (ssp) for pointing out where the real problem was
+ after explaning how pixman translates points.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 32c706c4ffd7433dbfc79dba8785b1510d2f053f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 20 20:37:26 2010 -0400
+
+ config: declare xserver private dependencies in xorg-server.pc
+
+ Any module (drivers) depending on xserver also depends on some of the
+ server private dependencies. Any driver including xf86.h depends on
+ xext, kbproto, inputproto and randr.
+
+ These dependencies are in separate packages, so anything can happen,
+ removal, wrong version, etc... and the driver fails during compilation.
+ Having the private dependencies declared will ensure all packages the
+ server depends on are present and at the correct version.
+
+ Currently each module attempts to check for server dependencies with
+ various degrees of accuracy. With this patch, the driver will only need
+ to check for its own explicit dependencies.
+
+ Now that xproto is included in Requires.private it is removed from Requires.
+ All the cflags from both Requires and Requires.private are returned
+ to caller to pkg-config.
+
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 37734ba79ca3a9bad1c1e29d89710c8f9c299210
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Wed Jun 16 18:07:04 2010 +0100
+
+ XWin: Fixes for devPrivates API change
+
+ Fix some typos in devPrivates API changes in XWin code.
+ Move allocation of private keys as it's no longer valid to do them during OsVendorInit()
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f7dae972aac28c5792566e997c40254e787d246a
+Author: Ville Syrjälä <ville.syrjala@nokia.com>
+Date: Tue Jun 15 23:25:34 2010 +0300
+
+ xv: Don't send port notify when SetPortAttribute fails
+
+ Currently a port notify event is sent even if SetPortAttribute
+ fails. Furthermore the value field in the event will contain the
+ value that was specified in the failed request. So any client
+ interested in the actual value of the attribute will have to
+ double check the current value with GetPortAttribute after
+ receiving a port notify event.
+
+ Fix the problem by sending port notifications only when
+ SetPortAttribute succeeds.
+
+ Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c20166739603f86888f28ca2c65f5cf474d0d8c9
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sat Jun 12 01:05:07 2010 +0700
+
+ os: Remove unused dev_tty_from_init variable
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 2e15f1903dac8473285ad2937c079a08cf7c5d31
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sat Jun 12 00:53:38 2010 +0700
+
+ os: Remove unused pread/pwrite/lockit functions
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 9120e58556014e514eef9dfe43cdea4b74dc66ae
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sat Jun 12 00:30:27 2010 +0700
+
+ mi: Remove unused overlay support
+
+ The only reference to it in server and drivers is in XAA overlay code which
+ would segfault as no miInitOverlay is called ever. No segfaults were observed
+ "in wild", so XAA overlay is probably also unused.
+
+ XAA code is modified to act as if miOverlayCopyUnderlay always returned false,
+ because XAACopyWindow8_32 could only set doUnderlay to true if it's called from
+ miOverlayMoveWindow or miOverlayResizeWindow, which can only be called if
+ miInitOverlay has hooked those functions, and no driver (on fd.o) or server code
+ calls that.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 91b5aadbdfd9d05ca1ffdeb443e602ecdba1e04d
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 11 20:20:00 2010 +0700
+
+ mi: do not use X11/extensions/shape.h header from libXext
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Tested-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit b8615d592700b7be319c04cc0563fdeb5a266534
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jun 12 08:19:16 2010 -0700
+
+ Don't coredump on "X -showopts" (bug 25874)
+
+ Don't try walking the xf86ConfigLayout.screens table if it's empty
+ https://bugs.freedesktop.org/show_bug.cgi?id=25874
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 32fd57509c3e06f63ac6b0ad607767fd2b688e5a
+Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+Date: Fri Jun 18 12:40:58 2010 +0300
+
+ record: Register client private to prevent crash.
+
+ Running the following command causes an assertion to fail:
+ cnee --record --request-range 1-127
+
+ 3 in dixGetPrivateAddr at ../../include/privates.h:122
+ 4 in dixGetPrivate at ../../include/privates.h:137
+ 5 in dixLookupPrivate at ../../include/privates.h:167
+ 6 in RecordInstallHooks at ../../record/record.c:911
+ 7 in ProcRecordEnableContext at ../../record/record.c:2377
+ 8 in ProcRecordDispatch at ../../record/record.c:2571
+ 9 in Dispatch at ../../dix/dispatch.c:432
+ 10 in main at ../../dix/main.c:289
+
+ Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+ Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 75beadd766fed7b12a76e59e57c244e297c2d2cb
+Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+Date: Sun Jun 13 18:05:26 2010 +0200
+
+ DRI2/xserver: Don't hang in glXSwapBuffers if drawable moves between crtc's (bug 28383)
+
+ Detect if a drawable has been moved from an original crtc to a new crtc
+ with a lower current vblank count than the original crtc inbetween
+ glXSwapBuffers() calls. Reinitialize drawable's last_swap_target
+ before scheduling next swap if such a move has taken place.
+
+ last_swap_target defines the baseline for scheduling the next swap.
+ If a movement between crtc's is not taken into account, the swap may
+ schedule for a vblank count on the new crtc far in the future, resulting
+ in a apparent "hang" of the drawable for a long time.
+
+ Fixes Bugzilla bug #28383.
+
+ Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 868bf3de478fac0080d525137fc728c551c78ea6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 15 13:22:20 2010 +1000
+
+ dix: the default axis mode is Relative, not "0".
+
+ Yay for readability.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+
+commit db0d3d4e573c93a8af43499682ed788c7bd0d70d
+Author: Xiaoyang Yu (Max) <max.a.yu@intel.com>
+Date: Fri Jun 4 17:17:53 2010 +0800
+
+ Re-enabled Xnest fix for focus in + modifier bug.
+
+ * See https://bugs.freedesktop.org/show_bug.cgi?id=3030
+
+ Signed-off-by: Xiaoyang Yu (Max) <max.a.yu@intel.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+ This takes the xnest way of working around this (see
+ 5904ef2ccd6056b187ca76f104c21e2d686bfc1d "xnest: restore
+ xnestUpdateModifierState") and copies it to Xephyr.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 505724c5f3e4fc1475fa54f20d08c0c06fb32443
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 16:28:34 2010 -0700
+
+ In DRI2Connect, check to see if DRI2 has been initialized (bug 28424)
+
+ This prevents DRI2GetScreen from being invoked with an uninitialized
+ private key which would cause an assert failure.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: David Ronis <David.Ronis@McGill.CA>
+
+commit 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 7 22:56:04 2010 -0700
+
+ Clean up RandR12 bits on screen close (bug 27114)
+
+ When resetting the server, pScrn->EnterVT must be unwrapped or the
+ next server generation will end up wrapping the wrapper and causing an
+ infinite recursion on EnterVT.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Michael Stapelberg <michael+freedesktop@stapelberg.de>
+
+commit d5ab717768524c8552b81607aaeffb447ab268ee
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 19:21:18 2010 -0700
+
+ Bump to 1.8.99.901 -- 1.9 RC1
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9
+Merge: 7e8f100 f4190fe
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jun 11 10:08:13 2010 -0700
+
+ Merge remote branch 'dottedmag/for-keithp'
+
+commit 7e8f1001217326cc451974bacf25275420c4bb4e
+Author: Éric Piel <E.A.B.Piel@tudelft.nl>
+Date: Fri Jun 11 09:16:32 2010 -0700
+
+ exa: fix ExaCheckCopyNtoN for exa_classic when source = dest
+
+ In case you want to copy a region with source = dest, you have the same pixmap
+ as source and dest.
+
+ At the end of exaPixmapIsOffscreen_classic() the devPrivate.ptr is reset to
+ NULL (look at the sources).
+
+ Now this is what happens in ExaCheckCopyNtoN:
+
+ exaPrepareAccess( pDst );
+ Calls IsOffscreen()
+ sets devPrivate.ptr to NULL
+ sets up devPrivate.ptr to real pointer
+ Everything OK
+ exaPrepareAccess( pSrc );
+ Calls IsOffscreen()
+ sets devPrivate.ptr to NULL
+ BAILS OUT CAUSE OF NESTED OPERATION SINCE DST EQUALS SRC
+
+ We end up with devPrivate.ptr as NULL, and that is clearly wrong.
+
+ In particular this fixes a segfault when using the psb driver (bug 28077)
+
+ Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
+ Reviewed-by: Michel Dänzer <michel@daenzer.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f4190feb25ecc3d8278decc8bf28a5ef0e568942
+Author: Matt Turner <mattst88@gmail.com>
+Date: Thu Jun 10 04:08:54 2010 +0700
+
+ Remove more superfluous if(p) checks around free(p)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+commit 89bd05106e5823fc5cfca9abf082729f2444363b
+Author: Matt Turner <mattst88@gmail.com>
+Date: Fri Jun 4 21:09:35 2010 -0400
+
+ record: move free() to after last use of pContext
+
+ No functional change, since free doesn't change the value of the pointer
+ passed to it, but it makes this code less confusing.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit a54a766dfb39fb3df671045878ac706215d83cef
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Mon Jun 7 03:19:03 2010 +0700
+
+ xkb: replace xstrdup with strdup in Win32System
+
+ The only caller of Win32System is XkbDDXCompileKeymapByNames. Add allocation
+ check there to avoid passing NULL pointers to various functions down the code.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6e7417c342b0624e3f3c5686bb43026786423692
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:05:35 2010 +0700
+
+ config: Replace xstrdup with strdup in add_option()
+
+ All callers of add_option pass string literal as "key" argument
+ except one, where non-NULL condition is guarded by if().
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e4570f5db5157f4233454c938733a2a0d6a1cb8f
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:01:42 2010 +0700
+
+ xfree86: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for XFree86
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 416d228481d71204cf9bfad3ab4773abc4757f79
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:01:25 2010 +0700
+
+ xquartz: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for XQuartz
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eea286f2b9e4b1acf2b1c9800f5a4bc7c3fa968d
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:01:05 2010 +0700
+
+ xwin: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for XWin
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit dd45b7d74696cd4fe9545852640a3c2e66a808fd
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:00:46 2010 +0700
+
+ kdrive: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for Kdrive
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 16158366954d945db6263f6de505fc02ee03c6cd
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:00:15 2010 +0700
+
+ dmx: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for DMX
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6592db6bb526f0c43b4c7b55859c629709e039b4
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 16:58:58 2010 +0700
+
+ Get rid of xstrdup when argument is definitely non-NULL
+
+ Replace xstrdup with strdup when either constant string is
+ being duplicated or argument is guarded by conditionals and
+ obviously can't be NULL
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352
+Merge: fd69234 8ff9b50
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 19:18:53 2010 -0700
+
+ Merge remote branch 'alanc/master'
+
+commit fd69234db004e98c663f5c6c4360d2cecaa8a4df
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jun 6 15:21:28 2010 -0700
+
+ Ignore RandR timestamps harder
+
+ Checking timestamps in post 1.1 randr requests was never a good idea,
+ let's ignore them and just make the configuration changes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Chase Douglas <chase.douglas@canonical.com>
+
+commit a8ec9eca850f2a7ad4c5cf31c1c011c120688496
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 13:39:11 2010 -0700
+
+ Fix a couple more possible errors with input-only windows
+
+ Using type == DRAWABLE_WINDOW to differentiate between pixmaps and
+ windows isn't sufficient as input-only windows will end up in the
+ pixmap case. This patch changes a few more code paths to use
+ WindowDrawable instead.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 8ff9b502cfce3828f7855ffba7949d6ebee34031
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jun 4 08:44:02 2010 -0700
+
+ Solaris: avoid memory leak if AGPIOC_INFO ioctl fails
+
+ Move malloc after ioctl, so we don't have to worry about free'ing the
+ memory if the ioctl fails.
+
+ [ This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+commit c5eb5d69e5183860185a05cfcce16af635cab9aa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 3 19:28:43 2010 -0700
+
+ Record some additional library dependencies in xf86 modules
+
+ Helps with symbol resolution when building with -z defs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 1c08a37e0eb4746e8974eb7a70ca4b7b84712963
+Author: Sam Lau <sam.lau@oracle.com>
+Date: Thu Jun 3 19:17:14 2010 -0700
+
+ SecurityResource should not segfault when client owning resource has exited
+
+ Fixes OpenSolaris bug 6949754:
+ Xorg crashes when the magnifier is enabled at gdm login greeter window.
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6949754
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7
+Merge: 84190d2 dc61448
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 18:39:10 2010 -0700
+
+ Merge remote branch 'whot/for-keith'
+
+commit dc614484f93b67e8b62dbb1bb2fd247fe5a4c850
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jun 10 12:21:36 2010 +1000
+
+ Xi: don't copy the modifier key count when copying device classes (#25480)
+
+ The modifier key count is maintained by the XKB layer and
+ increased/decreased for all modifiers that set state.
+
+ Test case, MD/SD modifier key count in comment:
+ 1. keyboard 1: press and hold Shift_L # SD:1 MD:1
+ 2. keyboard 2: press and release Shift_L # SD:1,0 MD:1,0
+ <class copy happens> # SD:1 MD:1
+ 3. keyboard 1: release Shift_L # SD:0 MD:1
+ 4. keyboard 1: press and release Shift_L # SD:1,0 MD:2,1
+
+ The modifier is now logically down on the MD but not on keyboard 1 or
+ keyboard 2.
+
+ XKB is layered in before the DIX, it increases/decreases the modifier key
+ count accordingly. In the above example, during (2), the MD gets the key
+ release and thus clears the modifier bit. (3) doesn't forward the release to
+ the MD because it is already cleared. The copy of modifierKeysDown when the
+ lastSlave changes however increases the counter for the held key. On (4),
+ the press and release are both forwarded to the MD, causing a offset by 1
+ and thus do not clear the logical modifier state.
+
+ X.Org Bug 25480 <http://bugs.freedesktop.org/show_bug.cgi?id=25480>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 7805e45284264b4cd286eece02e85426896e9f7b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jun 10 14:31:48 2010 +1000
+
+ config: remove redundant DBUS API define, require dbus-1 >= 1.0
+
+ It's still being pulled in by the HAL CFLAGS but the requirement to define
+ this was dropped from DBus pre 1.0 (November 2006).
+ This means we require dbus 1.0 now.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 66b21b2f455a1dfbc92f7caa571dcff3f3765808
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:58 2010 -0700
+
+ xfree86: Match devices based on current driver setting
+
+ Often we want to apply a driver specific option to a set of devices and
+ don't care how the driver was selected for that device. The MatchDriver
+ entry can be used to match the current driver string:
+
+ MatchDriver "evdev|mouse"
+ Option "Emulate3Buttons" "yes"
+
+ The driver string is a case sensitive match.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a71bdff47d4cc80da6ceeb548db1dcc8e8b59702
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:57 2010 -0700
+
+ xfree86: Allow multiple InputClass Match* entries for && matching
+
+ Currently when there multiple InputClass entries of the same type, only
+ the last entry is used and the previous ones are ignored. Instead,
+ multiple entries are used to create multiple matching conditions.
Reply to: