From 5eb263e776a8193035d86a17fc3939e5fcf0c26d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 7 Apr 2006 17:32:14 +0000 Subject: Unlibcwrap. Bump server version requirement. Bump to 1.1.0. --- ChangeLog | 6 ++++++ configure.ac | 4 ++-- src/xf86Fpit.c | 10 ++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6c8681..7ca30f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson + + * configure.ac: + * src/xf86Fpit.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-20 Kevin E. Martin * configure.ac: diff --git a/configure.ac b/configure.ac index fdd0f7d..693ad9e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-fpit], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-fpit) @@ -75,7 +75,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c index 3934187..b7a9a60 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -57,15 +57,13 @@ #include -# ifndef XFree86LOADER -# include -# include -# endif +#include +#include +#include # include # include # if !defined(DGUX) -# include # endif # include # include @@ -597,7 +595,7 @@ static void Unplug(pointer p) } static XF86ModuleVersionInfo version_rec = { - "fpit", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, + "fpit", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, {0, 0, 0, 0} }; -- cgit v1.2.3