debian/changelog | 12 - debian/local/64-xorg-xkb.rules | 4 debian/patches/177_animated_cursor_change_master.patch | 86 --------- debian/patches/fix-dga-removal.patch | 155 ----------------- debian/patches/series | 3 debian/rules | 2 6 files changed, 10 insertions(+), 252 deletions(-)
New commits: commit d20381daae96ef680fa73727c15de442deb73425 Author: Timo Aaltonen <[email protected]> Date: Mon Dec 7 15:30:41 2009 +0200 Release 2:1.7.2-2ubuntu1 diff --git a/debian/changelog b/debian/changelog index e6bdf76..5facb67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low +xorg-server (2:1.7.2-2ubuntu1) lucid; urgency=low * Merge from Debian experimental. Remaining Ubuntu changes: - debian/rules, debian/control: @@ -72,7 +72,7 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low until we have it. * rules, local/64-xorg-xkb.rules: Use input_id from udev. - -- Bryce Harrington <[email protected]> Thu, 03 Dec 2009 15:03:34 -0800 + -- Timo Aaltonen <[email protected]> Mon, 07 Dec 2009 15:30:18 +0200 xorg-server (2:1.7.2-2) experimental; urgency=low commit 0beb248f962bef8876a59e1e9d5a114049df5dbc Author: Timo Aaltonen <[email protected]> Date: Mon Dec 7 15:22:07 2009 +0200 Fix the import of settings from /etc/default/console-setup. diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules index e8125e4..e543580 100644 --- a/debian/local/64-xorg-xkb.rules +++ b/debian/local/64-xorg-xkb.rules @@ -6,6 +6,6 @@ KERNEL!="event*", GOTO="xorg_xkb_end" ENV{ID_INPUT}=="", IMPORT{program}="/lib/udev/input_id %p" # import keyboard layout from /etc/default/keyboard -ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/console-setup" +ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/bin/grep ^XKB /etc/default/console-setup" LABEL="xorg_xkb_end" commit 47dfe4249a79816ee1a6c9a9635f42416842dba8 Author: Timo Aaltonen <[email protected]> Date: Mon Dec 7 15:20:43 2009 +0200 rules, local/64-xorg-xkb.rules: Use input_id from udev. diff --git a/debian/changelog b/debian/changelog index dc9ea60..e6bdf76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,7 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low * 190_cache-xkbcomp_output_for_fast_start_up.patch: Updated. * control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration until we have it. + * rules, local/64-xorg-xkb.rules: Use input_id from udev. -- Bryce Harrington <[email protected]> Thu, 03 Dec 2009 15:03:34 -0800 diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules index d42bfb6..e8125e4 100644 --- a/debian/local/64-xorg-xkb.rules +++ b/debian/local/64-xorg-xkb.rules @@ -3,7 +3,7 @@ SUBSYSTEM!="input", GOTO="xorg_xkb_end" KERNEL!="event*", GOTO="xorg_xkb_end" # input_id is only in udev > 147 -ENV{ID_INPUT}=="", IMPORT{program}="/lib/xorg/input_id %p" +ENV{ID_INPUT}=="", IMPORT{program}="/lib/udev/input_id %p" # import keyboard layout from /etc/default/keyboard ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/console-setup" diff --git a/debian/rules b/debian/rules index 4689e6d..a272aee 100755 --- a/debian/rules +++ b/debian/rules @@ -224,7 +224,7 @@ ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/xserver-xorg-core/lib/udev/rules.d install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d install -d debian/xserver-xorg-core/lib/xorg - install -m 755 debian/local/input_id debian/xserver-xorg-core/lib/xorg +# install -m 755 debian/local/input_id debian/xserver-xorg-core/lib/xorg endif dh_installdebconf -s dh_installman -s commit d4d0eef1cf51b05b38f0c1495f6acb64f4c8124a Author: Timo Aaltonen <[email protected]> Date: Mon Dec 7 14:40:03 2009 +0200 Disable patch 135 for now. diff --git a/debian/changelog b/debian/changelog index e14e50c..dc9ea60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,8 +58,8 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low - 185_dix_badwindow.patch: Upstream. - 186_autoconfig_geode.patch: Upstream. * 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version. - * 135_rethrow_signals.patch, 168_glibc_trace_to_stderr.patch: Updated. - Still relevant for hooking in apport. + * 135_rethrow_signals.patch, 168_glibc_trace_to_stderr.patch: + Disabled until fixed to work with the current version. * 160_log_timestamping.patch: Updated and re-enabled for boot speed testing in Lucid. This patch should be disabled by beta2. * 169_mipointer_nullptr_checks.patch: Updated. MIPOINTER() still diff --git a/debian/patches/series b/debian/patches/series index bde38b1..aff789d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,7 +11,7 @@ #104_nvidia_autodetect.patch #105_fglrx_autodetect.patch 121_only_switch_vt_when_active.diff -135_rethrow_signals.patch +#135_rethrow_signals.patch #143_default_to_vesa.patch 157_check_null_modes.patch 160_log_timestamping.patch commit b8b7ab6ba6408f7b385373295e592f37d6fed2ca Author: Timo Aaltonen <[email protected]> Date: Mon Dec 7 14:04:20 2009 +0200 Delete patch 177_animated_cursor_change_master.patch diff --git a/debian/changelog b/debian/changelog index b3fbe3c..e14e50c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,6 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low Correct man page + 168_glibc_trace_to_stderr.patch: Report abort traces to stderr instead of terminal - + 177_animated_cursor_change_master.patch: - Don't create animated cursors for slave devices + 184_virtual_devices_autodetect.patch: Use vesa for qemu device, which is not supported by cirrus + 187_edid_quirk_hp_nc8430.patch: @@ -54,6 +52,7 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low - 158_raise_maxclients.patch: Breaks binary drivers. We've had this reverted for some time now, may as well just get rid of it entirely. - 174_set_bg_pixmap_of_cow_to_none.patch: Upstream + - 177_animated_cursor_change_master.patch: Different fix upstream. - 180_fedora_no_synaptics_mouse_synthesis.patch: Superseded. - 181_fedora_log_proc_cmdline.patch: Upstream. - 185_dix_badwindow.patch: Upstream. diff --git a/debian/patches/177_animated_cursor_change_master.patch b/debian/patches/177_animated_cursor_change_master.patch deleted file mode 100644 index 56bf13c..0000000 --- a/debian/patches/177_animated_cursor_change_master.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 86c5c065a9348a1e5c1f3712fd13a0bdc10f7998 Mon Sep 17 00:00:00 2001 -From: Thomas Jaeger <[email protected]> -Date: Tue, 6 Jan 2009 00:17:45 -0500 -Subject: [PATCH] Don't create animated cursors for slave devices - -Fixes bug #19034 - -See also https://lists.ubuntu.com/archives/ubuntu-x/2009-April/000495.html - -The issue is associated to slave device cursors, basically an artifact -of how the xserver-1.6 code is derived from master. There is no API to -access device cursors in 1.6, but it turns out that under certain -circumstances (I'm not exactly sure how this happens but it seems to be -some kind of race condition between XI and core grabs), it is possible -that a device cursor will be set anyway. If it's a regular cursor (that -is what the bug report was originally about), this is not a problem -anymore since this will just modify the core cursor, but if it's an -animated cursor, we're in trouble: The device cursor will keep -replacing the core cursor (so the user will notice an animated cursor -that shouldn't be there), and when the client destroys the animated -cursor, the device animated cursor will stay active leading to a server -crash the next time the cursor is updated. There is a patch attached to -the fdo bug report that fixes the issue by basically doing the same -thing for an animated cursor that we do for a regular cursor: Apply the -change to the associated master device. This is safe for 1.6 since this -code path should never be hit in the first place, but unfortunately, -this is not the direction that Peter wants to go for master where each -device has its own sprite (I'm not sure how things are supposed to work -with animated cursors there). - -The crash happens randomly when an application that grabs an Xi device -(such as easystroke) is running when clicking on firefox menus, but it's -fairly easy to reproduce reliably by setting up a timeout gesture in -easystroke to rotate the cube in compiz via Control+Shift+Button1 and -invoke the gesture when firefox is loading a page and showing a 'sandbox'. ---- - render/animcur.c | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) - -Index: xorg-server/render/animcur.c -=================================================================== ---- xorg-server.orig/render/animcur.c 2009-12-02 19:30:16.000000000 +0200 -+++ xorg-server/render/animcur.c 2009-12-02 23:18:15.000000000 +0200 -@@ -219,11 +219,15 @@ - { - AnimCurScreenPtr as = GetAnimCurScreen(pScreen); - Bool ret; -+ DeviceIntPtr pMasterDev = pDev->isMaster ? pDev : pDev->u.master; -+ -+ if (!pMasterDev) -+ return FALSE; - - Unwrap (as, pScreen, DisplayCursor); - if (IsAnimCur(pCursor)) - { -- if (pCursor != animCurState[pDev->id].pCursor) -+ if (pCursor != animCurState[pMasterDev->id].pCursor) - { - AnimCurPtr ac = GetAnimCur(pCursor); - -@@ -231,10 +235,10 @@ - (pDev, pScreen, ac->elts[0].pCursor); - if (ret) - { -- animCurState[pDev->id].elt = 0; -- animCurState[pDev->id].time = GetTimeInMillis () + ac->elts[0].delay; -- animCurState[pDev->id].pCursor = pCursor; -- animCurState[pDev->id].pScreen = pScreen; -+ animCurState[pMasterDev->id].elt = 0; -+ animCurState[pMasterDev->id].time = GetTimeInMillis () + ac->elts[0].delay; -+ animCurState[pMasterDev->id].pCursor = pCursor; -+ animCurState[pMasterDev->id].pScreen = pScreen; - } - } - else -@@ -242,8 +246,8 @@ - } - else - { -- animCurState[pDev->id].pCursor = 0; -- animCurState[pDev->id].pScreen = 0; -+ animCurState[pMasterDev->id].pCursor = 0; -+ animCurState[pMasterDev->id].pScreen = 0; - ret = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor); - } - Wrap (as, pScreen, DisplayCursor, AnimCurDisplayCursor); diff --git a/debian/patches/series b/debian/patches/series index 58218c7..bde38b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,7 +23,6 @@ 168_glibc_trace_to_stderr.patch 169_mipointer_nullptr_checks.patch 172_cwgetbackingpicture_nullptr_check.patch -177_animated_cursor_change_master.patch 184_virtual_devices_autodetect.patch 187_edid_quirk_hp_nc8430.patch 188_default_primary_to_first_busid.patch commit 9cc947db076ec42449d584f13ee9038967016a40 Author: Timo Aaltonen <[email protected]> Date: Fri Dec 4 15:15:54 2009 +0200 Remove a stray patch. diff --git a/debian/patches/fix-dga-removal.patch b/debian/patches/fix-dga-removal.patch deleted file mode 100644 index 874c02a..0000000 --- a/debian/patches/fix-dga-removal.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 894680ec0335d7bc2c744c53f6a28b40ab850b6c Mon Sep 17 00:00:00 2001 -From: Keith Packard <[email protected]> -Date: Mon, 28 Sep 2009 12:39:47 -0700 -Subject: [PATCH] Re-fix DGA removal. - -Removing DGA ended up breaking any drivers calling into the old -xf86DiDGAInit function as it tried to see if DGA was already enabled -and ended up crashing if the VT wasn't completely initialized. Oops. - -Also, if the driver initializes DGA itself, have the DiDGA -initialization overwrite that information as the DiDGA code will call -ReInit on mode detect. - -Signed-off-by: Keith Packard <[email protected]> ---- - hw/xfree86/common/xf86DGA.c | 29 ++++++++++++++++------------- - hw/xfree86/modes/xf86Crtc.c | 4 ++-- - hw/xfree86/modes/xf86Crtc.h | 8 ++++++++ - hw/xfree86/modes/xf86DiDGA.c | 15 ++++++++++++--- - 4 files changed, 38 insertions(+), 18 deletions(-) - -diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c -index 42b7c58..804fd37 100644 ---- a/hw/xfree86/common/xf86DGA.c -+++ b/hw/xfree86/common/xf86DGA.c -@@ -120,8 +120,22 @@ DGAInit( - - DGAScreenKey = &DGAScreenKeyIndex; - -- if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec)))) -- return FALSE; -+ pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen); -+ -+ if (!pScreenPriv) -+ { -+ if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec)))) -+ return FALSE; -+ dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv); -+ pScreenPriv->CloseScreen = pScreen->CloseScreen; -+ pScreen->CloseScreen = DGACloseScreen; -+ pScreenPriv->DestroyColormap = pScreen->DestroyColormap; -+ pScreen->DestroyColormap = DGADestroyColormap; -+ pScreenPriv->InstallColormap = pScreen->InstallColormap; -+ pScreen->InstallColormap = DGAInstallColormap; -+ pScreenPriv->UninstallColormap = pScreen->UninstallColormap; -+ pScreen->UninstallColormap = DGAUninstallColormap; -+ } - - pScreenPriv->pScrn = pScrn; - pScreenPriv->numModes = num; -@@ -146,17 +160,6 @@ DGAInit( - modes[i].flags &= ~DGA_PIXMAP_AVAILABLE; - #endif - -- dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv); -- pScreenPriv->CloseScreen = pScreen->CloseScreen; -- pScreen->CloseScreen = DGACloseScreen; -- pScreenPriv->DestroyColormap = pScreen->DestroyColormap; -- pScreen->DestroyColormap = DGADestroyColormap; -- pScreenPriv->InstallColormap = pScreen->InstallColormap; -- pScreen->InstallColormap = DGAInstallColormap; -- pScreenPriv->UninstallColormap = pScreen->UninstallColormap; -- pScreen->UninstallColormap = DGAUninstallColormap; -- -- - return TRUE; - } - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index c1e31e0..506fbb9 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -806,7 +806,7 @@ xf86CrtcScreenInit (ScreenPtr screen) - screen->CloseScreen = xf86CrtcCloseScreen; - - #ifdef XFreeXDGA -- xf86DiDGAInit(screen, 0); -+ _xf86_di_dga_init_internal(screen); - #endif - #ifdef RANDR_13_INTERFACE - return RANDR_INTERFACE_VERSION; -@@ -1928,7 +1928,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) - scrn->currentMode = scrn->modes; - #ifdef XFreeXDGA - if (scrn->pScreen) -- xf86DiDGAReInit(scrn->pScreen); -+ _xf86_di_dga_reinit_internal(scrn->pScreen); - #endif - } - -diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h -index 69afaa5..9baa956 100644 ---- a/hw/xfree86/modes/xf86Crtc.h -+++ b/hw/xfree86/modes/xf86Crtc.h -@@ -833,6 +833,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus); - extern _X_EXPORT Bool - xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address); - -+/* this is the real function, used only internally */ -+_X_INTERNAL Bool -+_xf86_di_dga_init_internal (ScreenPtr pScreen); -+ - /** - * Re-initialize dga for this screen (as when the set of modes changes) - */ -@@ -841,6 +845,10 @@ extern _X_EXPORT Bool - xf86DiDGAReInit (ScreenPtr pScreen); - #endif - -+/* This is the real function, used only internally */ -+_X_INTERNAL Bool -+_xf86_di_dga_reinit_internal (ScreenPtr pScreen); -+ - /* - * Set the subpixel order reported for the screen using - * the information from the outputs -diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c -index 0f7b834..60fbdbf 100644 ---- a/hw/xfree86/modes/xf86DiDGA.c -+++ b/hw/xfree86/modes/xf86DiDGA.c -@@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = { - Bool - xf86DiDGAReInit (ScreenPtr pScreen) - { -+ return TRUE; -+} -+ -+Bool -+_xf86_di_dga_reinit_internal (ScreenPtr pScreen) -+{ - ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - -@@ -190,12 +196,15 @@ xf86DiDGAReInit (ScreenPtr pScreen) - Bool - xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address) - { -+ return TRUE; -+} -+ -+Bool -+_xf86_di_dga_init_internal (ScreenPtr pScreen) -+{ - ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - -- if (DGAAvailable(pScreen->myNum)) -- return TRUE; -- - xf86_config->dga_flags = 0; - xf86_config->dga_address = 0; - xf86_config->dga_width = 0; --- -1.6.4.3 - -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
