xorg-server: Changes to 'ubuntu'
debian/changelog | 19 +++++++++
debian/patches/143_default_to_vesa.patch | 25 ++++++++++++
debian/patches/150_no_visibility_notify_on_unredirect.patch | 12 +++++
debian/patches/series | 2
4 files changed, 58 insertions(+)
New commits:
commit 3b460a68377129956e5498ad86856b39bee9122d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Oct 21 11:04:46 2008 +0300
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.
(LP: #261977)
diff --git a/debian/changelog b/debian/changelog
index 234298a..74554cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.5.2-2ubuntu2) UNRELEASED; urgency=low
+
+ [ Bryce Harrington ]
+ * 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.
+ (LP: #261977)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 21 Oct 2008 11:01:16 +0300
+
xorg-server (2:1.5.2-2ubuntu1) intrepid; urgency=low
* debian/patches/150_no_visibility_notify_on_unredirect.patch
diff --git a/debian/patches/143_default_to_vesa.patch b/debian/patches/143_default_to_vesa.patch
new file mode 100644
index 0000000..78052c8
--- /dev/null
+++ b/debian/patches/143_default_to_vesa.patch
@@ -0,0 +1,25 @@
+
+diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c working/hw/xfree86/common/xf86AutoConfig.c
+--- patched/hw/xfree86/common/xf86AutoConfig.c 2008-10-17 19:48:15.000000000 -0700
++++ working/hw/xfree86/common/xf86AutoConfig.c 2008-10-17 19:43:19.000000000 -0700
+@@ -422,6 +422,20 @@ matchDriverFromFiles (char** matches, ui
+ }
+ direntry = readdir(idsdir);
+ }
++ /* If we failed to find any driver, at least try 'vesa' (LP: #261977) */
++ if (matches[0] == NULL) {
++ xf86Msg(X_INFO, "No matches found for this device in %s\n", PCI_TXT_IDS_PATH);
++
++ matches[0] = (char*)xalloc(sizeof(char) * 5);
++ if (!matches[0]) {
++ xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n");
++ goto end;
++ }
++
++ xf86Msg(X_DEFAULT, "Registering 'vesa' as fallback\n");
++ strncpy(matches[0], "vesa", 5);
++ }
++
+ end:
+ xfree(line);
+ closedir(idsdir);
diff --git a/debian/patches/series b/debian/patches/series
index 98020a3..c62ffa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,5 @@
140_quell_acpi_errmsgs.patch
141_improved_driver_selection.patch
142_psb_auto.patch
+143_default_to_vesa.patch
150_no_visibility_notify_on_unredirect.patch
commit e34a8eb58f64767cd12027a53c029f5133f7bf6e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Oct 21 10:39:02 2008 +0300
debian/patches/150_no_visibility_notify_on_unredirect.patch
- do not sent VisibilityNotify events when MapUnmapEvents
are disabled (LP: #278112)
Also, bump the version because of a mistake done for a rebuild.
We are not going to be merging anymore for intrepid, so this
should not matter much.
diff --git a/debian/changelog b/debian/changelog
index c1830fa..234298a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.5.2-2ubuntu1) intrepid; urgency=low
+
+ * debian/patches/150_no_visibility_notify_on_unredirect.patch
+ - do not sent VisibilityNotify events when MapUnmapEvents
+ are disabled (LP: #278112)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 18 Oct 2008 00:05:30 +0200
+
xorg-server (2:1.5.2-1ubuntu4) intrepid; urgency=low
* Update patch 142_psb_auto to only try vesa, not even psb, as this requires
diff --git a/debian/patches/150_no_visibility_notify_on_unredirect.patch b/debian/patches/150_no_visibility_notify_on_unredirect.patch
new file mode 100644
index 0000000..26143f0
--- /dev/null
+++ b/debian/patches/150_no_visibility_notify_on_unredirect.patch
@@ -0,0 +1,12 @@
+diff -u xorg-server-1.5.2/dix/window.c xorg-server-1.5.2/dix/window.c
+--- xorg-server-1.5.2/dix/window.c
++++ xorg-server-1.5.2/dix/window.c
+@@ -3259,6 +3258,8 @@
+ SendVisibilityNotify(WindowPtr pWin)
+ {
+ xEvent event;
++ if (!MapUnmapEventsEnabled(pWin))
++ return;
+ #ifndef NO_XINERAMA_PORT
+ unsigned int visibility = pWin->visibility;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 2f61cfe..98020a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
140_quell_acpi_errmsgs.patch
141_improved_driver_selection.patch
142_psb_auto.patch
+150_no_visibility_notify_on_unredirect.patch
Reply to: