[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'ubuntu'



 debian/changelog                                 |    7 +++
 debian/patches/107_dont_filter_input_subsys.diff |   44 +++++++++++++++++++++++
 debian/patches/series                            |    1 
 3 files changed, 52 insertions(+)

New commits:
commit 7a38fcf3f2fbbd8309b99991d16cdf816ec49fc4
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Sun Feb 21 12:47:50 2010 +0200

    Add 107_dont_filter_input_subsys.diff so for instance serial wacom devices are initialized by the udev backend (LP: #522318)

diff --git a/debian/changelog b/debian/changelog
index 2324d9c..1cef4c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.5-1ubuntu2) UNRELEASED; urgency=low
+
+  * Add 107_dont_filter_input_subsys.diff so for instance serial wacom
+    devices are initialized by the udev backend (LP: #522318)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sun, 21 Feb 2010 12:46:10 +0200
+
 xorg-server (2:1.7.5-1ubuntu1) lucid; urgency=low
 
   [ Bryce Harrington ]
diff --git a/debian/patches/107_dont_filter_input_subsys.diff b/debian/patches/107_dont_filter_input_subsys.diff
new file mode 100644
index 0000000..148fff5
--- /dev/null
+++ b/debian/patches/107_dont_filter_input_subsys.diff
@@ -0,0 +1,44 @@
+From 84905007702da2c05a4f7446b3fc5ff52be49655 Mon Sep 17 00:00:00 2001
+From: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Mon, 04 Jan 2010 20:00:49 +0000
+Subject: udev: Don't filter subsystem "input"
+
+This allows serial wacom devices to work, whose subsystem is "tty".
+
+Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/config/udev.c b/config/udev.c
+index 432ab85..69257e9 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -214,7 +214,6 @@ config_udev_init(void)
+     struct udev *udev;
+     struct udev_enumerate *enumerate;
+     struct udev_list_entry *devices, *device;
+-    int rc;
+ 
+     udev = udev_new();
+     if (!udev)
+@@ -222,10 +221,6 @@ config_udev_init(void)
+     udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
+     if (!udev_monitor)
+         return 0;
+-    rc = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor,
+-                                                         "input", NULL);
+-    if (rc < 0)
+-        return 0;
+ 
+     if (udev_monitor_enable_receiving(udev_monitor)) {
+         ErrorF("config/udev: failed to bind the udev monitor\n");
+@@ -235,7 +230,6 @@ config_udev_init(void)
+     enumerate = udev_enumerate_new(udev);
+     if (!enumerate)
+         return 0;
+-    udev_enumerate_add_match_subsystem(enumerate, "input");
+     udev_enumerate_scan_devices(enumerate);
+     devices = udev_enumerate_get_list_entry(enumerate);
+     udev_list_entry_foreach(device, devices) {
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index 11264d9..dcb30c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,7 @@
 #104_nvidia_autodetect.patch
 #105_fglrx_autodetect.patch
 106_nouveau_autodetect.patch
+107_dont_filter_input_subsys.diff
 121_only_switch_vt_when_active.diff
 #143_default_to_vesa.patch
 157_check_null_modes.patch


Reply to: