ChangeLog | 1220 +++++ config/udev.c | 26 configure.ac | 6 debian/changelog | 16 debian/control | 2 debian/patches/20-Revert-for-bug-30267.diff | 28 debian/patches/series | 1 debian/rules | 1 dix/devices.c | 4 dix/eventconvert.c | 9 dix/privates.c | 1 dix/property.c | 1 dix/selection.c | 3 glx/glxext.c | 11 hw/xfree86/common/compiler.h | 416 + hw/xfree86/common/xf86DGA.c | 2 hw/xfree86/common/xf86Helper.c | 3 hw/xfree86/common/xf86Xinput.c | 1 hw/xfree86/doc/man/Xorg.man.pre | 10 hw/xfree86/modes/xf86RandR12.c | 3 hw/xfree86/os-support/linux/lnx_init.c | 5 hw/xfree86/parser/scan.c | 2 hw/xfree86/vgahw/vgaHW.h | 2 hw/xquartz/Makefile.am | 2 hw/xquartz/X11Application.h | 3 hw/xquartz/X11Application.m | 44 hw/xquartz/X11Controller.m | 42 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib | 1591 ++---- hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/French.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/French.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib | 1720 ++----- hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/German.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib | 1598 ++---- hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib | 1543 ++---- hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib | 1618 ++---- hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib | 1586 ++---- hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings |binary hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/ar.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib | 2413 ++++------ hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/da.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib | 1530 ++---- hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/fi.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib | 1678 ++---- hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/ko.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib | 1544 ++---- hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/no.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib | 1588 ++---- hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/pl.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib | 1554 ++---- hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/pt.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib | 1530 ++---- hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib | 1530 ++---- hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/ru.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib | 1537 ++---- hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/sv.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib | 1583 ++---- hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib | 1564 ++---- hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib | 1598 ++---- hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/darwinEvents.c | 22 hw/xquartz/quartz.c | 201 hw/xquartz/quartz.h | 17 hw/xquartz/quartzAudio.c | 4 hw/xquartz/quartzCommon.h | 19 hw/xquartz/quartzKeyboard.c | 6 hw/xquartz/quartzRandR.c | 560 ++ hw/xquartz/quartzRandR.h | 80 hw/xquartz/xpr/xprAppleWM.c | 2 hw/xquartz/xpr/xprCursor.c | 6 hw/xquartz/xpr/xprFrame.c | 4 hw/xquartz/xpr/xprScreen.c | 12 miext/damage/damage.c | 6 os/io.c | 27 os/osdep.h | 1 randr/randr.c | 5 randr/randrstr.h | 18 randr/rrcrtc.c | 11 randr/rrmode.c | 14 randr/rroutput.c | 11 test/Makefile.am | 3 xkb/ddxList.c | 2 xkb/xkb.c | 7 xkb/xkbActions.c | 1 110 files changed, 14397 insertions(+), 17883 deletions(-)
New commits: commit 8e6d435b26d8965e6800b6416660f6cc79007564 Author: Cyril Brulebois <k...@debian.org> Date: Mon Oct 11 10:09:10 2010 +0200 Remove --disable-multibuffer from configure flags, that extension is gone for real now. diff --git a/debian/changelog b/debian/changelog index 6a9868d..965e0f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ xorg-server (2:1.9.0.901-1) UNRELEASED; urgency=low failures, see https://bugs.freedesktop.org/show_bug.cgi?id=30267 for reference. * Bump xutils-dev build-dep for new macros. + * Remove --disable-multibuffer from configure flags, that extension is + gone for real now. -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 23 Aug 2010 12:28:45 +1000 diff --git a/debian/rules b/debian/rules index c030ee8..95257c5 100755 --- a/debian/rules +++ b/debian/rules @@ -99,7 +99,6 @@ confflags += \ --disable-xcsecurity \ --disable-xcalibrate \ --disable-tslib \ - --disable-multibuffer \ --enable-dbe \ --disable-xf86bigfont \ --enable-dpms \ commit 0d02284d0f501cfabbdf6b7994eeaa0a331171c5 Author: Cyril Brulebois <k...@debian.org> Date: Mon Oct 11 10:01:42 2010 +0200 Bump xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index a549575..6a9868d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xorg-server (2:1.9.0.901-1) UNRELEASED; urgency=low * Add patch: 20-Revert-for-bug-30267.diff, to fix FTBFS due to test failures, see https://bugs.freedesktop.org/show_bug.cgi?id=30267 for reference. + * Bump xutils-dev build-dep for new macros. -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 23 Aug 2010 12:28:45 +1000 diff --git a/debian/control b/debian/control index 466f5d9..e504ca1 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: flex, automake, libtool, - xutils-dev (>= 1:7.5+3), + xutils-dev (>= 1:7.5+4), xfonts-utils (>= 1:7.5+1), x11proto-bigreqs-dev (>= 1:1.1.0), x11proto-composite-dev (>= 1:0.4), commit 39d8b9d30c332b0141ede9b60012619f8c072709 Author: Cyril Brulebois <k...@debian.org> Date: Mon Oct 11 00:49:39 2010 +0200 Add patch: 20-Revert-for-bug-30267.diff, to fix FTBFS due to test failures, see https://bugs.freedesktop.org/show_bug.cgi?id=30267 for reference. diff --git a/debian/changelog b/debian/changelog index 68e65d3..a549575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ xorg-server (2:1.9.0.901-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release (1.9.1 rc1). + * Add patch: 20-Revert-for-bug-30267.diff, to fix FTBFS due to test + failures, see https://bugs.freedesktop.org/show_bug.cgi?id=30267 for + reference. -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 23 Aug 2010 12:28:45 +1000 diff --git a/debian/patches/20-Revert-for-bug-30267.diff b/debian/patches/20-Revert-for-bug-30267.diff new file mode 100644 index 0000000..f0a5137 --- /dev/null +++ b/debian/patches/20-Revert-for-bug-30267.diff @@ -0,0 +1,28 @@ +commit e97d9ed9a9d71abe285f9f91cfce9fe0f0f72298 +Author: Cyril Brulebois <k...@debian.org> +Date: Mon Oct 11 00:47:26 2010 +0200 + + Revert "dix: don't create core motion events for non-x/y valuators." + + This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f. + +diff --git a/dix/eventconvert.c b/dix/eventconvert.c +index 0f747c1..4e3de0b 100644 +--- a/dix/eventconvert.c ++++ b/dix/eventconvert.c +@@ -102,15 +102,6 @@ EventToCore(InternalEvent *event, xEvent *core) + switch(event->any.type) + { + case ET_Motion: +- { +- DeviceEvent *e = &event->device_event; +- /* Don't create core motion event if neither x nor y are +- * present */ +- if (!BitIsOn(e->valuators.mask, 0) && +- !BitIsOn(e->valuators.mask, 1)) +- return BadMatch; +- } +- /* fallthrough */ + case ET_ButtonPress: + case ET_ButtonRelease: + case ET_KeyPress: diff --git a/debian/patches/series b/debian/patches/series index adf3c9c..3f8b683 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ #13_debian_add_xkbpath_env_variable.diff 15-nouveau.diff 16-xaa-fbcomposite-fix-negative-size.diff +20-Revert-for-bug-30267.diff commit 36c3655982eb71e5fe9f26465a7f64139833d4c6 Author: Cyril Brulebois <k...@debian.org> Date: Mon Oct 11 00:31:31 2010 +0200 Update changelog for 1.9.1 rc1 diff --git a/ChangeLog b/ChangeLog index e62568b..7dca8b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1223 @@ +commit 8ab87dc7ff48d4db8e5f95a74df627dac9c53c0a +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Oct 1 13:37:49 2010 -0700 + + Bump version to 1.9.0.901 (1.9.1 rc1) + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 5fb1780d6a44c7fca5143e5f456259499ddb0852 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Oct 1 14:05:03 2010 -0700 + + test: Fix make distcheck when not building unit tests + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 4d2542a16bd955ae448cc2cb160d1e0f2d9c291b +Merge: 5b64f85 560e425 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Thu Sep 30 00:19:24 2010 -0700 + + Merge remote branch 'ajax/server-1.9-xfree86' into server-1.9-branch + +commit 5b64f85b1b34d42f581db617ce3f3f7b12e6cdf8 +Author: Tobias Droste <tdro...@gmx.de> +Date: Wed Sep 29 22:51:48 2010 +0200 + + randr: set error numbers of resource types in RRExtenstionInit() (V2) + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30367 + + Currently the ddx calls xf86RandR12Init() + (-> RRScreenInit() + -> RRInit() + -> RRModeInit() + -> RRCrtcInit() + -> RROutputInit()) + before RRExtensionInit() is called. This causes RRErrorBase + being 0 while setting resource type error values (resource types: + RROutput, RRMode and RRCrtc). The fix moves the setting of error + values to own functions which are called in RRExtensionInit() + to get the right RRErrorBase. + + V2: With header file + + Signed-off-by: Tobias Droste <tdro...@gmx.de> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit c7e4222c9a27094ce4fc2831ac92acbb7b21fb1a) + +commit 560e4254997df26b6abaa93ca2f59bcf7f68d551 +Author: Adam Jackson <a...@redhat.com> +Date: Mon Sep 27 17:06:46 2010 -0400 + + xfree86: Add 18bpp support + + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 9df4fb0adf66fb82f0c007897d79af0f54a6dad9) + +commit 5ae0c0cdb29dd35e0c10e6429e0df59f064a5c73 +Author: Macpaul Lin <macp...@andestech.com> +Date: Tue Sep 21 15:13:34 2010 +0800 + + xfree86: nds32: add nds32 support for compiler related mmio codes + + Add nds32 support for compiler related mmio codes. + It includes byte-swap or non-swap operations. + + Signed-off-by: Macpaul Lin <macp...@andestech.com> + Acked-by: Tiago Vignatti <tiago.vigna...@nokia.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 58bd317e29f4abf7f950891339d2a6a78ddf7903) + +commit dfef37797c79d767d156a356ad7ea69316d4f693 +Author: Macpaul Lin <macp...@andestech.com> +Date: Tue Sep 21 15:13:33 2010 +0800 + + xfree86: nds32: add nds32 support for compiler specific codes + + Add nds32 definitions and related assembly codes to compiler header files. + + Signed-off-by: Macpaul Lin <macp...@andestech.com> + Acked-by: Tiago Vignatti <tiago.vigna...@nokia.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 28e6de66b42062a885ba38416387f2dbc15707fd) + +commit 7c016917b0fb5ab06f04f48914f78591482abb12 +Author: Macpaul Lin <macp...@andestech.com> +Date: Tue Sep 21 15:13:32 2010 +0800 + + xfree86: nds32: add nds32 definition for vgaHW support. + + Add __nds32__ definitions for vgaHW support. + + Signed-off-by: Macpaul Lin <macp...@andestech.com> + Acked-by: Tiago Vignatti <tiago.vigna...@nokia.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 2b24b2bd859a4b4b8ccaf3b7d1b529dcda2d3b94) + +commit 8d6e2e9906fb0389db2b777d9d8bc2373f537f88 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Jul 23 14:48:32 2010 +1000 + + xfree86: fix compiler warning about implicied decl of DuplicateModule. + + ../../../../hw/xfree86/common/xf86Xinput.c: In function ‘xf86AllocateInput’: + ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: implicit + declaration of function ‘DuplicateModule’ + ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: nested extern + declaration of ‘DuplicateModule’ + ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: assignment makes + pointer from integer without a cast + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Daniel Stone <dan...@fooishbar.org> + (cherry picked from commit 3cc5e4422430e9ca44615f3e63feccd2e5729046) + +commit 223794505e64ab5aa215f4847822d66cd6f3450f +Author: Jesse Adkins <jesserayadk...@gmail.com> +Date: Wed Aug 4 09:21:31 2010 +0000 + + xfree86: Fix leaks in OpenConfigFile and OpenConfigDir + + [mattst88: fixed whitespace and a missing semicolon] + + Signed-off-by: Jesse Adkins <jesserayadk...@gmail.com> + Signed-off-by: Matt Turner <matts...@gmail.com> + (cherry picked from commit 18b62e0479f15e965611880ada6e0195367df025) + +commit 6a0b4051972a4fa6f1a3b22ec1ae54bd1849bc9f +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Tue Aug 3 12:51:51 2010 -0700 + + XQuartz: RandR: Refactor legacy mode-switching to be better integrated with RandR + + Adds three new functions + void QuartzRandRSetFakeRootless (void); + void QuartzRandRSetFakeFullscreen (void); + void QuartzRandRToggleFullscreen (void); + + The first two are identical to requesting the fake modes from a RandR client + The third responds to cmd-alt-a to leave fullscreen or RandR. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit c45bea0c044ad37bedb42209f7e6ea8b587999f0) + +commit abfb3c7994ee4459d2de93083e4d5ba388095d55 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Mon Jul 26 23:34:49 2010 -0700 + + XQuartz: RandR: Don't change the rootless preference when changing RandR mode + + Also renames a bunch of other variables for better consistency. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 229323a19b06f80d9b03f487e598b933b9b31d87) + +commit 92b3dc67eef47db336674cf55ced4af40a6c29d7 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Mon Jul 26 11:45:59 2010 -0700 + + XQuartz: RandR: Better handle switching betwen RandR modes that share CG modes + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 721edc69c3597578d3e7f711769ff0195af6068a) + +commit 0402a4409641598427c7d3385aa006964ae0b75a +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Mon Jul 26 01:17:12 2010 -0700 + + XQuartz: RandR: Respond better to resolution changes made outside X + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 026a47e21226b64eb9a7624ada3d74c3fe5fa763) + +commit e540c517a831a256a6e76a8c2b92629fe87aa8df +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Jul 25 22:25:49 2010 -0700 + + XQuartz: RandR: Use deprecated CG APIs only on Leopard and earlier + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 59cd93f48a3a0a34781d4a94a3cd05a575e2d4ba) + +commit e4918634ab166b72d9d44663d69443e13f153fd7 +Author: Jan Hauffa <hau...@in.tum.de> +Date: Fri Jul 16 17:56:44 2010 +0200 + + XQuartz: RandR: Remove FAKE_RANDR code. + + Signed-off-by: Jan Hauffa <hau...@in.tum.de> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 629c3f473b7415069a87ef4717ec3d701978dc48) + +commit b374b9e68a8d8f18a8220e90a98d983ec4068938 +Author: Jan Hauffa <hau...@in.tum.de> +Date: Fri Jul 16 17:54:55 2010 +0200 + + XQuartz: RandR: Toggle rootless mode on XRandR mode switch. + + Report a fake screen mode that corresponds to the screen mode at startup of the + server excluding the height of the menu bar. If a client requests this mode, + rootless mode is enabled. In all other modes, the root window is shown. + + Signed-off-by: Jan Hauffa <hau...@in.tum.de> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 97b5f5306437bfd13390485fc7a58a363c261ec9) + +commit 29e9c25efb3e006b22019575fdb9ec1cc958c096 +Author: Jan Hauffa <hau...@in.tum.de> +Date: Fri Jul 16 17:18:03 2010 +0200 + + XQuartz: RandR: Implement basic RandR functionality. + + Querying and changing of resolution and refresh rate is supported, + rotation is not implemented yet. + + Signed-off-by: Jan Hauffa <hau...@in.tum.de> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 2d411472c2915614bdeb8fdc15d19dae4621444d) + +commit f939ab0175e1662f5df664449cba5d72fa1dbe1c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Sep 27 17:30:13 2010 +0100 + + modes: Beware the driver switching root pixmaps + + Program received signal SIGSEGV, Segmentation fault. + 0x080d4a2d in xf86RandR12ScreenSetSize (pScreen=0x8dca3a0, width=800, + height=600, mmWidth=210, mmHeight=157) + at ../../../../hw/xfree86/modes/xf86RandR12.c:731 + 731 ../../../../hw/xfree86/modes/xf86RandR12.c: No such file or directory. + in ../../../../hw/xfree86/modes/xf86RandR12.c + (gdb) bt full + height=600, mmWidth=210, mmHeight=157) + at ../../../../hw/xfree86/modes/xf86RandR12.c:731 + randrp = 0x8dcae68 + pScrn = 0x8dbeb28 + config = <value optimized out> + pRoot = 0x8e08e30 + pScrnPix = 0xb6d12008 + ret = 1 + c = <value optimized out> + mmWidth=210, mmHeight=157) at ../../randr/rrscreen.c:185 + No locals. + at ../../randr/rrscreen.c:307 + pWin = 0x8e08e30 + pScreen = 0x8dca3a0 + i = <value optimized out> + rc = 0 + ../../randr/randr.c:485 + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + Cc: Julien Cristau <jcris...@debian.org> + Tested-by: Julien Cristau <jcris...@debian.org> + Cc: Keith Packard <kei...@keithp.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit fdabcec57ae0fdc9910060609bb0848552c1db4d) + +commit 3ea7d271c8847a3135442ea24b8d5ff81d5e20b7 +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Fri Aug 27 10:20:29 2010 -0700 + + os: Return BadLength instead of disconnecting BigReq clients (#4565) + + If a client sends a big request that's too big (i.e. bigger than + maxBigRequestSize << 2 bytes), the server just disconnects it. This makes the + client receive SIGPIPE the next time it tries to send something. + + The X Test Suite sends requests that are too big when the test specifies the + TOO_LONG test type. When the client receives SIGPIPE, XTS marks it as + UNRESOLVED, which counts as a failure. + + Instead, remember how long the request is supposed to be and then return that + size. Dispatch() checks the length and sends BadLength to the client. Then, + whenever oci->ignoreBytes is nonzero, ignore the data read instead of trying to + process it as a request. + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit cf88363db0ebb42df7cc286b85d30d7898aea840) + +commit 3b687814a5b999305042775a2bddc3c10706f6da +Author: Kristian Høgsberg <k...@bitplanet.net> +Date: Thu Sep 23 09:04:11 2010 -0400 + + glx: Fix use after free in DrawableGone + + (note that nearly identical patches were proposed by Kristian and Chris) + + Signed-off-by: Kristian Høgsberg <k...@bitplanet.net> + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + Reported-by: Julien Cristau <jcris...@debian.org> + Reviewed-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Tested-by: Chris Wilson <ch...@chris-wilson.co.uk> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 2f0abd7d690c3bcce2a80c093a0880f43e56d8cb) + +commit 57d454758994312b8572a753501dd1e5c89b4f7e +Author: Thomas Hellstrom <thellst...@vmware.com> +Date: Thu Sep 2 10:53:28 2010 +0200 + + linux: Don't lose console events on non-evdev drivers (#29969) + + The drain_console() function will race with new keyboard events being added + by the hardware causing the server to lose keyboard events if the console fd + is used for input. + + Only use the drain_console() when AllowEmptyInput is off which is the best + indicator we have for whether the keyboard driver will be used. This patch + will only fix the bug when hotplugging is disabled. + What we really need is a way to figure out either whether we're _not_ using + the keyboard driver (not predictable) or a way for the keyboard driver to + disable drain_console(). + + X.Org Bug 29969 <http://bugs.freedesktop.org/show_bug.cgi?id=29969> + + Signed-off-by: Thomas Hellstrom <thellst...@vmware.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 71972c2534d490284d3d42b456c2f34b964b2894) + +commit 918cb214ab4240be4772a141d1209c0ff5dfd63b +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Aug 23 08:35:01 2010 +1000 + + xfree86: Check for existence of button class before dereferencing it. + + The Irxon Super Mini Bluetooth Wireless Keyboard for PC/PDA/Cell Phones + keyboards have axes but not buttons. The evdev driver doesn't set up a + button class for these keyboards and a motion event handled by + DGAProcessPointerEvent dereferences the dev->button NULL pointer, causing a + server crash. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit e00e2e7b68fbc932269d607ac5dc2c441d07ad9d) + +commit 5a29cb126de577a2a0a41e10d9af13091a73d334 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Aug 24 13:46:35 2010 +1000 + + dix: don't set time to CurrentTime in DeviceChangedEvents. + + CurrentTime is used by clients to skip setting the time, but not by the + server. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 86560b5d05f14bdf04d21b3457a66c0d5045db9c) + +commit 72e3e6f4a7690f70a6b5f7689633cdea859535e1 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Aug 23 13:20:09 2010 +1000 + + dix: fix crash when removing devices on a buttonless MD pointer (#29669) + + If the master does not have a button class, recalculating the number of + buttons required for this master dereferences a NULL pointer. Guard against + this, if the master pointer doesn't have a button class, it doesn't need to + update it's number of buttons. + + Reproducible: + Two devices on the same master, device NB with axes but no buttons, device + A+B with axes and button . + If NB was the last one to send an event through the master when A+B is + removed from the server, master->button is NULL and leads to the above + NULL-pointer dereference. + + X.Org Bug 29669 <http://bugs.freedesktop.org/show_bug.cgi?id=29669> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit ff055506f0cbb852bed17acb9f9bbf1d715a854e) + +commit 0f3a0ab1f01ec5314ccb0bfb932c49f8c61b9866 +Author: Chase Douglas <chase.doug...@ubuntu.com> +Date: Wed Sep 1 14:45:34 2010 +1000 + + Fix udev population of Bluetooth input device product IDs + + The udev device_added function takes the vendor and model IDs of added + devices and converts them into an attribute that can be matched for by + an InputClass configuration using MatchUSBID. Currently, the udev + mechanism works for USB devices, but fails to work properly for + Bluetooth devices. The product IDs of the event node are actually the + IDs of the Bluetooth receiver instead of the device. + + This patch reads the product ID from the PRODUCT property of the parent + of the added device. This tag is set correctly for both USB and + Bluetooth input devices. The following devices have been tested by + specifying individual InputClass sections in xorg.conf: + + * Apple Keyboard (Bluetooth) + * Apple Magic Trackpad (Bluetooth) + * Apple Magic Mouse (Bluetooth) + * Microsoft Bluetooth Notebook Mouse 5000 (Bluetooth) + * Microsoft IntelliMouse Optical (USB) + * N-Trig Touchscreen (USB) + * Wacom Bamboo Touch (USB) + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 7925e8945649d4af237e6c3c5593b895a461bd1e) + +commit a0040f9870c78fd1f7e7ac81555cb783c152e287 +Author: Jesse Adkins <jesserayadk...@gmail.com> +Date: Wed Aug 25 13:48:29 2010 -0700 + + xfree86: Document terminate not mapped by default (bug 25083) + + Document that terminate is not mapped to Ctrl+Alt+Backspace by default, to help alleviate some confusion. + + Signed-off-by: Jesse Adkins <jesserayadk...@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 4a12aecac670debd0dafb17c245fccb93eea2d60) + +commit 34b11fcd90258a70c02a04a13598b4a4af2c2974 +Author: David Ge <david...@gmail.com> +Date: Thu Aug 19 00:33:57 2010 -0500 + + xkb: Fix RedirectKey didn't send any event. + + Xorg.log shows error: Valuators reported for non-valuator device. + This is caused by uninitialized valuators.mask in _XkbFilterRedirectKey(), + which trigger the error in UpdateDeviceState(). + + Signed-off-by: David Ge <david...@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit a90052ba8697e217b0dc68057d7b9202ae8797db) + +commit 0062d94cafcea5a2fea6224904188d1435c1983f +Author: Pauli Nieminen <ext-pauli.niemi...@nokia.com> +Date: Mon Jul 26 15:31:03 2010 +0300 + + xkb: Check if AddResource failed + + Signed-off-by: Pauli Nieminen <ext-pauli.niemi...@nokia.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit b5c9953bbf4ffd11f1a70d058c6d3feb2bd1bca8) + +commit eecf91150d4c17fe73913fd6c24064c0394fb40e +Author: Pauli Nieminen <ext-pauli.niemi...@nokia.com> +Date: Thu Jul 22 15:11:27 2010 +0300 + + xkb: Fix memory leak in error path + + map is allocated but not freed if reply length and data don't match. + + Signed-off-by: Pauli Nieminen <ext-pauli.niemi...@nokia.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit adc0697cfcfba295a15d7a307125093cbccd637f) + +commit b912c08ffa09ec9d7c55db7df1df622dd4b6ab64 +Author: Pauli Nieminen <ext-pauli.niemi...@nokia.com> +Date: Thu Jul 22 11:33:33 2010 +0300 + + xkb: Fix memory leak if opening file fails + + If fopen fails pointer in buf would be overwriten with a new pointer. + + Signed-off-by: Pauli Nieminen <ext-pauli.niemi...@nokia.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 1223340644744c0b38aa85f5956eb5ab7c696517) + +commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Aug 17 12:08:52 2010 +1000 + + dix: don't create core motion events for non-x/y valuators. + + Devices that send motion events with valuators other than x/y get core + motion events with unchanged x/y coordinates. This confuses some + applications. + + If the DeviceEvent does not have the x/y valuators set, return BadMatch on + core conversion, thus skipping the event altogether. + + Reported-by: Bartosz Brachaczek <b.brachac...@gmail.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Tested-by: Bartosz Brachaczek <b.brachac...@gmail.com> + (cherry picked from commit de8be07cc0a8163b6ef04455706fd5ca2cebe587) + +commit d0ca4826d6dca7c43965e4606a31e90091207412 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sat Sep 11 14:25:21 2010 -0700 + + XQuartz: Localization updates + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + (cherry picked from commit 0a3e6b0345a96aae278dd776c00b5a7c7ccf65af) + +commit c89f0521044083a11d538ebfeaabee6fc7fb9a03 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Aug 15 20:07:28 2010 -0700 + + rootless: Remove ROOTLESS_WORKAROUND + + This was already removed for XWin (20701522be803fe47e921fcf059dadf64c7f287d) + with no reported side effects. XQuartz seems to be behaving ok without it as + well. While this possibly brings back bug #1168, we don't have any reproduction + steps for that issue, and if it crops up again, we should fix it a real way + rather than this hokey workaround which doesn't even work for COMPOSITE. + + This effectively reverts the following two changes: + b2135e589baeb2ea26da50b9167feaea23bcce3c + d7fef52254126aa5897a5c58faeda1f61d5b13d8 + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + (cherry picked from commit 4e09a69c5b1f3c8d6f2f92ec24aaab3a1119940c) + +commit e615acf06feabd4de695d1237aa3891957428999 +Author: Eamon Walsh <ewa...@tycho.nsa.gov> +Date: Mon Aug 30 16:37:05 2010 -0400 + + Add screens to the PRIVATE_XSELINUX set. + + The SELinux extension does store a security label in the screen + devPrivates. Fixes crash caused by overwriting another private. + + Signed-off-by: Eamon Walsh <ewa...@tycho.nsa.gov> + Reported-by: Justin Mattock <justinmatt...@gmail.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 9a1a4ccbe026f34beca5db3b2243874906961b49) + +commit ad62b2400907bf856ece615197066aad02503716 +Author: Eamon Walsh <ewa...@tycho.nsa.gov> +Date: Mon Aug 23 16:04:03 2010 -0400 + + Fix property and selection devPrivate allocation. + + Selection objects were not being allocated with privates, and both + objects had a stray statement that zeroed out the devPrivates field. + + Signed-off-by: Eamon Walsh <ewa...@tycho.nsa.gov> + Reported-by: Justin Mattock <justinmatt...@gmail.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + (cherry picked from commit 9ef6241c2382bfc555284a4985f6d1e37d750d6f) + +commit 79ee78de9de49d0cab03401662baa476a18e53b8 +Author: Keith Packard <kei...@keithp.com> +Date: Fri Aug 20 17:32:27 2010 -0700 + + xserver 1.9.0 + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 3e56efcfb63677cd8574e1e435e61d96f79ea536 +Author: Keith Packard <kei...@keithp.com> +Date: Fri Aug 20 10:01:48 2010 -0700 + + fb: make isClipped always reject negative coordinates (bug 11503) + + A window with either dimension > 32767 can be positioned such that + coordinates > 32767 are visible on the screen. Attempts to draw to + those pixels will generate coordinates wrapped around to negative + values. + + The optimized clipping macro, 'isClipped', in fbbits.h, computes + clipping in window space rather than screen space using int16 values, + and so it too has coordinates wrapped around to negative values and + hence ends up accepting the wrapped drawing coordinates. + + Two possible fixes for this problem + + 1) Detect wrapped region coordinates and clip those to 32767. + 2) Detect negative incoming coordinates and reject those + + This patch takes the second approach as it is much shorter, simply + detecting when either X or Y incoming coordinate is negative, which + can never be 'within' any drawable. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 951605b4660290044fb238bcf1d6d9e498567e8c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Aug 20 13:51:04 2010 +0100 + + edid: Adjust rounding of max_clock + + A simple hack to accommodate various EDID who have detailed modes that + exceed the EDID's max pixel clock. The pixel clock is only defined in + units of 10MHz and often appears as the maximum pixel code of the + detailed modes, rounded to the nearest 10MHz. Adjusting the max_clock to + include an extra 5MHz prevents the parser from rejecting the detailed + modes. + + The kernel uses the same fuzz and by including it in X we can use the + same modes in X as for the console. + + Fixes: + + Bug 23833 - X uses different refresh rate to that set by kernel module + https://bugs.freedesktop.org/show_bug.cgi?id=23833 + + In the future, we will want to try harder to keep the KMS modes but at + the same time we need to apply the restrictions as specified by the + user's configuration, and need to fill in modes for fullscreen games on + fixed-mode panels. + + Reported-and-tested-by: Fabio Pedretti <fabio....@libero.it> + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + Reviewed-by: Alex Deucher <alexdeuc...@gmail.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 7e581780603d6b15291d032efdeeca77f969e0ba +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Jun 24 12:24:58 2010 +0100 + + glx: Prevent NULL context deref in __glXGetDrawable() (bug 29184) + + During a SwapBuffers request, we may end up querying an unknown drawable + outside of an active context, and so need to report this error prior to + attempting to dereference the NULL context. + + Also fixes: + + [Bug 29184] glXSwapBuffers with no GLX context crashes X. + https://bugs.freedesktop.org/show_bug.cgi?id=29184 + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + Cc: Kristian Høgsberg <k...@bitplanet.net> + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 5725849a1b427cd4a72b84e57f211edb35838718 +Author: Adam Jackson <a...@redhat.com> +Date: Mon Jun 28 18:08:50 2010 -0400 + + render: Bounds check for nglyphs in ProcRenderAddGlyphs (#28801) + + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Julien Cristau <jcris...@debian.org> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit fc091936e2bddbbab9c9a501edc5a5f08388617e +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Aug 16 14:18:45 2010 +1000 + + dix: copy the valuators passed into GPE/GKVE/GProxE. + + GPE and friends modify the valuators array passed in. Which means any driver + using e.g. xf86PostButtonEventP(..., valuators) twice to emulate a button + click will provide garbage data on the second run. + + This is currently affecting the wacom driver, xf86PostButtonEventP() with + valuators is required to have input events with device-specific axis values. + Passing the same valuators in twice, once with press, once with release, + will see the valuators modified in the first call and garbage submitted in + the next one. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 6e3e559e9fa63069a10eb834a6dab9a4cfc140ee +Author: Keith Packard <kei...@keithp.com> +Date: Sun Aug 15 20:53:20 2010 -0700 + + dix: reset pScreen->root to NULL when root window is deleted. + + From: Dave Airlie <airl...@linux.ie> + + We were seeing a crash in the FreeAllResources codepath, + running valgrind revealed this, + + ==12536== Invalid read of size 4 + ==12536== at 0x810BCAB: DeliverPropertyEvent (rrproperty.c:33) + ==12536== by 0x80958A4: TraverseTree (window.c:227) + ==12536== by 0x809593E: WalkTree (window.c:255) + ==12536== by 0x810BC66: RRDeliverPropertyEvent (rrproperty.c:53) + ==12536== by 0x810BD5D: RRDeleteProperty.clone.0 (rrproperty.c:76) + ==12536== by 0x810BD98: RRDeleteAllOutputProperties (rrproperty.c:88) + ==12536== by 0x810A36E: RROutputDestroyResource (rroutput.c:407) + ==12536== by 0x808DF4E: FreeClientResources (resource.c:859) + ==12536== by 0x808E005: FreeAllResources (resource.c:876) + ==12536== by 0x8062300: main (main.c:305) + ==12536== Address 0x46ba8ac is 4 bytes inside a block of size 164 free'd + ==12536== at 0x40057F6: free (vg_replace_malloc.c:325) + ==12536== by 0x8087F1F: _dixFreeObjectWithPrivates (privates.c:357) + ==12536== by 0x809832A: DeleteWindow (window.c:926) + ==12536== by 0x808DF4E: FreeClientResources (resource.c:859) + ==12536== by 0x808E005: FreeAllResources (resource.c:876) + ==12536== by 0x8062300: main (main.c:305) + + Its a use after free on the root window, since we have already deleted it + at this point. This patch checks if the window we are destroying is the root + window and resets the pointer to NULL if it is. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Dave Airlie <airl...@redhat.com> + Tested-by: Dave Airlie <airl...@redhat.com> + +commit 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Aug 1 11:41:58 2010 -0700 + + XQuartz: xpr: Bail on errors during unlock and destroy + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit ee7fd8fc58d9fadfbb92302ddea224537f068538 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Aug 1 11:39:14 2010 -0700 + + XQuartz: UpdateScreen at the end of SetRootless + + This will ensure that pRoot is unlocked after the miPaintWindow + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 4fc4cab98d454afbfd0d2f48548b5b481e8e7c82 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Thu Jul 29 14:49:10 2010 -0700 + + XQuartz: Make application switching work better for the no-spaces case + + We still have the issue with not raising the frontmost window for the case + when spaces is enabled, and the AppleSpacesSwitchOnActivate preference is + disabled. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit e5bc62a03289f956c54c4699edf47f7ff237b5be +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Jul 25 22:29:11 2010 -0700 + + XQuartz: Ignore kXquartzToggleFullscreen when rootless + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 71af1f71c0492c365707c6b3810f94642ff39352 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Aug 12 23:01:59 2010 -0700 + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1p5fj8-0001cp...@alioth.debian.org