Xorg Input Hotplugging

Bernardo Innocenti bernie at codewiz.org
Fri Nov 30 14:55:20 PST 2007



Nicolas Mailhot wrote:
> Le jeudi 15 novembre 2007 à 13:28 +0200, Daniel Stone a écrit :
>> On Thu, Nov 15, 2007 at 12:10:29PM +0100, ext Nicolas Mailhot wrote:
>>> Le jeudi 15 novembre 2007 à 12:57 +0200, Daniel Stone a écrit :
>>>> It doesn't look like it's even tried to connect to D-Bus or HAL.  Is it
>>>> linked to both?
>>> I guess only Ajax can properly answer this, but you have the build logs
>>> and sources there:
>>> http://koji.fedoraproject.org/koji/taskinfo?taskID=240429
>>> http://cvs.fedoraproject.org/viewcvs/devel/xorg-x11-server/
>> checking for DBUS... no
>> checking for HAL... no
> 
> Seems I need to poke ajax then. Thanks

I've just built RPMs of 1.4.99 for the OLPC-2 with hal and dbus enabled.
The relevant packages are here:

  http://www.codewiz.org/pub/xorg1499/

The diff wrt the spec file in Fedora is here:

  http://www.codewiz.org/pub/xorg1499/xorg-x11-server.spec.diff

It's a little OLPC specific, but I guess you can easily read
through my changes to see what needs to be done.

If you play with HAL, you may like this patch too:

-------- Original Message --------
Subject: [PATCH] config/hal: really pass xkb_rules, plug leak on xkb_variant and remove NULL checks on xfree()
Date: Mon,  1 Oct 2007 22:34:43 +0200
From: Bernardo Innocenti <bernie at codewiz.org>
Organization: One Laptop Per Child
To: Daniel Stone <daniel at fooishbar.org>
CC: Bernardo Innocenti <bernie at codewiz.org>, xorg at lists.freedesktop.org


Signed-off-by: Bernardo Innocenti <bernie at codewiz.org>
---
 config/hal.c |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/config/hal.c b/config/hal.c
index d7835e6..3479be9 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -219,6 +219,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         goto unwind;
     sprintf(config_info, "hal:%s", udi);
 
+    if (xkb_rules)
+        add_option(&options, "xkb_rules", xkb_rules);
     if (xkb_model)
         add_option(&options, "xkb_model", xkb_model);
     if (xkb_layout)
@@ -237,22 +239,15 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         dev->config_info = xstrdup(config_info);
 
 unwind:
-    if (path)
-        xfree(path);
-    if (driver)
-        xfree(driver);
-    if (name)
-        xfree(name);
-    if (xkb_rules)
-        xfree(xkb_rules);
-    if (xkb_model)
-        xfree(xkb_model);
-    if (xkb_layout)
-        xfree(xkb_layout);
-    if (xkb_options)
-        xfree(xkb_options);
-    if (config_info)
-        xfree(config_info);
+   xfree(path);
+   xfree(driver);
+   xfree(name);
+   xfree(xkb_rules);
+   xfree(xkb_model);
+   xfree(xkb_layout);
+   xfree(xkb_variant);
+   xfree(xkb_options);
+   xfree(config_info);
 
 out_error:
     dbus_error_free(&error);
-- 
1.5.2.4

-- 
 \___/
 |___|   Bernardo Innocenti - http://www.codewiz.org/
  \___\  One Laptop Per Child - http://www.laptop.org/


More information about the hal mailing list