Hello community,
here is the log from the commit of package xf86-input-keyboard for
openSUSE:Factory checked in at 2016-11-24 21:17:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-keyboard (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-keyboard.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-keyboard"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-keyboard/xf86-input-keyboard.changes
2016-09-27 13:42:39.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-keyboard.new/xf86-input-keyboard.changes
2016-11-24 21:17:51.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 19 15:22:18 UTC 2016 - [email protected]
+
+- Update to version 1.9.0:
+ This release supports the X server 1.19
+- Remove upstream patch U_Use-xf86AddEnabledDevice-with-threaded-input.patch
+
+-------------------------------------------------------------------
Old:
----
U_Use-xf86AddEnabledDevice-with-threaded-input.patch
xf86-input-keyboard-1.8.1.tar.bz2
New:
----
xf86-input-keyboard-1.9.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-keyboard.spec ++++++
--- /var/tmp/diff_new_pack.mKsr7C/_old 2016-11-24 21:17:52.000000000 +0100
+++ /var/tmp/diff_new_pack.mKsr7C/_new 2016-11-24 21:17:52.000000000 +0100
@@ -17,7 +17,7 @@
Name: xf86-input-keyboard
-Version: 1.8.1
+Version: 1.9.0
Release: 0
Summary: Keyboard input driver for the Xorg X server
License: GPL-2.0+
@@ -25,8 +25,6 @@
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-Patch1: U_Use-xf86AddEnabledDevice-with-threaded-input.patch
-
BuildRequires: pkg-config
BuildRequires: pkgconfig(inputproto)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
@@ -49,8 +47,6 @@
%prep
%setup -q
-%patch1 -p1
-
%build
%configure
make %{?_smp_mflags}
++++++ xf86-input-keyboard-1.8.1.tar.bz2 -> xf86-input-keyboard-1.9.0.tar.bz2
++++++
++++ 26568 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-keyboard-1.8.1/ChangeLog new/xf86-input-keyboard-1.9.0/ChangeLog
--- old/xf86-input-keyboard-1.8.1/ChangeLog 2015-04-07 01:25:11.000000000
+0200
+++ new/xf86-input-keyboard-1.9.0/ChangeLog 2016-11-17 05:29:19.000000000
+0100
@@ -1,3 +1,61 @@
+commit 0c7f51291f91eee61fcaf05080001a5e9b22fb53
+Author: Peter Hutterer <[email protected]>
+Date: Thu Nov 17 14:21:48 2016 +1000
+
+ keyboard 1.9.0
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 157e0631b12d0aae4a5f38b81bee615a7eaf553f
+Author: Keith Packard <[email protected]>
+Date: Mon May 30 01:27:49 2016 -0700
+
+ Use xf86AddEnabledDevice with threaded input
+
+ We didn't use SIGIO input for keyboard processing, but we can use
+ threaded input.
+
+ Signed-off-by: Keith Packard <[email protected]>
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 9ab899863a61b800d58e078e936c0d8d88bc0893
+Author: Alexandr Shadchin <[email protected]>
+Date: Tue Nov 24 12:46:44 2015 +0500
+
+ Remove support for X input ABI < 12
+
+ Signed-off-by: Alexandr Shadchin <[email protected]>
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 0317028c2bd0bfd06efd3c1f192ff9a494757187
+Author: Alexandr Shadchin <[email protected]>
+Date: Tue Nov 24 12:46:43 2015 +0500
+
+ Reorder load module stuff
+
+ Signed-off-by: Alexandr Shadchin <[email protected]>
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 8096183e9cb79944e322dcc0cd1f9e50c97ad2c8
+Author: Alexandr Shadchin <[email protected]>
+Date: Tue Nov 24 12:46:42 2015 +0500
+
+ Remove empty function xf86KbdUnplug
+
+ Signed-off-by: Alexandr Shadchin <[email protected]>
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit ccf63a61f39e1f107a67c33d6a7ad24ea4c76b7e
+Author: Yasushi Oshima <[email protected]>
+Date: Mon Jul 20 10:49:49 2015 +0200
+
+ Add defines for Japanese 106-key USB keyboards.
+
+ Via http://gnats.netbsd.org/48347
+
+ Signed-off-by: Thomas Klausner <[email protected]>
+ Acked-by: Peter Hutterer <[email protected]>
+
commit 13d320076e5de2d6c3cbc170fc7e31c526ed8499
Author: Peter Hutterer <[email protected]>
Date: Tue Apr 7 09:24:38 2015 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-keyboard-1.8.1/config.h.in
new/xf86-input-keyboard-1.9.0/config.h.in
--- old/xf86-input-keyboard-1.8.1/config.h.in 2015-04-07 01:23:47.000000000
+0200
+++ new/xf86-input-keyboard-1.9.0/config.h.in 2016-11-17 05:22:10.000000000
+0100
@@ -30,8 +30,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-keyboard-1.8.1/configure.ac
new/xf86-input-keyboard-1.9.0/configure.ac
--- old/xf86-input-keyboard-1.8.1/configure.ac 2015-04-07 01:22:29.000000000
+0200
+++ new/xf86-input-keyboard-1.9.0/configure.ac 2016-11-17 05:21:38.000000000
+0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-keyboard],
- [1.8.1],
+ [1.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-keyboard])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -44,7 +44,7 @@
XORG_DEFAULT_OPTIONS
# Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4] xproto inputproto)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-keyboard-1.8.1/src/bsd_KbdMap.c
new/xf86-input-keyboard-1.9.0/src/bsd_KbdMap.c
--- old/xf86-input-keyboard-1.8.1/src/bsd_KbdMap.c 2013-10-28
01:44:15.000000000 +0100
+++ new/xf86-input-keyboard-1.9.0/src/bsd_KbdMap.c 2015-08-07
05:16:08.000000000 +0200
@@ -345,17 +345,33 @@
/* 132 */ KEY_NOTUSED,
/* 133 */ KEY_NOTUSED,
/* 134 */ KEY_NOTUSED,
- /* 135 */ KEY_NOTUSED,
- /* 136 */ KEY_NOTUSED,
- /* 137 */ KEY_NOTUSED,
- /* 138 */ KEY_NOTUSED,
- /* 139 */ KEY_NOTUSED,
+/*
+ * Special keycodes for Japanese keyboards
+ * Override atKeyname HKTG and BSlash2 code to unique values for JP106
keyboards
+ */
+#undef KEY_HKTG
+#define KEY_HKTG 200 /* Japanese Hiragana Katakana Toggle */
+#undef KEY_BSlash2
+#define KEY_BSlash2 203 /* Japanese '\_' key */
+
+ /* 135 */ KEY_BSlash2, /* Japanese 106 kbd: '\_' */
+ /* 136 */ KEY_HKTG, /* Japanese 106 kbd: Hiragana Katakana toggle */
+ /* 137 */ KEY_Yen, /* Japanese 106 kbd: '\|' */
+ /* 138 */ KEY_XFER, /* Japanese 106 kbd: Henkan */
+ /* 139 */ KEY_NFER, /* Japanese 106 kbd: Muhenkan */
/* 140 */ KEY_NOTUSED,
/* 141 */ KEY_NOTUSED,
/* 142 */ KEY_NOTUSED,
/* 143 */ KEY_NOTUSED,
- /* 144 */ KEY_NOTUSED,
- /* 145 */ KEY_NOTUSED,
+/*
+ * Special keycodes for Korean keyboards
+ * Define Hangul and Hangul_Hanja unique key codes
+ * These keys also use KANA and EISU on some Macintosh Japanese USB keyboards
+ */
+#define KEY_Hangul 201 /* Also KANA Key on Mac JP USB kbd */
+#define KEY_Hangul_Hanja 202 /* Also EISU Key on Mac JP USB kbd */
+ /* 144 */ KEY_Hangul, /* Korean 106 kbd: Hangul */
+ /* 145 */ KEY_Hangul_Hanja, /* Korean 106 kbd: Hangul Hanja */
/* 146 */ KEY_NOTUSED,
/* 147 */ KEY_NOTUSED,
/* 148 */ KEY_NOTUSED,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-keyboard-1.8.1/src/kbd.c new/xf86-input-keyboard-1.9.0/src/kbd.c
--- old/xf86-input-keyboard-1.8.1/src/kbd.c 2013-10-28 01:44:15.000000000
+0100
+++ new/xf86-input-keyboard-1.9.0/src/kbd.c 2016-05-30 23:35:35.000000000
+0200
@@ -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 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_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 @@
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 @@
InputInfoPtr pInfo = device->public.devicePrivate;
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
+ XkbRMLVOSet rmlvo;
KeySymsRec keySyms;
CARD8 modMap[MAP_LENGTH];
int ret;
@@ -322,23 +310,19 @@
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 @@
}
}
# 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 @@
*/
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 @@
/*
* 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 @@
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
-};
