ChangeLog | 238 +++++++++ config/hal.c | 27 + configure.ac | 5 debian/changelog | 95 +++ debian/control | 5 debian/patches/03_glx-init-infinite-loop.diff | 27 + debian/patches/138_look_at_all_bytes_of_dev_enabled.diff | 63 ++ debian/patches/series | 1 debian/rules | 2 exa/exa.h | 4 exa/exa_migration.c | 6 exa/exa_priv.h | 3 glx/glxdri.c | 2 glx/glxscreens.c | 2 hw/kdrive/src/kinput.c | 2 hw/kdrive/vesa/vm86.h | 7 hw/xfree86/common/Makefile.am | 3 hw/xfree86/common/xf86.h | 1 hw/xfree86/common/xf86Config.c | 39 + hw/xfree86/common/xf86Events.c | 173 ------- hw/xfree86/common/xf86Globals.c | 1 hw/xfree86/common/xf86Helper.c | 7 hw/xfree86/common/xf86Init.c | 359 +++++++++------ hw/xfree86/ddc/interpret_edid.c | 10 hw/xfree86/doc/man/xorg.conf.man.pre | 1 hw/xfree86/dri/dri.c | 2 hw/xfree86/os-support/linux/lnx_init.c | 52 ++ include/dix-config.h.in | 6 include/os.h | 2 mi/mieq.c | 6 os/Makefile.am | 1 os/backtrace.c | 201 ++++++++ os/log.c | 1 randr/rrproperty.c | 44 + 34 files changed, 1058 insertions(+), 340 deletions(-)
New commits: commit 23524bd01538a8d40572b0e3ba9bea75886fc148 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Wed Nov 26 13:42:36 2008 +0200 Update the changelog and release also, change the maintainer address to ubuntu-x diff --git a/debian/changelog b/debian/changelog index 0ce9f96..3b5eab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.5.3-1ubuntu1) UNRELEASED; urgency=low +xorg-server (2:1.5.3-1ubuntu1) jaunty; urgency=low * Merge from debian-experimental, remaining changes: + debian/control: @@ -64,7 +64,7 @@ xorg-server (2:1.5.3-1ubuntu1) UNRELEASED; urgency=low - debian/control: xfvb doesn't need to Depend on xauth, xfonts-base anymore, Recommends are pulled in by default now. - -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 18 Nov 2008 13:44:58 +0200 + -- Timo Aaltonen <[EMAIL PROTECTED]> Wed, 26 Nov 2008 13:42:11 +0200 xorg-server (2:1.5.3-1) experimental; urgency=low diff --git a/debian/control b/debian/control index f40d5f8..5d9009f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: xorg-server Section: x11 Priority: optional -Maintainer: Ubuntu Core Developers <[EMAIL PROTECTED]> +Maintainer: Ubuntu X-SWAT <[EMAIL PROTECTED]> XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Steve Langasek <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]> # all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg commit e30b6e7cdede9b7dc8ddbbd8deaed9e6c161783e Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Wed Nov 19 13:36:20 2008 +0200 Update the changelog drop a couple of unneeded changes while at it. diff --git a/debian/changelog b/debian/changelog index ceb1a1a..0ce9f96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,71 @@ +xorg-server (2:1.5.3-1ubuntu1) UNRELEASED; urgency=low + + * Merge from debian-experimental, remaining changes: + + debian/control: + - x11proto-input-dev, libxi-dev build-deps bumped because of + input properties. + - Conflict with xserver-xorg-video-psb << 0.15.0-0ubuntu1~804um5 + as these versions didn't have an ABI provide. + - Breaks old synaptics, evdev which didn't have properties. + + debian/patches: + - 100_xserver_exa_force_greedy.patch + Provide a mechanism for drivers to force greedy mode on. + - 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 102_ubuntu_sharevts_load_cpu.patch + Close console fd only when using --sharevts. + - 103_inputproto_1.4.3_is_fine.patch: + Don't require inputproto 1.4.4 in configure.ac. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + would otherwise force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 135_rethrow_signals.patch + Currently Xorg "eats" its crash signals, issuing an error message + that it caught the signal and then aborts. This patch raises the + signal it caught, so that subsequent crash handlers (i.e. apport) + can also catch and act on it. + - 136_fedora_force_switchcorekeyboard_for_evdev.patch + Allow clients to set the layout. + - 137_add_device_property_support.patch + Add support for input-device properties (XI 1.5). + - 138_look_at_all_bytes_of_dev_enabled.diff: dev->enabled has type + Bool, which is typedef'd to int, but is used in comparisons with + CARD8 data, which gives incorrect logic on big endian systems, + causing failure to initialize keyboard and mouse. + - 140_quell_acpid_errmsgs.patch: Don't fill the server log with errors + from not being able to connect to acpid. + - 141_improved_driver_selection.patch + Allow returning multiple drivers to try for a given PCI id. + Also includes support for fallback drivers, but only when + not using an xorg.conf. + - 142_psb_auto.patch + Autoload vesa for the psb hardware, psb being broken currently. + - 143_default_to_vesa.patch: If no matching driver is found in the + .ids files, set "vesa" as a fallback default, otherwise a driver + may be selected regardless of whether it actually provides support + for the chipset by videoPtrToDriverList() based on its vendor id. + - 150_no_visibility_notify_on_unredirect.patch + Do not sent VisibilityNotify events when MapUnmapEvents + are disabled + + debian/local/xvfb-run: disable the Composite-extension for xvfb. + + debian/serverminver: Bump the serverminver because of the newer + properties API. + + debian/rules: + Add --enable-xcsecurity --enable-appgroup. The SECURITY module was + disabled by default as part of the SELinux merge. However, we need + the security module for xauth on Kubuntu, else ubiquity fails. + (LP 247537) + * Changes done: + - debian/control: xfvb doesn't need to Depend on xauth, xfonts-base + anymore, Recommends are pulled in by default now. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 18 Nov 2008 13:44:58 +0200 + xorg-server (2:1.5.3-1) experimental; urgency=low [ Loic Minier ] diff --git a/debian/control b/debian/control index e18295d..f40d5f8 100644 --- a/debian/control +++ b/debian/control @@ -150,7 +150,8 @@ Description: Nested X server Package: xvfb Architecture: any -Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}, xauth, xfonts-base +Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends} +Recommends: xauth, xfonts-base Description: Virtual Framebuffer 'fake' X server Xvfb provides an X server that can run on machines with no display hardware and no physical input devices. It emulates a dumb framebuffer using virtual diff --git a/debian/rules b/debian/rules index 6da247f..8670767 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,6 @@ confflags += --disable-static \ --enable-record \ --enable-glx-tls \ --enable-dmx \ - --enable-record \ --enable-vfb \ --enable-kdrive \ --enable-xephyr \ commit 939ec58f5f3bd7f20a51ab2fd3cadf492c5cf85a Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Thu Nov 13 17:21:04 2008 +0200 add a missing patch to git diff --git a/debian/patches/138_look_at_all_bytes_of_dev_enabled.diff b/debian/patches/138_look_at_all_bytes_of_dev_enabled.diff new file mode 100644 index 0000000..a8c5c0a --- /dev/null +++ b/debian/patches/138_look_at_all_bytes_of_dev_enabled.diff @@ -0,0 +1,63 @@ +Resolve fatal "No core keyboard" error on !x86 platforms (LP: #281610) + +In dix/devices.c cast dev->enabled to Bool not CARD8. On big endian systems +using *(CARD8*)(&dev->enabled) doesn't look at the right byte. Bool is +typedef'd to int which produces the correct cross platform representation. + +Patch taken from upstream bug 18111: +https://bugs.freedesktop.org/show_bug.cgi?id=18111 + +Index: xorg-server/dix/devices.c +=================================================================== +--- xorg-server.orig/dix/devices.c 2008-10-23 07:15:14.000000000 +0100 ++++ xorg-server/dix/devices.c 2008-10-23 07:21:47.000000000 +0100 +@@ -99,12 +99,13 @@ + { + if (property == XIGetKnownProperty(XI_PROP_ENABLED)) + { +- if (prop->format != 8 || prop->type != XA_INTEGER || prop->size != 1) ++ if (prop->format != 8 * sizeof(dev->enabled) || ++ prop->type != XA_INTEGER || prop->size != 1) + return BadValue; + +- if ((*((CARD8*)prop->data)) && !dev->enabled) ++ if ((*((Bool*)prop->data)) && !dev->enabled) + EnableDevice(dev); +- else if (!(*((CARD8*)prop->data)) && dev->enabled) ++ else if (!(*((Bool*)prop->data)) && dev->enabled) + DisableDevice(dev); + } + +@@ -200,8 +201,8 @@ + dev->next = NULL; + + XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED), +- XA_INTEGER, 8, PropModeReplace, 1, &dev->enabled, +- FALSE); ++ XA_INTEGER, 8 * sizeof(dev->enabled), ++ PropModeReplace, 1, &dev->enabled, FALSE); + XISetDevicePropertyDeletable(dev, XIGetKnownProperty(XI_PROP_ENABLED), FALSE); + XIRegisterPropertyHandler(dev, DeviceSetProperty, NULL, NULL); + +@@ -243,8 +244,8 @@ + dev->next = NULL; + + XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED), +- XA_INTEGER, 8, PropModeReplace, 1, &dev->enabled, +- TRUE); ++ XA_INTEGER, 8 * sizeof(dev->enabled), ++ PropModeReplace, 1, &dev->enabled, TRUE); + + ev.type = DevicePresenceNotify; + ev.time = currentTime.milliseconds; +@@ -284,8 +285,8 @@ + inputInfo.off_devices = dev; + + XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED), +- XA_INTEGER, 8, PropModeReplace, 1, &dev->enabled, +- TRUE); ++ XA_INTEGER, 8 * sizeof(dev->enabled), ++ PropModeReplace, 1, &dev->enabled, TRUE); + + ev.type = DevicePresenceNotify; + ev.time = currentTime.milliseconds; commit 93637bfb425767870134448c44ab0b65df6ad0c5 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Nov 11 23:17:16 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 936f8f4..ea16a0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.5.3-1) UNRELEASED; urgency=low +xorg-server (2:1.5.3-1) experimental; urgency=low [ Loic Minier ] * Shut up rmdir error when trying to remove dirs; this might confuse @@ -12,7 +12,7 @@ xorg-server (2:1.5.3-1) UNRELEASED; urgency=low * Enable the record extension (closes: #504303). * Merge changes from 2:1.4.2-8. - -- Loic Minier <[EMAIL PROTECTED]> Wed, 15 Oct 2008 21:50:15 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Tue, 11 Nov 2008 23:17:14 +0100 xorg-server (2:1.5.2-1) experimental; urgency=low commit bf2ca2eadea35f814d3157cd2d5064b6e7a32f46 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Nov 11 20:47:24 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 8186d92..0137782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.4.2-8) UNRELEASED; urgency=low +xorg-server (2:1.4.2-8) unstable; urgency=low * Add patch from Petr Salinger to fix PCI domain support on kfreebsd (closes: #499501). @@ -7,7 +7,7 @@ xorg-server (2:1.4.2-8) UNRELEASED; urgency=low actually supports (closes: #504819, #486925); cherry-picked from upstream git. - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 06 Oct 2008 18:37:08 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Tue, 11 Nov 2008 20:46:52 +0100 xorg-server (2:1.4.2-7) unstable; urgency=low commit f03646c4074409ca98406ec0c71e47407971ab8c Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Nov 7 21:04:24 2008 +0100 update changelog diff --git a/debian/changelog b/debian/changelog index 53babc4..8186d92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ xorg-server (2:1.4.2-8) UNRELEASED; urgency=low * Add patch from Petr Salinger to fix PCI domain support on kfreebsd (closes: #499501). + * xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags. + Instead of forcing a 32bpp framebuffer, we pick a value that the driver + actually supports (closes: #504819, #486925); cherry-picked from upstream + git. -- Julien Cristau <[EMAIL PROTECTED]> Mon, 06 Oct 2008 18:37:08 +0200 commit f6d8e366f8b922f7e711f4c29b5ea11ec4f8b342 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Nov 7 17:36:38 2008 +0100 xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags When setting the depth to 24, leave bpp unset so the logic to pick a supported value is used instead of ignoring the driver's preference and forcing 32 bpp. (cherry picked from commit 991c88b7542164194be73573e7644164416ea90c) diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 7adac73..b6e0787 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -466,10 +466,6 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad) #define GLOBAL_DEFAULT_DEPTH 24 #endif -#ifndef GLOBAL_DEFAULT_FBBPP -#define GLOBAL_DEFAULT_FBBPP 32 -#endif - _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, int depth24flags) @@ -547,7 +543,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, if (depth > 0) scrp->depth = depth; } else { - scrp->bitsPerPixel = GLOBAL_DEFAULT_FBBPP; scrp->depth = GLOBAL_DEFAULT_DEPTH; } } commit 55335c450ad117b1795dffbd77940b0b6b2c94ed Author: Julien Cristau <[EMAIL PROTECTED]> Date: Wed Nov 5 23:03:10 2008 +0100 update changelogs diff --git a/ChangeLog b/ChangeLog index 5b7377f..f4fbf87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,241 @@ +commit 4c6a89ee783d62fb75a738339351830c35b19a38 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Nov 5 15:39:01 2008 -0500 + + xserver 1.5.3 + +commit b0c2d009852972f1b085ab5ce2271692dface27f +Author: Julien Cristau <[EMAIL PROTECTED]> +Date: Sun Oct 26 13:13:21 2008 +0100 + + xfree86: fix compiler warnings in DoModalias() + + The precedence of == is higher than that of &, so that code was + probably buggy. + + xf86Init.c: In function 'DoModalias': + xf86Init.c:300: warning: suggest parentheses around comparison in operand of & + xf86Init.c:304: warning: suggest parentheses around comparison in operand of & + xf86Init.c:308: warning: suggest parentheses around comparison in operand of & + (cherry picked from commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0) + +commit a311fdc04013c678eb506458d6a5d3376f107bf7 +Author: Nathaniel McCallum <[EMAIL PROTECTED]> +Date: Tue Oct 14 09:50:29 2008 -0400 + + Xorg: add -modalias option + + This scans the installed video drivers and prints a Linux-style modalias + listing of the devices each driver claims to support. + +commit b8fd8da1ad985988426d0269982751a70535e8d0 +Author: Michel Dänzer <[EMAIL PROTECTED]> +Date: Tue Nov 4 11:27:53 2008 +0100 + + AIGLX: Reinstate call to driver texOffsetFinish hook. + + It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this + is a regression fix and should probably be backported to server-1.5-branch. + (cherry picked from commit a4d62bbf215894bad8e19d99f7330c637d3d49e3) + +commit 377712dbfce73348ad7f2610df51a1a805536392 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Nov 5 11:51:06 2008 -0500 + + linux: Drain the console fd of data when using evdev for keyboards + + Works around a silly bug in the kernel that causes wakeup storms after + too many keypresses. Should fix the kernel bug too, but this at least + keeps the idle wakeup count below 1000/sec. + (cherry picked from commit 446d9443cea31e493d05c939d0128a8116788468) + +commit 3245bf113619500b7b6cae3a3f31ddd2984cbc05 +Author: Peter Hutterer <[EMAIL PROTECTED]> +Date: Thu Oct 16 11:22:29 2008 +1030 + + xfree86: If AEI is on, disable "kbd" and "mouse" devices. + + This consists of two parts: + In the implicit server layout, ignore those drivers when looking for a core + device. + + And after finishing the server layout, run through the list of devices and + remove any that use mouse or kbd. + + AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or. + + Signed-off-by: Peter Hutterer <[EMAIL PROTECTED]> + (cherry picked from commit c264826da96ad1859dd112b17eb8aa9e5278478f) + +commit 58e6d6afe04189f3c88b9e1998247ff797607ccb +Author: Peter Hutterer <[EMAIL PROTECTED]> +Date: Sun Oct 12 21:58:30 2008 +1030 + + xfree86: if AllowEmptyInput is true, enable RAW mode on the console. + + Usually, the console is set to RAW in the kbd driver. If we hotplug all input + devices (i.e. the evdev driver for keyboards) and the console is left as-is. + As a result, the evdev driver must put an EVIOCGRAB on the device to avoid + characters leaking onto the console. This again breaks many things, amongst + them lirc, in-kernel mouse button emulation and HAL. + + This patch sets the console to RAW if AllowEmptyInput is on. + + Use-cases: + 1. AEI is off + 1.1. Only kbd driver is used - behaviour as-is. + 1.2. kbd and evdev driver is used: if evdev does not grab the device, + duplicate events are generated. + 2. AEI is on + 2.1. Only evdev driver is used - behaviour as-is, but evdev does not need + to grab the device anymore. + 2.2. evdev and kbd are used: duplicate key events are generated if evdev + does not grab the device. + + 1.2 is a marginal use-case that can be fixed by adding a "grab" option to the + evdev driver (update of xorg.conf is needed). + + 2.2 is an issue. If we have no ServerLayout section, AEI is on, but devices + specified in the xorg.conf are still added [1], resulting in duplicate events. + This is a common configuration and needs sorting out. + + [1] 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d + + Signed-off-by: Peter Hutterer <[EMAIL PROTECTED]> + Signed-off-by: Adam Jackson <[EMAIL PROTECTED]> + (cherry picked from commit d936a4235c9625bd41569cef3452dd086284e0d7) + +commit bc199fdf79a72275592d325dc034adccc6dd93af +Author: Peter Hutterer <[EMAIL PROTECTED]> +Date: Mon Oct 20 12:19:55 2008 +1030 + + config: don't add duplicate devices through HAL. + + If HAL is restarted, the device list is sent to the server again, leading + first to duplicate devices (and thus duplicate events), and later to a + FatalError "Too many input devices." + + dev->config_info contains the UDI for the device. If the UDI of a new devices + is equal to one we already have in the device list, just ignore it. + + Signed-off-by: Peter Hutterer <[EMAIL PROTECTED]> + (cherry picked from commit 6c451859552e1fc78f6589617482f9ff96d7ed8a) + +commit e63ef549bb7a2591d99987c85f414c08dbbf9a6b +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Tue Oct 21 22:32:57 2008 +0200 + + Close well known connections in ServerAbort() + (cherry picked from commit d72cd753b99fae147ef4c189700fc697f1ea7fb0) + +commit 5d14e345411dfe4b4fd334e4e54fbf24dcfa65bd +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Oct 21 13:10:44 2008 -0400 + + exa: Add exaDrawableIsOffscreen() to the driver API. + + (cherry picked from commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003) + +commit f4c33e2e64ce83c29c3bc79853e421247acfea11 +Author: Michel Dänzer <[EMAIL PROTECTED]> +Date: Mon Oct 20 09:55:24 2008 -0400 + + EXA: Avoid excessive syncing in PutImage + (cherry picked from commit 2188582e5ea90edb432a2f421d0a267439ba08f9) + +commit df22857b34edb9f29ace3800ba99f14c7be8058e +Author: Pierre Willenbrock <[EMAIL PROTECTED]> +Date: Thu Oct 16 14:28:14 2008 -0400 + + RANDR: Fix output property event delivery. + (cherry picked from commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f) + +commit 42429aa3269d68bc7909616ce8b0d0b5ca5624d2 +Author: Keith Packard <[EMAIL PROTECTED]> +Date: Mon Oct 6 12:21:20 2008 -0400 + + RANDR: Delivery output property events. + (cherry picked from commit 9187f6ad9ec7ba9569a93d92561aac17eaa83491) + +commit b28c25b5aeecea22aba997e2b0d24e77a22b6e02 +Author: Rémi Cardona <[EMAIL PROTECTED]> +Date: Tue Oct 21 10:07:24 2008 -0400 + + Force LC_ALL=C when building xf86DefModeSet.c + + Fixes build in not-quite-latin locales. + +commit 992a7168f0db5733fe4a6cbd2f40c6b1f2a150e0 +Author: Martin von Gagern <[EMAIL PROTECTED]> +Date: Wed Nov 5 11:44:03 2008 -0500 + + Bug #17858: Fix Xvesa build on newer kernels. + + Not cherry picked from master, Xvesa is gone there. + +commit ec5046ca7565e2364f42606b26159520a73dd207 +Author: Maarten Maathuis <[EMAIL PROTECTED]> +Date: Fri Oct 10 23:23:02 2008 +0200 + + dri: don't set the dixPrivate key to NULL, as this is a staticly set variable. + + - This breaks on the 2nd server generation. + - No other subsystem seems to NULL their key. + - This should fix bug 17982. + (cherry picked from commit 5b336585a4cdf11d20831a9536ad581e959ea7f1) + +commit f75163e5f6fc6dd63ac4eb97e403086031230250 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Oct 21 16:00:32 2008 -0400 + + Bug #18159: Spell "anisotropic" correctly + (cherry picked from commit 81e197b2a5457bb9f7ed72f82c2d33fd8dbfc202) + +commit b468eacf511de3c3f8b6a1abd9e38680947b464e +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Oct 14 09:45:19 2008 -0400 + + kdrive: Hardcode a different wrong value for number of mouse buttons + + This should really come from the input driver directly, but, kdrive. + (cherry picked from commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b) + +commit 19776ede8f10e0f59dbc50d93e51facbc4071877 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Oct 14 13:00:50 2008 -0400 + + Add backtrace definitions to dix-config.h.in + (cherry picked from commit ad677238bc96a8578113bbe76d605d7a87aca44c) + +commit 483fb847b4363d09ff3347f61ad51bba1dd00602 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Fri Oct 10 16:33:24 2008 -0400 + + mieq: Backtrace when the queue overflows. + + Since we're probably stuck down in a driver somewhere, let's at least + try to point out where. This will need to be rethought when the input + thread work lands though. + (cherry picked from commit b736f477f5324f79af30fc0f941ba0714a34ccda) + +commit 7df5e93cf52aad35509be9e6d8c25e399fba0c60 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Fri Oct 10 15:53:48 2008 -0400 + + Move xorg_backtrace() up to the OS level so we can call it from DIX. + (cherry picked from commit 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd) + +commit aa548b0a9b4999f21630273261a8f5880dd24a7f +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Oct 14 14:04:01 2008 -0400 + + EDID: Catch even more cases of encoding aspect as size. + + Very cute, Samsung, not only do you claim to be 16cm by 9cm in the + global size record, you also claim to be 160mm by 90mm in the detailed + timings. Grrr. + (cherry picked from commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a) + commit 6dcfa994b0777bf0cabeb71672f13e650b340817 Author: Adam Jackson <[EMAIL PROTECTED]> Date: Fri Oct 10 15:26:32 2008 -0400 diff --git a/debian/changelog b/debian/changelog index 581ab5a..4c1da27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -xorg-server (2:1.5.2-2) UNRELEASED; urgency=low +xorg-server (2:1.5.3-1) UNRELEASED; urgency=low [ Loic Minier ] * Shut up rmdir error when trying to remove dirs; this might confuse debconf. [ Julien Cristau ] + * New upstream release. * Fix infinite loop on server reset when swrast_dri.so is missing. Only push swrast on the glx provider stack on first generation, so we don't turn the stack into a circular list (closes: #500287). commit 4c6a89ee783d62fb75a738339351830c35b19a38 Author: Adam Jackson <[EMAIL PROTECTED]> Date: Wed Nov 5 15:39:01 2008 -0500 xserver 1.5.3 diff --git a/configure.ac b/configure.ac index 88749a5..de932f2 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.5.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="10 October 2008" +AC_INIT([xorg-server], 1.5.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="5 November 2008" +REMEMBER_REMEMBER="The Fifth of November" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE commit b0c2d009852972f1b085ab5ce2271692dface27f Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Oct 26 13:13:21 2008 +0100 xfree86: fix compiler warnings in DoModalias() The precedence of == is higher than that of &, so that code was probably buggy. xf86Init.c: In function 'DoModalias': xf86Init.c:300: warning: suggest parentheses around comparison in operand of & xf86Init.c:304: warning: suggest parentheses around comparison in operand of & xf86Init.c:308: warning: suggest parentheses around comparison in operand of & (cherry picked from commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0) diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 8b41d81..fc50caf 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -307,15 +307,15 @@ DoModalias() ErrorF("sd%08X", match->subdevice_id); /* Class */ - if (match->device_class_mask >> 16 & 0xFF == 0xFF) + if ((match->device_class_mask >> 16 & 0xFF) == 0xFF) ErrorF("bc%02X", match->device_class >> 16 & 0xFF); else ErrorF("bc*"); - if (match->device_class_mask >> 8 & 0xFF == 0xFF) + if ((match->device_class_mask >> 8 & 0xFF) == 0xFF) ErrorF("sc%02X", match->device_class >> 8 & 0xFF); else ErrorF("sc*"); - if (match->device_class_mask & 0xFF == 0xFF) + if ((match->device_class_mask & 0xFF) == 0xFF) ErrorF("i%02X*", match->device_class & 0xFF); else ErrorF("i*"); commit a311fdc04013c678eb506458d6a5d3376f107bf7 Author: Nathaniel McCallum <[EMAIL PROTECTED]> Date: Tue Oct 14 09:50:29 2008 -0400 Xorg: add -modalias option This scans the installed video drivers and prints a Linux-style modalias listing of the devices each driver claims to support. diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 065102f..e915217 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -56,6 +56,7 @@ /* General parameters */ extern int xf86DoConfigure; +extern Bool xf86DoModalias; extern Bool xf86DoConfigurePass1; extern DevPrivateKey xf86ScreenKey; extern DevPrivateKey xf86CreateRootWindowKey; diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 0dc42c6..f5babbc 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -149,6 +149,7 @@ Bool xf86Resetting = FALSE; Bool xf86Initialising = FALSE; Bool xf86DoProbe = FALSE; Bool xf86DoConfigure = FALSE; +Bool xf86DoModalias = FALSE; DriverPtr *xf86DriverList = NULL; int xf86NumDrivers = 0; InputDriverPtr *xf86InputDriverList = NULL; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 475628b..282eb49 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1486,6 +1486,8 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist) if (sectlist) *sectlist = NULL; + if (xf86DoModalias) return 0; + if (xf86DoProbe) return 1; if (xf86DoConfigure && xf86DoConfigurePass1) return 1; diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 68dc387..8b41d81 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -131,6 +131,207 @@ static int numFormats = 6; #endif static Bool formatsDone = FALSE; +#ifndef OSNAME +#define OSNAME " unknown" +#endif +#ifndef OSVENDOR +#define OSVENDOR "" +#endif +#ifndef PRE_RELEASE +#define PRE_RELEASE XORG_VERSION_SNAP +#endif + +static void +xf86PrintBanner() +{ +#if PRE_RELEASE + ErrorF("\n" + "This is a pre-release version of the X server from " XVENDORNAME ".\n" + "It is not supported in any way.\n" + "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n" + "Select the \"xorg\" product for bugs you find in this release.\n" + "Before reporting bugs in pre-release versions please check the\n" + "latest version in the X.Org Foundation git repository.\n" + "See http://wiki.x.org/wiki/GitPage for git access instructions.\n"); +#endif + ErrorF("\nX.Org X Server %d.%d.%d", + XORG_VERSION_MAJOR, + XORG_VERSION_MINOR, + XORG_VERSION_PATCH); +#if XORG_VERSION_SNAP > 0 + ErrorF(".%d", XORG_VERSION_SNAP); +#endif + +#if XORG_VERSION_SNAP >= 900 + /* When the minor number is 99, that signifies that the we are making + * a release candidate for a major version. (X.0.0) + * When the patch number is 99, that signifies that the we are making + * a release candidate for a minor version. (X.Y.0) + * When the patch number is < 99, then we are making a release + * candidate for the next point release. (X.Y.Z) + */ +#if XORG_VERSION_MINOR >= 99 + ErrorF(" (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1, XORG_VERSION_SNAP - 900); +#elif XORG_VERSION_PATCH == 99 + ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1, + XORG_VERSION_SNAP - 900); +#else + ErrorF(" (%d.%d.%d RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, + XORG_VERSION_PATCH + 1, XORG_VERSION_SNAP - 900); +#endif +#endif + +#ifdef XORG_CUSTOM_VERSION + ErrorF(" (%s)", XORG_CUSTOM_VERSION); +#endif +#ifndef XORG_DATE +#define XORG_DATE XF86_DATE +#endif + ErrorF("\nRelease Date: %s\n", XORG_DATE); + ErrorF("X Protocol Version %d, Revision %d\n", + X_PROTOCOL, X_PROTOCOL_REVISION); + ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR); +#ifdef HAS_UTSNAME + { + struct utsname name; + + /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX, + and Irix) and Single Unix Spec 3 just say that non-negative is success. + All agree that failure is represented by a negative number. + */ + if (uname(&name) >= 0) { + ErrorF("Current Operating System: %s %s %s %s %s\n", + name.sysname, name.nodename, name.release, name.version, name.machine); + } + } +#endif +#if defined(BUILD_DATE) && (BUILD_DATE > 19000000) + { + struct tm t; + char buf[100]; + + bzero(&t, sizeof(t)); + bzero(buf, sizeof(buf)); + t.tm_mday = BUILD_DATE % 100; + t.tm_mon = (BUILD_DATE / 100) % 100 - 1; + t.tm_year = BUILD_DATE / 10000 - 1900; +#if defined(BUILD_TIME) + t.tm_sec = BUILD_TIME % 100; + t.tm_min = (BUILD_TIME / 100) % 100; + t.tm_hour = (BUILD_TIME / 10000) % 100; + if (strftime(buf, sizeof(buf), "%d %B %Y %I:%M:%S%p", &t)) + ErrorF("Build Date: %s\n", buf); +#else + if (strftime(buf, sizeof(buf), "%d %B %Y", &t)) + ErrorF("Build Date: %s\n", buf); +#endif + } +#endif +#if defined(CLOG_DATE) && (CLOG_DATE > 19000000) + { + struct tm t; + char buf[100]; + + bzero(&t, sizeof(t)); + bzero(buf, sizeof(buf)); + t.tm_mday = CLOG_DATE % 100; + t.tm_mon = (CLOG_DATE / 100) % 100 - 1; + t.tm_year = CLOG_DATE / 10000 - 1900; + if (strftime(buf, sizeof(buf), "%d %B %Y", &t)) + ErrorF("Changelog Date: %s\n", buf); + } +#endif +#if defined(BUILDERSTRING) + ErrorF("%s \n",BUILDERSTRING); +#endif + ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n" + "\tto make sure that you have the latest version.\n"); +} + +static void +xf86PrintMarkers() +{ + LogPrintMarkers(); +} + +static void +DoModalias() +{ + int i = -1; + char **vlist; + + /* Get all the drivers */ + vlist = xf86DriverlistFromCompile(); + if (!vlist) { + ErrorF("Missing output drivers. PCI Access dump failed.\n"); + goto bail; + } + + /* Load all the drivers that were found. */ + xf86LoadModules(vlist, NULL); + + xfree(vlist); + + /* Iterate through each driver */ + for (i = 0; i < xf86NumDrivers; i++) { + struct pci_id_match *match; + + /* Iterate through each pci id match data, dumping it to the screen */ + for (match = (struct pci_id_match *) xf86DriverList[i]->supported_devices ; + match && !(!match->vendor_id && !match->device_id) ; match++) { + /* Prefix */ + ErrorF("alias pci:"); + + /* Vendor */ + if (match->vendor_id == ~0) + ErrorF("v*"); + else + ErrorF("v%08X", match->vendor_id); + + /* Device */ + if (match->device_id == ~0) + ErrorF("d*"); + else + ErrorF("d%08X", match->device_id); + + /* Subvendor */ + if (match->subvendor_id == ~0) + ErrorF("sv*"); + else + ErrorF("sv%08X", match->subvendor_id); + + /* Subdevice */ + if (match->subdevice_id == ~0) + ErrorF("sd*"); + else + ErrorF("sd%08X", match->subdevice_id); + + /* Class */ + if (match->device_class_mask >> 16 & 0xFF == 0xFF) + ErrorF("bc%02X", match->device_class >> 16 & 0xFF); + else + ErrorF("bc*"); + if (match->device_class_mask >> 8 & 0xFF == 0xFF) + ErrorF("sc%02X", match->device_class >> 8 & 0xFF); + else + ErrorF("sc*"); + if (match->device_class_mask & 0xFF == 0xFF) + ErrorF("i%02X*", match->device_class & 0xFF); + else + ErrorF("i*"); + + /* Suffix (driver) */ + ErrorF(" %s\n", xf86DriverList[i]->driverName); + } + } + +bail: + OsCleanup(TRUE); + AbortDDX(); + fflush(stderr); + exit(0); +} + static Bool xf86CreateRootWindow(WindowPtr pWin) { @@ -488,19 +689,21 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) else xf86ServerName = argv[0]; - xf86PrintBanner(); - xf86PrintMarkers(); - if (xf86LogFile) { - time_t t; - const char *ct; - t = time(NULL); - ct = ctime(&t); - xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s", - xf86LogFile, ct); + if (!xf86DoModalias) { + xf86PrintBanner(); + xf86PrintMarkers(); + if (xf86LogFile) { + time_t t; + const char *ct; + t = time(NULL); + ct = ctime(&t); + xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s", + xf86LogFile, ct); + } } /* Read and parse the config file */ - if (!xf86DoProbe && !xf86DoConfigure) { + if (!xf86DoProbe && !xf86DoConfigure && !xf86DoModalias) { switch (xf86HandleConfigFile(FALSE)) { case CONFIG_OK: break; @@ -537,6 +740,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) if (xf86DoConfigure) DoConfigure(); -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]