rpms/xorg-x11-server/OLPC-2 xorg-x11-server.spec, 1.236, 1.237 xserver-1.4-hal-touchpad.patch, 1.1, 1.2 xorg.conf, 1.1, NONE
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Wed May 28 00:34:52 UTC 2008
Author: ausil
Update of /cvs/extras/rpms/xorg-x11-server/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565/OLPC-2
Modified Files:
xorg-x11-server.spec xserver-1.4-hal-touchpad.patch
Removed Files:
xorg.conf
Log Message:
import mstone's srpm
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-server/OLPC-2/xorg-x11-server.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- xorg-x11-server.spec 24 Nov 2007 10:24:58 -0000 1.236
+++ xorg-x11-server.spec 28 May 2008 00:34:04 -0000 1.237
@@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.4
-Release: 8%{?dist}
+Release: 9%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -689,6 +689,10 @@
%changelog
+* Fri May 23 2008 Cortland Setlow <cortland.setlow at gmail.com> 1.4-9
+- Adapt HAL's input device hints into a form useful to the evdev driver.
+ (Hopefully all this will vanish in the shift to Fedora 9.)
+
* Fri Nov 24 2007 Bernardo Innocenti <bernie at codewiz.org> 1.4-8
- Drop xorg.conf (the master copy is in olpc-utils)
xserver-1.4-hal-touchpad.patch:
Index: xserver-1.4-hal-touchpad.patch
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-server/OLPC-2/xserver-1.4-hal-touchpad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.4-hal-touchpad.patch 15 Nov 2007 20:46:30 -0000 1.1
+++ xserver-1.4-hal-touchpad.patch 28 May 2008 00:34:04 -0000 1.2
@@ -2,14 +2,18 @@
index 3479be9..a235876 100644
--- a/config/hal.c
+++ b/config/hal.c
-@@ -177,7 +177,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+@@ -177,7 +177,13 @@ device_added(LibHalContext *hal_ctx, const char *udi)
if (strcmp(props[i], "input.keys") == 0 ||
strcmp(props[i], "input.keyboard") == 0)
type |= TYPE_KEYS;
-- if (strcmp(props[i], "input.mouse") == 0)
-+ if (strcmp(props[i], "input.mouse") == 0 ||
-+ strcmp(props[i], "input.touchpad") == 0)
+ if (strcmp(props[i], "input.mouse") == 0)
++ {
++ type |= TYPE_POINTER;
++ add_option(&options, "Mode", "Relative");
++ } else if (strcmp(props[i], "input.touchpad") == 0) {
type |= TYPE_POINTER;
++ add_option(&options, "Mode", "Absolute");
++ }
}
libhal_free_string_array(props);
diff --git a/config/x11-input.fdi b/config/x11-input.fdi
@@ -58,3 +62,36 @@
<merge key="input.xkb.model" type="string">pc105</merge>
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
string="Linux">
+diff -u -r a/config/hal.c a/config/hal.c
+--- a/config/hal.c 2008-03-23 10:43:43.000000000 -0400
++++ b/config/hal.c 2008-03-23 10:41:17.000000000 -0400
+@@ -163,6 +163,14 @@
+
+ dbus_error_init(&error);
+
++ options = xcalloc(sizeof(*options), 1);
++ options->key = xstrdup("_source");
++ options->value = xstrdup("server/hal");
++ if (!options->key || !options->value) {
++ ErrorF("[config] couldn't allocate first key/value pair\n");
++ goto unwind;
++ }
++
+ props = libhal_device_get_property_strlist(hal_ctx, udi,
+ "info.capabilities", &error);
+ if (!props) {
+@@ -209,14 +217,6 @@
+ xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb.options");
+ }
+
+- options = xcalloc(sizeof(*options), 1);
+- options->key = xstrdup("_source");
+- options->value = xstrdup("server/hal");
+- if (!options->key || !options->value) {
+- ErrorF("[config] couldn't allocate first key/value pair\n");
+- goto unwind;
+- }
+-
+ add_option(&options, "path", path);
+ add_option(&options, "driver", driver);
+ add_option(&options, "name", name);
--- xorg.conf DELETED ---
More information about the fedora-extras-commits
mailing list