Date: Thu, 29 Aug 2013 20:16:21 GMT From: Jan Beich <jbeich@tormail.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181660: [patch][xorg-dev] x11-servers/xorg-server: fix typos and new xorg support in config/devd Message-ID: <201308292016.r7TKGLqc018730@oldred.freebsd.org> Resent-Message-ID: <201308292020.r7TKK0ba009056@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181660
>Category: ports
>Synopsis: [patch][xorg-dev] x11-servers/xorg-server: fix typos and new xorg support in config/devd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 29 20:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release:
>Organization:
>Environment:
# xorg-server-1.14.3,1 actually
WITH_NEW_XORG=1
>Description:
>How-To-Repeat:
# no driver issue
(II) config/devd: Adding input device Comfort Curve Keyboard 3000 (/dev/ukbd0)
(II) No input driver specified, ignoring this device.
(II) This device may have been added with another device file.
(II) config/devd: Adding input device USB Laser Mouse (/dev/ums0)
(II) No input driver specified, ignoring this device.
(II) This device may have been added with another device file.
(II) config/devd: Adding input device Comfort Curve Keyboard 3000 (/dev/uhid0)
(II) No input driver specified, ignoring this device.
(II) This device may have been added with another device file.
# wrong driver issue
(II) config/devd: Adding input device Comfort Curve Keyboard 3000 (/dev/ukbd0)
(II) LoadModule: "kdb"
(WW) Warning, couldn't open module kdb
(II) UnloadModule: "kdb"
(II) Unloading kdb
(EE) Failed to load module "kdb" (module does not exist, 0)
(EE) No input driver matching `kdb'
>Fix:
--- fix.diff begins here ---
Index: x11-servers/xorg-server/files/patch-config-devd
===================================================================
--- x11-servers/xorg-server/files/patch-config-devd (revision 1097)
+++ x11-servers/xorg-server/files/patch-config-devd (working copy)
@@ -1,6 +1,6 @@
--- /dev/null 2013-08-03 00:44:23.000000000 +0200
+++ config/devd.c 2013-08-03 00:45:15.162836806 +0200
-@@ -0,0 +1,478 @@
+@@ -0,0 +1,480 @@
+/*
+ * Copyright © 2012 Baptiste Daroussin
+ *
@@ -72,8 +72,8 @@
+};
+
+static struct hw_type hw_types[] = {
-+ { "ukbd", ATTR_KEYBOARD, "kdb" },
-+ { "atkbd", ATTR_KEYBOARD, "kdb" },
++ { "ukbd", ATTR_KEYBOARD, "kbd" },
++ { "atkbd", ATTR_KEYBOARD, "kbd" },
+ { "ums", ATTR_POINTER, "mouse" },
+ { "psm", ATTR_POINTER, "mouse" },
+ { "uhid", ATTR_POINTER, "mouse" },
@@ -275,6 +275,8 @@
+
+#if XORG_VERSION_CURRENT < 10800000
+ add_option(&options, "driver", hw_types[i].xdriver);
++#else
++ options = input_option_new(options, "driver", hw_types[i].xdriver);
+#endif
+
+ if (asprintf(&config_info, "devd:%s", line) == -1) {
--- fix.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308292016.r7TKGLqc018730>