xserver-xorg-input-keyboard: Changes to 'upstream-experimental'
.gitignore | 1 +
ChangeLog | 51 ---------------------------------------------------
Makefile.am | 11 +++++++++++
configure.ac | 18 +++++++++++-------
src/Makefile.am | 5 +++--
src/kbd.c | 4 +++-
6 files changed, 29 insertions(+), 61 deletions(-)
New commits:
commit 708ecbf8557d9e676e3bb07c1f83170f6d9f7cd7
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 7 15:09:01 2009 -0200
Update for servers newer then 1.5 or git master.
The atKeynames.h header was moved to the kbd driver sources as
well as the xf86CommonSpecialKey() function. This problem probably
got unnoticed for quite sometime, mainly because most people doing
regular builds should either not have been building the kbd driver,
or had atKeynames.h in /usr/include/xorg from a previous install.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..8cc2c1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ ltmain.sh
missing
stamp-h1
*~
+kbd.4
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ce3cf1c..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/kbd.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-19 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * man/kbd.man:
- * man/keyboard.man:
- Correct documentation of XKB default settings
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..aec514f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+EXTRA_DIST = ChangeLog
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index c5ca5ac..aab639c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,15 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-keyboard],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-keyboard)
+# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and
+# XORG_CHANGELOG macros
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2.1)
+
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -44,8 +49,6 @@ AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-
case $host_os in
linux*)
IS_LINUX="yes"
@@ -98,8 +101,7 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-inputdir=${moduledir}/input
-AC_SUBST(inputdir)
+AC_SUBST(moduledir)
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -110,8 +112,9 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
+XORG_CWARNFLAGS
+XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
+AC_SUBST([XORG_CFLAGS])
# Checks for libraries.
@@ -120,5 +123,6 @@ AC_HEADER_STDC
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a589cb..823a9db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,10 +18,11 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-driverdir = @inputdir@
-driver_LTLIBRARIES = kbd_drv.la
+AM_CFLAGS = @XORG_CFLAGS@
+kbd_drv_la_LTLIBRARIES = kbd_drv.la
kbd_drv_la_LDFLAGS = -avoid-version -module
kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h
+kbd_drv_ladir = @moduledir@/input
BSD_SRCS = bsd_KbdMap.c bsd_kbd.c bsd_kbd.h at_scancode.c
HURD_SRCS = hurd_kbd.c at_scancode.c
diff --git a/src/kbd.c b/src/kbd.c
index 1439c4f..3560a65 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -454,12 +454,14 @@ static void
InitKBD(InputInfoPtr pInfo, Bool init)
{
char rad;
- unsigned int i;
xEvent kevent;
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1
DeviceIntPtr pKeyboard = pInfo->dev;
KeyClassRec *keyc = pKeyboard->key;
KeySym *map = keyc->curKeySyms.map;
+ unsigned int i;
+#endif
kevent.u.keyButtonPointer.time = GetTimeInMillis();
kevent.u.keyButtonPointer.rootX = 0;
Reply to: