← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid

« back to all changes in this revision

Viewing changes to debian/patches/16-config-dont-filter-input-subsys.diff

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Timo Aaltonen, Bryce Harrington
  • Date: 2010-03-24 12:04:20 UTC
  • mfrom: (1.1.32 upstream) (0.11.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100324120420-qbk5la526uy4k8xe
Tags: 2:1.7.6-1ubuntu1
https://launchpad.net/bugs/401045
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
* control: Drop the udeb, we don't need it for lucid.
* control: Relax/drop some build-deps caused by the udeb.

[Bryce Harrington]
* Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
  crash in FindGlyphByHash.
  (LP: #401045)
* Renumber patch 201_armel-drv-fallbacks.patch to 111

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/16-config-dont-filter-input-subsys.diff
 
1
From 84905007702da2c05a4f7446b3fc5ff52be49655 Mon Sep 17 00:00:00 2001
 
2
From: Thomas Jaeger <ThJaeger@gmail.com>
 
3
Date: Mon, 04 Jan 2010 20:00:49 +0000
 
4
Subject: udev: Don't filter subsystem "input"
 
5
 
 
6
This allows serial wacom devices to work, whose subsystem is "tty".
 
7
 
 
8
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
 
9
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
 
10
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
11
---
 
12
Index: xorg-server/config/udev.c
 
13
===================================================================
 
14
--- xorg-server.orig/config/udev.c      2010-02-23 14:49:01.000000000 +0200
 
15
+++ xorg-server/config/udev.c   2010-02-23 14:49:01.000000000 +0200
 
16
@@ -191,7 +191,6 @@
 
17
     struct udev *udev;
 
18
     struct udev_enumerate *enumerate;
 
19
     struct udev_list_entry *devices, *device;
 
20
-    int rc;
 
21
 
 
22
     udev = udev_new();
 
23
     if (!udev)
 
24
@@ -199,10 +198,6 @@
 
25
     udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
 
26
     if (!udev_monitor)
 
27
         return 0;
 
28
-    rc = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor,
 
29
-                                                         "input", NULL);
 
30
-    if (rc < 0)
 
31
-        return 0;
 
32
 
 
33
     if (udev_monitor_enable_receiving(udev_monitor)) {
 
34
         ErrorF("config/udev: failed to bind the udev monitor\n");
 
35
@@ -212,7 +207,6 @@
 
36
     enumerate = udev_enumerate_new(udev);
 
37
     if (!enumerate)
 
38
         return 0;
 
39
-    udev_enumerate_add_match_subsystem(enumerate, "input");
 
40
     udev_enumerate_scan_devices(enumerate);
 
41
     devices = udev_enumerate_get_list_entry(enumerate);
 
42
     udev_list_entry_foreach(device, devices) {