Update XOrg packages to 7.3
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12468 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
46
XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch
Normal file
46
XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch
Normal file
@ -0,0 +1,46 @@
|
||||
--- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig 2008-08-17 19:24:37.000000000 +0200
|
||||
+++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200
|
||||
@@ -234,10 +234,6 @@
|
||||
else
|
||||
return !Success;
|
||||
break;
|
||||
- case SendCoreEvents:
|
||||
- case DontSendCoreEvents:
|
||||
- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
|
||||
- break;
|
||||
default:
|
||||
return !Success;
|
||||
}
|
||||
@@ -264,7 +260,9 @@
|
||||
pInfo->device_control = EvdevProc;
|
||||
pInfo->read_input = EvdevReadInput;
|
||||
pInfo->switch_mode = EvdevSwitchMode;
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
|
||||
pInfo->motion_history_proc = xf86GetMotionEvents;
|
||||
+#endif
|
||||
pInfo->conf_idev = driver->dev;
|
||||
|
||||
pInfo->private = device;
|
||||
@@ -451,8 +449,6 @@
|
||||
0
|
||||
};
|
||||
|
||||
-#ifdef XFree86LOADER
|
||||
-
|
||||
static void
|
||||
EvdevUnplug(pointer p)
|
||||
{
|
||||
@@ -474,7 +470,7 @@
|
||||
MODULEVENDORSTRING,
|
||||
MODINFOSTRING1,
|
||||
MODINFOSTRING2,
|
||||
- 0, /* Missing from SDK: XORG_VERSION_CURRENT, */
|
||||
+ XORG_VERSION_CURRENT,
|
||||
1, 1, 0,
|
||||
ABI_CLASS_XINPUT,
|
||||
ABI_XINPUT_VERSION,
|
||||
@@ -488,4 +484,3 @@
|
||||
EvdevPlug,
|
||||
EvdevUnplug
|
||||
};
|
||||
-#endif /* XFree86LOADER */
|
30
XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch
Normal file
30
XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c
|
||||
--- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c 2008-08-28 10:59:09.000000000 +0200
|
||||
+++ xf86-input-evdev-1.1.2/src/evdev_axes.c 2008-08-28 10:55:52.000000000 +0200
|
||||
@@ -532,8 +532,14 @@
|
||||
return Success;
|
||||
|
||||
if (!InitValuatorClassDeviceStruct(device, axes,
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
|
||||
+ GetMotionHistroy(),
|
||||
+ GetMotionHistorSize(),
|
||||
+#else
|
||||
miPointerGetMotionEvents,
|
||||
+ miPointerGetMotionBufferSize(),
|
||||
+#endif
|
||||
+ 0))
|
||||
- miPointerGetMotionBufferSize(), 0))
|
||||
return !Success;
|
||||
|
||||
for (i = 0; i < axes; i++) {
|
||||
@@ -543,8 +549,9 @@
|
||||
|
||||
if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
|
||||
return !Success;
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
|
||||
-
|
||||
xf86MotionHistoryAllocate (pInfo);
|
||||
+#endif
|
||||
|
||||
return Success;
|
||||
}
|
Reference in New Issue
Block a user