pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/xf86-input-keyboard
Module Name: pkgsrc
Committed By: wiz
Date: Wed Nov 16 22:53:22 UTC 2016
Modified Files:
pkgsrc/x11/xf86-input-keyboard: distinfo
Added Files:
pkgsrc/x11/xf86-input-keyboard/patches: patch-src_kbd.c
Log Message:
Fix build with xorg-server-1.19.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xf86-input-keyboard/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xf86-input-keyboard/patches/patch-src_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/xf86-input-keyboard/distinfo
diff -u pkgsrc/x11/xf86-input-keyboard/distinfo:1.12 pkgsrc/x11/xf86-input-keyboard/distinfo:1.13
--- pkgsrc/x11/xf86-input-keyboard/distinfo:1.12 Wed Nov 4 03:29:01 2015
+++ pkgsrc/x11/xf86-input-keyboard/distinfo Wed Nov 16 22:53:22 2016
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 03:29:01 agc Exp $
+$NetBSD: distinfo,v 1.13 2016/11/16 22:53:22 wiz Exp $
SHA1 (xf86-input-keyboard-1.8.1.tar.bz2) = c23cbba8b665c09cbc12ada36bc3cbf4ac4eff9f
RMD160 (xf86-input-keyboard-1.8.1.tar.bz2) = a88e5d2e48c4672fc8ab6979e103f2f021af0b33
SHA512 (xf86-input-keyboard-1.8.1.tar.bz2) = 51c6ed6c7daa660a519f1c96d3100e3a0cabf6245a05cd5b8797e9c4b237508802a7087e7e0327cdda1a3b681f83845ecc625fb739d7e992020026f385af8d5d
Size (xf86-input-keyboard-1.8.1.tar.bz2) = 319232 bytes
+SHA1 (patch-src_kbd.c) = 96069a646855384aa6ed696fb9cefe8c460261e4
SHA1 (patch-src_sun__kbd.c) = d988239bc09a21cd634134a48d39e3026cda960d
Added files:
Index: pkgsrc/x11/xf86-input-keyboard/patches/patch-src_kbd.c
diff -u /dev/null pkgsrc/x11/xf86-input-keyboard/patches/patch-src_kbd.c:1.1
--- /dev/null Wed Nov 16 22:53:22 2016
+++ pkgsrc/x11/xf86-input-keyboard/patches/patch-src_kbd.c Wed Nov 16 22:53:22 2016
@@ -0,0 +1,279 @@
+$NetBSD: patch-src_kbd.c,v 1.1 2016/11/16 22:53:22 wiz Exp $
+
+157e0631b12d0aae4a5f38b81bee615a7eaf553f from upstream git.
+
+--- src/kbd.c.orig 2013-10-28 00:44:15.000000000 +0000
++++ src/kbd.c
+@@ -45,6 +45,10 @@
+ #include "xkbstr.h"
+ #include "xkbsrv.h"
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
++#define HAVE_THREADED_INPUT 1
++#endif
++
+ #define CAPSFLAG 1
+ #define NUMFLAG 2
+ #define SCROLLFLAG 4
+@@ -53,11 +57,7 @@
+ /* Used to know when the first DEVICE_ON after a DEVICE_INIT is called */
+ #define INITFLAG (1U << 31)
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+-static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
+-#else
+ static int KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
+-#endif
+ static int KbdProc(DeviceIntPtr device, int what);
+ static void KbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
+ static void KbdBell(int percent, DeviceIntPtr dev, pointer ctrl, int unused);
+@@ -66,24 +66,6 @@ static void PostKbdEvent(InputInfoPtr pI
+ static void InitKBD(InputInfoPtr pInfo, Bool init);
+ static void UpdateLeds(InputInfoPtr pInfo);
+
+-_X_EXPORT InputDriverRec KBD = {
+- 1,
+- "kbd",
+- NULL,
+- KbdPreInit,
+- NULL,
+- NULL
+-};
+-
+-_X_EXPORT InputDriverRec KEYBOARD = {
+- 1,
+- "keyboard",
+- NULL,
+- KbdPreInit,
+- NULL,
+- NULL
+-};
+-
+ static const char *kbdDefaults[] = {
+ #ifdef __NetBSD__
+ #ifdef DEFAULT_TO_WSKBD
+@@ -106,43 +88,52 @@ static char *xkb_layout;
+ static char *xkb_variant;
+ static char *xkb_options;
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+-static int
+-NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
+-
+-static InputInfoPtr
+-KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+-{
+- InputInfoPtr pInfo;
++_X_EXPORT InputDriverRec KBD = {
++ 1,
++ "kbd",
++ NULL,
++ KbdPreInit,
++ NULL,
++ NULL
++};
+
+- if (!(pInfo = xf86AllocateInput(drv, 0)))
+- return NULL;
++_X_EXPORT InputDriverRec KEYBOARD = {
++ 1,
++ "keyboard",
++ NULL,
++ KbdPreInit,
++ NULL,
++ NULL
++};
+
+- pInfo->name = dev->identifier;
+- pInfo->flags = XI86_KEYBOARD_CAPABLE;
+- pInfo->conversion_proc = NULL;
+- pInfo->reverse_conversion_proc = NULL;
+- pInfo->private_flags = 0;
+- pInfo->always_core_feedback = NULL;
+- pInfo->conf_idev = dev;
+- pInfo->close_proc = NULL;
+-
+- if (NewKbdPreInit(drv, pInfo, flags) == Success)
+- {
+- pInfo->flags |= XI86_CONFIGURED;
+- return pInfo;
+- }
++static XF86ModuleVersionInfo xf86KbdVersionRec = {
++ "kbd",
++ MODULEVENDORSTRING,
++ MODINFOSTRING1,
++ MODINFOSTRING2,
++ XORG_VERSION_CURRENT,
++ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
++ ABI_CLASS_XINPUT,
++ ABI_XINPUT_VERSION,
++ MOD_CLASS_XINPUT,
++ {0, 0, 0, 0}
++};
+
+- xf86DeleteInput(pInfo, 0);
+- return NULL;
++static pointer
++xf86KbdPlug(pointer module, pointer options, int *errmaj, int *errmin)
++{
++ xf86AddInputDriver(&KBD, module, 0);
++ return module;
+ }
+
+-static int
+-NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+-#else
++_X_EXPORT XF86ModuleData kbdModuleData = {
++ &xf86KbdVersionRec,
++ xf86KbdPlug,
++ NULL
++};
++
+ static int
+ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+-#endif
+ {
+ KbdDevPtr pKbd;
+ char *s;
+@@ -163,11 +154,7 @@ KbdPreInit(InputDriverPtr drv, InputInfo
+ pInfo->dev = NULL;
+
+ defaults = kbdDefaults;
+- xf86CollectInputOptions(pInfo, defaults
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+- , NULL
+-#endif
+- );
++ xf86CollectInputOptions(pInfo, defaults);
+ xf86ProcessCommonOptions(pInfo, pInfo->options);
+
+ if (!(pKbd = calloc(sizeof(KbdDevRec), 1))) {
+@@ -309,6 +296,7 @@ KbdProc(DeviceIntPtr device, int what)
+
+ InputInfoPtr pInfo = device->public.devicePrivate;
+ KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
++ XkbRMLVOSet rmlvo;
+ KeySymsRec keySyms;
+ CARD8 modMap[MAP_LENGTH];
+ int ret;
+@@ -322,23 +310,19 @@ KbdProc(DeviceIntPtr device, int what)
+ pKbd->KbdGetMapping(pInfo, &keySyms, modMap);
+
+ device->public.on = FALSE;
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+- {
+- XkbRMLVOSet rmlvo;
+- rmlvo.rules = xkb_rules;
+- rmlvo.model = xkb_model;
+- rmlvo.layout = xkb_layout;
+- rmlvo.variant = xkb_variant;
+- rmlvo.options = xkb_options;
++ rmlvo.rules = xkb_rules;
++ rmlvo.model = xkb_model;
++ rmlvo.layout = xkb_layout;
++ rmlvo.variant = xkb_variant;
++ rmlvo.options = xkb_options;
+
+- if (!InitKeyboardDeviceStruct(device, &rmlvo, KbdBell, KbdCtrl))
+- {
+- xf86Msg(X_ERROR, "%s: Keyboard initialization failed. This "
+- "could be a missing or incorrect setup of "
+- "xkeyboard-config.\n", device->name);
++ if (!InitKeyboardDeviceStruct(device, &rmlvo, KbdBell, KbdCtrl))
++ {
++ xf86Msg(X_ERROR, "%s: Keyboard initialization failed. This "
++ "could be a missing or incorrect setup of "
++ "xkeyboard-config.\n", device->name);
+
+- return BadValue;
+- }
++ return BadValue;
+ }
+ # ifdef XI_PROP_DEVICE_NODE
+ {
+@@ -355,17 +339,6 @@ KbdProc(DeviceIntPtr device, int what)
+ }
+ }
+ # endif /* XI_PROP_DEVICE_NODE */
+-#else
+- {
+- XkbComponentNamesRec xkbnames;
+- memset(&xkbnames, 0, sizeof(xkbnames));
+- XkbSetRulesDflts(xkb_rules, xkb_model, xkb_layout,
+- xkb_variant, xkb_options);
+- XkbInitKeyboardDeviceStruct(device, &xkbnames, &keySyms,
+- modMap, KbdBell,
+- (KbdCtrlProcPtr)KbdCtrl);
+- }
+-#endif /* XINPUT ABI 5*/
+ InitKBD(pInfo, TRUE);
+ break;
+ case DEVICE_ON:
+@@ -383,7 +356,11 @@ KbdProc(DeviceIntPtr device, int what)
+ */
+ if (pInfo->fd >= 0) {
+ xf86FlushInput(pInfo->fd);
++#if HAVE_THREADED_INPUT
++ xf86AddEnabledDevice(pInfo);
++#else
+ AddEnabledDevice(pInfo->fd);
++#endif
+ }
+
+ device->public.on = TRUE;
+@@ -396,8 +373,13 @@ KbdProc(DeviceIntPtr device, int what)
+ /*
+ * Restore original keyboard directness and translation.
+ */
+- if (pInfo->fd != -1)
++ if (pInfo->fd != -1) {
++#if HAVE_THREADED_INPUT
++ xf86RemoveEnabledDevice(pInfo);
++#else
+ RemoveEnabledDevice(pInfo->fd);
++#endif
++ }
+ pKbd->KbdOff(pInfo, what);
+ device->public.on = FALSE;
+ break;
+@@ -451,40 +433,3 @@ PostKbdEvent(InputInfoPtr pInfo, unsigne
+
+ xf86PostKeyboardEvent(device, scanCode + MIN_KEYCODE, down);
+ }
+-
+-static void
+-xf86KbdUnplug(pointer p)
+-{
+-}
+-
+-static pointer
+-xf86KbdPlug(pointer module,
+- pointer options,
+- int *errmaj,
+- int *errmin)
+-{
+- xf86AddInputDriver(&KBD, module, 0);
+-
+- return module;
+-}
+-
+-static XF86ModuleVersionInfo xf86KbdVersionRec =
+-{
+- "kbd",
+- MODULEVENDORSTRING,
+- MODINFOSTRING1,
+- MODINFOSTRING2,
+- XORG_VERSION_CURRENT,
+- PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+- ABI_CLASS_XINPUT,
+- ABI_XINPUT_VERSION,
+- MOD_CLASS_XINPUT,
+- {0, 0, 0, 0} /* signature, to be patched into the file by */
+- /* a tool */
+-};
+-
+-_X_EXPORT XF86ModuleData kbdModuleData = {
+- &xf86KbdVersionRec,
+- xf86KbdPlug,
+- xf86KbdUnplug
+-};
Home |
Main Index |
Thread Index |
Old Index