xorg-server: Changes to 'ubuntu'
debian/changelog | 13 +++
debian/patches/180_fedora_no_synaptics_mouse_synthesis.patch | 27 ++++++++
debian/patches/181_fedora_log_proc_cmdline.patch | 36 +++++++++++
debian/patches/182_fedora_quirk_pea.patch | 28 ++++++++
debian/patches/series | 3
5 files changed, 107 insertions(+)
New commits:
commit 1f4c1382e44c7cf6d5b11feddcdc4f3f5b690af0
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Aug 4 02:37:50 2009 -0700
Add several patches from fedora
diff --git a/debian/changelog b/debian/changelog
index ff7c9e7..40b69f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xorg-server (2:1.6.2.901-1ubuntu3) karmic; urgency=low
+
+ * Add 182_fedora_quirk_pea.patch: Quirk for Peacock Ergovision 19
+ to use first detailed mode.
+ * Add 181_fedora_log_proc_cmdline.patch: Log the /proc/cmdline into
+ Xorg.0.log
+ * Add 180_fedora_no_synaptics_mouse_synthesis.patch: Don't synthesise a
+ mouse section if synaptics devices are found.
+ (LP: #406291, #405281, #396908)
+ * Actually enable patches 178 and 179
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 04 Aug 2009 02:37:12 -0700
+
xorg-server (2:1.6.2.901-1ubuntu2) karmic; urgency=low
* Add 178_glx_flush_cache.patch and 179_glx_cleanup_drawables.patch:
diff --git a/debian/patches/180_fedora_no_synaptics_mouse_synthesis.patch b/debian/patches/180_fedora_no_synaptics_mouse_synthesis.patch
new file mode 100644
index 0000000..fa47b08
--- /dev/null
+++ b/debian/patches/180_fedora_no_synaptics_mouse_synthesis.patch
@@ -0,0 +1,27 @@
+From 8663524ce398b56af596ab1e7e96b62ca45b79e9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 13 Apr 2009 17:49:00 +1000
+Subject: [PATCH] xfree86: don't synthesise a mouse section if synaptics devices are found.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ hw/xfree86/common/xf86Config.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 9e56ca9..92b6aba 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1329,7 +1329,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
+ */
+ for (devs = servlayoutp->inputs; devs && *devs; devs++) {
+ if (!strcmp((*devs)->driver, "void") || !strcmp((*devs)->driver, "mouse") ||
+- !strcmp((*devs)->driver, "vmmouse") || !strcmp((*devs)->driver, "evdev")) {
++ !strcmp((*devs)->driver, "vmmouse") || !strcmp((*devs)->driver, "evdev") ||
++ !strcmp((*devs)->driver, "synaptics")) {
+ found = 1; break;
+ }
+ }
+--
+1.6.3.rc1.2.g3c17d.dirty
+
diff --git a/debian/patches/181_fedora_log_proc_cmdline.patch b/debian/patches/181_fedora_log_proc_cmdline.patch
new file mode 100644
index 0000000..2474a33
--- /dev/null
+++ b/debian/patches/181_fedora_log_proc_cmdline.patch
@@ -0,0 +1,36 @@
+From 794214c9da2b17c3291ec53b178a035a1f117430 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 7 May 2009 17:18:31 -0400
+Subject: [PATCH] Dump /proc/cmdline in the log file too.
+
+---
+ hw/xfree86/common/xf86Init.c | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index 2493526..7c0937f 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -193,6 +193,19 @@ xf86PrintBanner(void)
+ if (uname(&name) >= 0) {
+ ErrorF("Current Operating System: %s %s %s %s %s\n",
+ name.sysname, name.nodename, name.release, name.version, name.machine);
++ do {
++ char buf[80];
++ int fd = open("/proc/cmdline", O_RDONLY);
++ if (fd != -1) {
++ ErrorF("Kernel command line: ");
++ memset(buf, 0, 80);
++ while (read(fd, buf, 80) > 0) {
++ ErrorF("%.80s", buf);
++ memset(buf, 0, 80);
++ }
++ close(fd);
++ }
++ } while (0);
+ }
+ }
+ #endif
+--
+1.6.2.2
+
diff --git a/debian/patches/182_fedora_quirk_pea.patch b/debian/patches/182_fedora_quirk_pea.patch
new file mode 100644
index 0000000..6382aa8
--- /dev/null
+++ b/debian/patches/182_fedora_quirk_pea.patch
@@ -0,0 +1,28 @@
+From 8c4bcb5a2b9e99e16ade5b09f7b1f476be1dad55 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed, 27 May 2009 15:24:34 +1000
+Subject: [PATCH] quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
+
+---
+ hw/xfree86/modes/xf86EdidModes.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
+index 54f2c65..54b410e 100644
+--- a/hw/xfree86/modes/xf86EdidModes.c
++++ b/hw/xfree86/modes/xf86EdidModes.c
+@@ -205,6 +205,11 @@ static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)
+ DDC->vendor.prod_id == 2423)
+ return TRUE;
+
++ /* Peacock Ergovision 19. See rh#492359 */
++ if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&
++ DDC->vendor.prod_id == 9003)
++ return TRUE;
++
+ return FALSE;
+ }
+
+--
+1.6.2.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 4c07c9b..24a99fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,6 @@ fedora-pci-primary.diff
177_animated_cursor_change_master.patch
178_glx_flush_cache.patch
179_glx_cleanup_drawables.patch
+180_fedora_no_synaptics_mouse_synthesis.patch
+181_fedora_log_proc_cmdline.patch
+182_fedora_quirk_pea.patch
Reply to: