ChangeLog | 437 ++++++++++++++++++++-
Makefile.in | 11
aclocal.m4 | 22 -
config.guess | 32 +
config.h.in | 15
config.sub | 28 +
configure | 326 ++++++++++++----
configure.ac | 77 ++-
debian/NEWS | 8
debian/changelog | 32 +
debian/control | 7
debian/rules | 2
man/Makefile.am | 4
man/Makefile.in | 15
src/Makefile.am | 41 +-
src/Makefile.in | 191 ++++-----
src/at_scancode.c | 131 ++++++
src/bsd_KbdMap.c | 1087 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/bsd_kbd.c | 527 ++++++++++++++++++++++++++
src/bsd_kbd.h | 5
src/hurd_kbd.c | 176 ++++++++
src/kbd.c | 90 +---
src/lnx_KbdMap.c | 605 ++++++++++++++++++++++++++++++
src/lnx_kbd.c | 480 +++++++++++++++++++++++
src/lnx_kbd.h | 5
src/sco_KbdMap.c | 308 +++++++++++++++
src/sco_kbd.c | 485 ++++++++++++++++++++++++
src/sco_kbd.h | 20
src/sun_kbd.c | 476 +++++++++++++++++++++++
src/sun_kbd.h | 69 +++
src/sun_kbdEv.c | 855 ++++++++++++++++++++++++++++++++++++++++++
src/xf86Keymap.h | 452 ++++++++++++++++++++++
src/xf86OSKbd.h | 132 ++++++
33 files changed, 6803 insertions(+), 348 deletions(-)
New commits:
commit d01d892f03c191f5eceeb78c13b1b1be6b87a942
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 18 10:48:05 2007 +0200
Update for xserver 1.3.99.0.
Use the automatic Provides generation.
diff --git a/debian/changelog b/debian/changelog
index 36dc792..7b80ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xserver-xorg-input-keyboard (1:1.2.0-1+1.2.2) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.2.0-2) experimental; urgency=low
* Set distribution to unstable in debian/NEWS (closes: #428845).
+ * Rebuild against xserver 1.3.99.0 (new ABI).
+ * Generate the Provides field automatically.
- -- Julien Cristau <[EMAIL PROTECTED]> Thu, 14 Jun 2007 18:44:38 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 18 Aug 2007 19:48:05 +0200
xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 74b9f54..bab162e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev,
x11proto-randr-dev, quilt
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0),
x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev,
quilt
Standards-Version: 3.7.2
XS-Vcs-Git:
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-keyboard
XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-keyboard.git
@@ -11,7 +11,7 @@ XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-keyb
Package: xserver-xorg-input-kbd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-input
+Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- keyboard input driver
This package provides the driver for keyboard input devices.
commit 680300edc506f468b242d48401315c42da869a89
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 14 18:48:50 2007 +0200
Set distribution to unstable in debian/NEWS (closes: #428845).
diff --git a/debian/NEWS b/debian/NEWS
index 2c41b53..b1cdf60 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.2.1-1) unstable; urgency=low
The old "keyboard" driver has been removed and is now superseded by the
"kbd" driver. The corresponding "InputDevice" section in the xorg.conf
diff --git a/debian/changelog b/debian/changelog
index 49a9f48..36dc792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-keyboard (1:1.2.0-1+1.2.2) UNRELEASED; urgency=low
+
+ * Set distribution to unstable in debian/NEWS (closes: #428845).
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 14 Jun 2007 18:44:38 +0200
+
xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) unstable; urgency=low
[ Brice Goglin ]
commit a5f054c3f4823b2bea4445f73fbe0f9bb2acd121
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Wed Jun 13 23:46:19 2007 +1000
Upload to unstable.
Also grab commit 36cf953910002a00a3694033d49c6c38319b0283, updating
the driver version.
diff --git a/debian/changelog b/debian/changelog
index 1d1e153..49a9f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) unstable; urgency=low
[ Brice Goglin ]
* New upstream release.
@@ -17,8 +17,10 @@ xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) UNRELEASED;
urgency=low
[ Drew Parsons ]
* 1.2.1 not released upstream yet, so use 1.2.0 as the version and
put 1.2.1 into the Debian subversion.
+ * Include commit 36cf953910002a00a3694033d49c6c38319b0283, updating
+ the driver version.
- -- Drew Parsons <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:11:32 +1000
+ -- Drew Parsons <[EMAIL PROTECTED]> Wed, 13 Jun 2007 23:21:00 +1000
xserver-xorg-input-keyboard (1:1.1.1-1) experimental; urgency=low
commit 36cf953910002a00a3694033d49c6c38319b0283
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jun 13 23:02:58 2007 +1000
Keep module version up-to-date using PACKAGE_VERSION_*
diff --git a/src/kbd.c b/src/kbd.c
index 24fe6f6..c1daa4b 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -849,7 +849,7 @@ static XF86ModuleVersionInfo xf86KbdVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
commit c58f338e5f0592726d7355546f489eefe5d661d3
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Wed Jun 13 22:58:10 2007 +1000
autoreconf and use 1.2.0-1+1.2.1 as version
The upstream release is not consistent. The tarball uses 1.2.0 but
there is no 1.2.0 in git, which only has 1.2.1. Use Debian version
1.2.0-1+1.2.1 as a temporary compromise till the next upstream tarball
appears.
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index fab0aa3..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/debian/changelog b/debian/changelog
index a553e29..1d1e153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* New upstream release.
* Add a NEWS entry about the old "keyboard" driver not being shipped
anymore and "kbd" replacing it.
@@ -13,7 +14,11 @@ xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED;
urgency=low
* Add a link to www.X.org and a reference to the xf86-input-keyboard
module in the long description.
- -- Brice Goglin <[EMAIL PROTECTED]> Mon, 23 Apr 2007 23:06:10 +0200
+ [ Drew Parsons ]
+ * 1.2.1 not released upstream yet, so use 1.2.0 as the version and
+ put 1.2.1 into the Debian subversion.
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:11:32 +1000
xserver-xorg-input-keyboard (1:1.1.1-1) experimental; urgency=low
commit a6c37720ad0ced272d8fe637e8f8bf90ad2b8152
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Tue Apr 24 01:34:38 2007 +0200
Add a NEWS entry about the old "keyboard" driver not being shipped anymore
and "kbd" replacing it.
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..2c41b53
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,8 @@
+xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
+
+ The old "keyboard" driver has been removed and is now superseded by the
+ "kbd" driver. The corresponding "InputDevice" section in the xorg.conf
+ configuration file should be updated by replacing "keyboard" with "kbd"
+ on the "Driver" line.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Tue, 24 Apr 2007 00:25:19 +0200
diff --git a/debian/changelog b/debian/changelog
index 8c74723..a553e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add a NEWS entry about the old "keyboard" driver not being shipped
+ anymore and "kbd" replacing it.
* Pull some more changesets from upstream git:
+ fd51e4d27d7a31ed9d4a075c3814b36320af4612
+ caeb0f364c1a95a9ad3e64dd722c8ddc88077a86
commit 6088984e406b7538bc708c0f8a34d3033d9c2773
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Tue Apr 24 01:31:25 2007 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index e0acac3..b50057d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,10 +104,11 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -131,6 +132,8 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+HURD_FALSE = @HURD_FALSE@
+HURD_TRUE = @HURD_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -141,6 +144,8 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -159,8 +164,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SCO_FALSE = @SCO_FALSE@
+SCO_TRUE = @SCO_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SOLARIS_FALSE = @SOLARIS_FALSE@
+SOLARIS_TRUE = @SOLARIS_TRUE@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
diff --git a/aclocal.m4 b/aclocal.m4
index 80e0481..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6585,7 +6585,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.2
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//'
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7038,7 +7038,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -7051,6 +7052,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/config.h.in b/config.h.in
index 3ae0851..2b1effb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -32,6 +32,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Name of the period field in struct kbd_repeat */
+#undef LNX_KBD_PERIOD_NAME
+
/* Name of package */
#undef PACKAGE
@@ -50,11 +53,17 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Use deprecated keyboard driver */
-#undef USE_DEPRECATED_KEYBOARD_DRIVER
-
/* Version number of package */
#undef VERSION
diff --git a/config.sub b/config.sub
index 387c18d..fab0aa3 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle |
sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index 7f6fee2..9203a20 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-keyboard 1.1.1.
+# Generated by GNU Autoconf 2.61 for xf86-input-keyboard 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-keyboard'
PACKAGE_TARNAME='xf86-input-keyboard'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='xf86-input-keyboard 1.1.1'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xf86-input-keyboard 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -831,7 +831,6 @@ MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
DRIVER_NAME
-COMPAT_DRIVER_NAME
build
build_cpu
build_vendor
@@ -874,6 +873,16 @@ F77
FFLAGS
ac_ct_F77
LIBTOOL
+LINUX_TRUE
+LINUX_FALSE
+BSD_TRUE
+BSD_FALSE
+SOLARIS_TRUE
+SOLARIS_FALSE
+HURD_TRUE
+HURD_FALSE
+SCO_TRUE
+SCO_FALSE
inputdir
PKG_CONFIG
XORG_CFLAGS
@@ -1413,7 +1422,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-keyboard 1.1.1 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-keyboard 1.2.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1483,7 +1492,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-keyboard 1.1.1:";;
+ short | recursive ) echo "Configuration of xf86-input-keyboard 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1499,7 +1508,6 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-depkbd Use deprecated keyboard driver [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1596,7 +1604,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-keyboard configure 1.1.1
+xf86-input-keyboard configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1610,7 +1618,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-keyboard $as_me 1.1.1, which was
+It was created by xf86-input-keyboard $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2282,7 +2290,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-keyboard'
- VERSION='1.1.1'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -2457,9 +2465,6 @@ fi
DRIVER_NAME=kbd
-COMPAT_DRIVER_NAME=keyboard
-
-
ac_config_headers="$ac_config_headers config.h"
@@ -4354,7 +4359,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4357 "configure"' > conftest.$ac_ext
+ echo '#line 4362 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7086,11 +7091,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7089: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7094: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7093: \$? = $ac_status" >&5
+ echo "$as_me:7098: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7354,11 +7359,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7357: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7362: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7361: \$? = $ac_status" >&5
+ echo "$as_me:7366: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7458,11 +7463,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7461: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7465: \$? = $ac_status" >&5
+ echo "$as_me:7470: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9755,7 +9760,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9758 "configure"
+#line 9763 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9855,7 +9860,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9858 "configure"
+#line 9863 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12191,11 +12196,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12194: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12198: \$? = $ac_status" >&5
+ echo "$as_me:12203: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12295,11 +12300,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12298: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12303: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12302: \$? = $ac_status" >&5
+ echo "$as_me:12307: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13856,11 +13861,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13859: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13864: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13863: \$? = $ac_status" >&5
+ echo "$as_me:13868: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13960,11 +13965,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13963: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13967: \$? = $ac_status" >&5
+ echo "$as_me:13972: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16147,11 +16152,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16150: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16155: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16154: \$? = $ac_status" >&5
+ echo "$as_me:16159: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16415,11 +16420,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16423: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16422: \$? = $ac_status" >&5
+ echo "$as_me:16427: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16519,11 +16524,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16522: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16527: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16526: \$? = $ac_status" >&5
+ echo "$as_me:16531: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19961,40 +19966,144 @@ fi
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
+case $host_os in
+ linux*)
+ IS_LINUX="yes"
+ # check whether struct kbd_repeat has the 'period' field.
+ # on kernels < 2.5.42 it's called 'rate' instead.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <linux/kd.h>
+#ifdef __sparc__
+#include <asm/param.h>
+#include <asm/kbio.h>
+#endif
+
+int
+main ()
+{
-# Check whether --enable-depkbd was given.
-if test "${enable_depkbd+set}" = set; then
- enableval=$enable_depkbd; DEPKBD=$enableval
+int main () {
+ struct kbd_repeat k;
+ k.period = 0;
+ return 0;
+}
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ period_field="period"
else
- DEPKBD=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ period_field="rate"
fi
-if test "x$DEPKBD" = "xyes" ; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-cat >>confdefs.h <<\_ACEOF
-#define USE_DEPRECATED_KEYBOARD_DRIVER 1
+cat >>confdefs.h <<_ACEOF
+#define LNX_KBD_PERIOD_NAME $period_field
_ACEOF
+ ;;
+
+ freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)
+ IS_BSD="yes"
+ ;;
+
+ solaris*)
+ IS_SOLARIS="yes"
+ ;;
+
+ gnu*)
+ IS_HURD="yes"
+ ;;
+
+ *)
+ { { echo "$as_me:$LINENO: error: Your operating system is not supported by
the kbd driver.
+ Contact [EMAIL PROTECTED] if you are interested in
+ porting it." >&5
+echo "$as_me: error: Your operating system is not supported by the kbd driver.
+ Contact [EMAIL PROTECTED] if you are interested in
+ porting it." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+
+
+if test "x$IS_LINUX" = xyes; then
+ LINUX_TRUE=
+ LINUX_FALSE='#'
+else
+ LINUX_TRUE='#'
+ LINUX_FALSE=
+fi
+
+
+
+if test "x$IS_BSD" = xyes; then
+ BSD_TRUE=
+ BSD_FALSE='#'
+else
+ BSD_TRUE='#'
+ BSD_FALSE=
+fi
+
+
+
+if test "x$IS_SOLARIS" = xyes; then
+ SOLARIS_TRUE=
+ SOLARIS_FALSE='#'
+else
+ SOLARIS_TRUE='#'
+ SOLARIS_FALSE=
+fi
+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
