summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorapb <apb@pkgsrc.org>2009-03-14 11:12:32 +0000
committerapb <apb@pkgsrc.org>2009-03-14 11:12:32 +0000
commit91f09e7978a70b25a1d91049f57995bca15948cc (patch)
treebb3180997a5aad238cbd53c45e213ef685de0d22 /x11
parent796261e5c616f5a175c4a4b002c27b81f0332030 (diff)
downloadpkgsrc-91f09e7978a70b25a1d91049f57995bca15948cc.tar.gz
xf86-input-keyboard-1.3.2nb1.
Apply the following patch from NetBSD xsrc/external/mit/xf86-input-keyboard; thanks to joerg for providing a list of changes to apply. 2009-02-07 17:33 christos * src/bsd_kbd.c (1.4): Set the version for the keyboard too. From Patrick Welche
Diffstat (limited to 'x11')
-rw-r--r--x11/xf86-input-keyboard/Makefile3
-rw-r--r--x11/xf86-input-keyboard/distinfo3
-rw-r--r--x11/xf86-input-keyboard/patches/patch-ac27
3 files changed, 31 insertions, 2 deletions
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index c7630fb17f9..6671120cba8 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/02/25 15:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/03/14 11:12:32 apb Exp $
DISTNAME= xf86-input-keyboard-1.3.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-input-keyboard/distinfo b/x11/xf86-input-keyboard/distinfo
index 5702f804f49..fa2a72d496f 100644
--- a/x11/xf86-input-keyboard/distinfo
+++ b/x11/xf86-input-keyboard/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/02/25 15:52:45 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/03/14 11:12:32 apb Exp $
SHA1 (xf86-input-keyboard-1.3.2.tar.bz2) = 81d35fedef7b809b35297935330ddc8743005512
RMD160 (xf86-input-keyboard-1.3.2.tar.bz2) = 21bb5f58115ae5ffdf87b15e0d8c1105724c6e38
Size (xf86-input-keyboard-1.3.2.tar.bz2) = 269634 bytes
SHA1 (patch-aa) = 78756a648ba8d2550eda9795e81fd45d8ab0835f
SHA1 (patch-ab) = 3e6d25832b10d86588dd458d81356001bb93f860
+SHA1 (patch-ac) = c72e321e49200f467996399a0c43c020a9fe8c47
diff --git a/x11/xf86-input-keyboard/patches/patch-ac b/x11/xf86-input-keyboard/patches/patch-ac
new file mode 100644
index 00000000000..7dada0e76b6
--- /dev/null
+++ b/x11/xf86-input-keyboard/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1 2009/03/14 11:12:32 apb Exp $
+
+Changes from NetBSD xsrc/external/mit/xf86-input-keyboard/dist/\
+src/bsd_kbd.c
+
+----------------------------
+revision 1.4
+date: 2009/02/07 17:33:28; author: christos; state: Exp; lines: +7 -0
+Set the version for the keyboard too. From Patrick Welche
+----------------------------
+
+--- src/bsd_kbd.c.orig 2008-12-04 00:01:46.000000000 +0200
++++ src/bsd_kbd.c
+@@ -454,6 +454,13 @@ OpenKeyboard(InputInfoPtr pInfo)
+ #ifdef WSCONS_SUPPORT
+ if( prot == PROT_WSCONS) {
+ pKbd->consType = WSCONS;
++#ifdef WSKBDIO_SETVERSION
++ int version = WSKBDIO_EVENT_VERSION;
++ if (ioctl(pInfo->fd, WSKBDIO_SETVERSION, &version) == -1) {
++ xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name);
++ return FALSE;
++ }
++#endif
+ /* Find out keyboard type */
+ if (ioctl(pInfo->fd, WSKBDIO_GTYPE, &(pKbd->wsKbdType)) == -1) {
+ xf86Msg(X_ERROR, "%s: cannot get keyboard type", pInfo->name);