debian/changelog | 67 +++++++++++++++++
debian/patches/178_glx_flush_cache.patch | 26 ------
debian/patches/179_glx_cleanup_drawables.patch | 45 -----------
debian/patches/182_negative_sync_transitions.patch | 69 ------------------
debian/patches/183_dont_reset_event_time.patch | 25 ------
debian/patches/187_lastdeviceeventtime-no-reset.patch | 47 ------------
debian/patches/series | 1
7 files changed, 68 insertions(+), 212 deletions(-)
New commits:
commit fe4cce5f38cbf865569ac3effe185817c867bd2e
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Fri Oct 9 02:46:08 2009 -0700
Update changelog with remaining ubuntu changes
diff --git a/debian/changelog b/debian/changelog
index ebdf581..a6458c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,70 @@
+xorg-server (2:1.6.4-2ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable. Remaining Ubuntu changes:
+ - debian/control:
+ + set Conflicts: xkb-data (<< 0.9), since xkb-path is
+ different from previous releases
+ + do not Conflict with xserver-xorg-video
+ + xvfb Depends on xauth, xfonts-base
+ + Set Maintainer to Ubuntu Core Developers
+ - debian/rules:
+ + build using -fno-stack-protector
+ + --with-os-vendor=Ubuntu
+ - debian/xserver-xorg-core.install:
+ + Add ioport, pcitweak, scanpci scripts & man pages
+ - debian/patches:
+ + 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch:
+ Specify correct paths to fonts
+ + 102_ubuntu_sharevts_load_cpu.patch:
+ close console fd only when ShareVTs
+ + 103_psb_auto.patch:
+ Autodetect poulsbo devices (but use -vesa since -psb is broken)
+ + 110_fedora_no_move_damage.patch:
+ further aiglx support
+ + 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:
+ When aborting, re-raise signals for apport
+ + 140_quell_acpi_errmsgs.patch:
+ Avoid generating extraneous warnings when acpi is missing
+ + 153_make_dmx_compile.patch:
+ Change xcalloc -> calloc, so that dmx compiles.
+ + 156_exevents_copykeyclass_nullptrcheck.patch,
+ 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+ 166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+ 169_mipointer_nullptr_checks.patch,
+ 172_cwgetbackingpicture_nullptr_check.patch:
+ Fix various segfaults in xserver by checking pointers for NULL
+ values before dereferencing them.
+ + 164_trap-aspect-ratios.patch:
+ Correct monitor EDIDs that have misreported aspect ratios.
+ + 165_man_xorg_conf_no_device_ident.patch
+ Correct man page
+ + 168_glibc_trace_to_stderr.patch:
+ Report abort traces to stderr instead of terminal
+ + 174_set_bg_pixmap_of_cow_to_none.patch:
+ Set background pixmap of composite overlay window to no background
+ + 177_animated_cursor_change_master.patch:
+ Don't create animated cursors for slave devices
+ + 180_fedora_no_synaptics_mouse_synthesis.patch:
+ Don't synthesize a mouse section if a synaptics device is found
+ + 181_fedora_log_proc_cmdline.patch:
+ Dump /proc/cmdline in the log file too
+ + 184_virtual_devices_autodetect.patch:
+ Use vesa for qemu device, which is not supported by cirrus
+ + 185_dix_badwindow.patch:
+ Don't return BadMatch from GetProperty if window isn't actually a
window
+ + 186_autoconfig_geode.patch
+ Perform autodetection correctly for various geode devices
+ * Update 184_virtual_devices_autodetect.patch to only include inserting
+ cirrus, since vbox is covered by the new fedora patch.
+ * Add 188_revert_dga_removal.patch out of concern of possible
+ regressions. Along with this, disable fix-dga-removal.patch which
+ fixed a regression in the dga removal code.
+
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 09 Oct 2009 02:28:12 -0700
+
xorg-server (2:1.6.4-2) unstable; urgency=low
* Add fix-dga-removal.patch, closes: #548724.
diff --git a/debian/patches/series b/debian/patches/series
index 4e9a889..5aab1a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,5 +39,4 @@ fedora-vboxvideo.diff
184_virtual_devices_autodetect.patch
185_dix_badwindow.patch
186_autoconfig_geode.patch
-187_lastdeviceeventtime-no-reset.patch
188_revert_dga_removal.patch
commit 588c2619abd00c24b8a4cf8ce1f0b627d6020829
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Fri Oct 9 02:27:24 2009 -0700
Drop patches that are upstream now
diff --git a/debian/patches/178_glx_flush_cache.patch
b/debian/patches/178_glx_flush_cache.patch
deleted file mode 100644
index 89b18a9..0000000
--- a/debian/patches/178_glx_flush_cache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 2075d4bf9e53b8baef0b919da6c44771220cd4a5
-Author: Michel Dänzer <daen...@vmware.com>
-Date: Thu May 14 11:46:41 2009 +0200
-
- glx: If a destroyed window is bound to the current context, make it not
current.
-
- Avoids subsequent crashes due to stale pointers to the DrawableRec, see
- https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous
comments.
-
- Signed-off-by: Michel Dänzer <daen...@vmware.com>
-
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 93391e9..6bc7bef 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -126,6 +126,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
- __GLXcontext *c;
-
- for (c = glxAllContexts; c; c = c->next) {
-+ if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv))
{
-+ (*c->loseCurrent)(c);
-+ __glXFlushContextCache();
-+ }
- if (c->drawPriv == glxPriv)
- c->drawPriv = NULL;
- if (c->readPriv == glxPriv)
diff --git a/debian/patches/179_glx_cleanup_drawables.patch
b/debian/patches/179_glx_cleanup_drawables.patch
deleted file mode 100644
index b959569..0000000
--- a/debian/patches/179_glx_cleanup_drawables.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3
-Author: Michel Dänzer <daen...@vmware.com>
-Date: Tue Jun 23 16:45:40 2009 +0200
-
- glx: Clean up more thoroughly if the drawable of a current context goes
away.
-
- Fixes crash when restarting compiz, due to cl->currentContexts[x] being
stale.
-
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 520eb2e..a571ec9 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -128,8 +128,31 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
-
- for (c = glxAllContexts; c; c = c->next) {
- if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv))
{
-+ int i;
-+
- (*c->loseCurrent)(c);
-- __glXFlushContextCache();
-+ c->isCurrent = GL_FALSE;
-+ if (c == __glXLastContext)
-+ __glXFlushContextCache();
-+
-+ for (i = 1; i < currentMaxClients; i++) {
-+ if (clients[i]) {
-+ __GLXclientState *cl = glxGetClient(clients[i]);
-+
-+ if (cl->inUse) {
-+ int j;
-+
-+ for (j = 0; j < cl->numCurrentContexts; j++) {
-+ if (cl->currentContexts[j] == c)
-+ cl->currentContexts[j] = NULL;
-+ }
-+ }
-+ }
-+ }
-+
-+ if (!c->idExists) {
-+ __glXFreeContext(c);
-+ }
- }
- if (c->drawPriv == glxPriv)
- c->drawPriv = NULL;
diff --git a/debian/patches/182_negative_sync_transitions.patch
b/debian/patches/182_negative_sync_transitions.patch
deleted file mode 100644
index 273f298..0000000
--- a/debian/patches/182_negative_sync_transitions.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From db568f9eabf3450d8a023597ff007df355b13ea8 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutte...@who-t.net>
-Date: Thu, 13 Aug 2009 06:37:00 +0000
-Subject: Xext: fix up wrong conditions for negative sync transitions.
-
-If the counter had a value higher than the trigger value for a negative
-transition, the trigger value did not get set.
-
-The correct sequence of checks is:
-if (positive transition)
- if (counter value < trigger value)
- set up trigger
-if (negative transition)
- if (counter value > trigger value)
- set up trigger
-
-Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>
-
-Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
----
-diff --git a/Xext/sync.c b/Xext/sync.c
-index 5f4ce56..667f8ab 100644
---- a/Xext/sync.c
-+++ b/Xext/sync.c
-@@ -962,28 +962,24 @@ SyncComputeBracketValues(SyncCounter *pCounter, Bool
startOver)
- pnewltval = &psci->bracket_less;
- }
- }
-- else if ( (pTrigger->test_type == XSyncPositiveTransition &&
-+ else if (pTrigger->test_type == XSyncNegativeTransition &&
- ct != XSyncCounterNeverIncreases)
-- ||
-- (pTrigger->test_type == XSyncNegativeTransition &&
-+ {
-+ if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
-+ XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
-+ {
-+ psci->bracket_less = pTrigger->test_value;
-+ pnewltval = &psci->bracket_less;
-+ }
-+ }
-+ else if (pTrigger->test_type == XSyncPositiveTransition &&
- ct != XSyncCounterNeverDecreases)
-- )
- {
-- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
-+ if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
-+ XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
- {
-- if (XSyncValueLessThan(pTrigger->test_value,
-- psci->bracket_greater))
-- {
-- psci->bracket_greater = pTrigger->test_value;
-- pnewgtval = &psci->bracket_greater;
-- }
-- else
-- if (XSyncValueGreaterThan(pTrigger->test_value,
-- psci->bracket_less))
-- {
-- psci->bracket_less = pTrigger->test_value;
-- pnewltval = &psci->bracket_less;
-- }
-+ psci->bracket_greater = pTrigger->test_value;
-+ pnewgtval = &psci->bracket_greater;
- }
- }
- } /* end for each trigger */
---
-cgit v0.8.2
diff --git a/debian/patches/183_dont_reset_event_time.patch
b/debian/patches/183_dont_reset_event_time.patch
deleted file mode 100644
index de87a28..0000000
--- a/debian/patches/183_dont_reset_event_time.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <rich...@hughsie.com>
-Date: Mon, 17 Aug 2009 08:15:32 +0000
-Subject: Do not reset lastDeviceEventTime when we do dixSaveScreens
-
-When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
-event time else session clients using IDLETIME will be reset.
-
-Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
----
-diff --git a/dix/window.c b/dix/window.c
-index 32e26d9..1a645f6 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode)
-
- if (on == SCREEN_SAVER_FORCER)
- {
-- UpdateCurrentTimeIf();
-- lastDeviceEventTime = currentTime;
- if (mode == ScreenSaverReset)
- what = SCREEN_SAVER_OFF;
- else
---
-cgit v0.8.2
diff --git a/debian/patches/187_lastdeviceeventtime-no-reset.patch
b/debian/patches/187_lastdeviceeventtime-no-reset.patch
deleted file mode 100644
index d152ad7..0000000
--- a/debian/patches/187_lastdeviceeventtime-no-reset.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
-From: Richard Hughes <rich...@hughsie.com>
-Date: Fri, 14 Aug 2009 11:44:35 +0100
-Subject: [PATCH] Don't reset the lastDeviceEventTime when doing DPMS actions
-
-When we change the DPMS mode, don't play games with the last event time as
-this breaks applications using IDLETIME to turn the backlight off after a
-preset time.
-
-This patch fixes gnome-power-manager and xfce-power-manager
-
-Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
----
- Xext/dpms.c | 17 ++++-------------
- 1 files changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/Xext/dpms.c b/Xext/dpms.c
-index 21ba923..df63a8b 100644
---- a/Xext/dpms.c
-+++ b/Xext/dpms.c
-@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
- if (!DPMSEnabled)
- return BadMatch;
-
-- if (stuff->level == DPMSModeOn) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis();
-- } else if (stuff->level == DPMSModeStandby) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis() - DPMSStandbyTime;
-- } else if (stuff->level == DPMSModeSuspend) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis() - DPMSSuspendTime;
-- } else if (stuff->level == DPMSModeOff) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis() - DPMSOffTime;
-- } else {
-+ if (stuff->level != DPMSModeOn &&
-+ stuff->level != DPMSModeStandby &&
-+ stuff->level != DPMSModeSuspend &&
-+ stuff->level != DPMSModeOff) {
- client->errorValue = stuff->level;
- return BadValue;
- }
---
-1.6.3.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 5cbb06f..4e9a889 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,5 @@ fedora-vboxvideo.diff
184_virtual_devices_autodetect.patch
185_dix_badwindow.patch
186_autoconfig_geode.patch
+187_lastdeviceeventtime-no-reset.patch
+188_revert_dga_removal.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
