xf86-input-dmc 1.1.2

This commit is contained in:
matthieu 2008-08-23 13:31:26 +00:00
parent 6f9f0abd27
commit 1ccf49e602
6 changed files with 266 additions and 31 deletions

View File

@ -1,45 +1,252 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
commit c4e0ea36b83e72a4c49e5dbaa861e9e70cce0127
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 16:53:08 2008 -0200
* configure.ac:
* src/xf86DMC.c:
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
Don't call xf86XInputSetSendCoreEvents
Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 997ababb005efe7bd79c2e9445ed288d8402e2ed
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 7 03:08:43 2007 +0200
* configure.ac:
Update package version for X11R7 release.
Bump to 1.1.1
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 939750c472f9c209a4bdb233df36ce649660ffa8
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 7 03:06:25 2007 +0200
* configure.ac:
Update package version number for final X11R7 release candidate.
remove ChangeLog, add dist hook
Remove ChangeLog from the tree, and add a git dist hook to generate
it automatically.
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 5bf3ca5537470888614d21e0d8920d3030d4116c
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:04 2007 -0400
* man/Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Add *~ to .gitignore to skip patch/emacs droppings
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit b2688f5e93f558f6e6176bbf02e8641910ff9642
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:23 2007 -0400
* configure.ac:
Update package version number for X11R7 RC3 release.
Rename .cvsignore to .gitignore
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 43a05fb4cb02f15fc91d0909a3cab37a9de6b622
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 00:57:59 2007 +0300
* configure.ac:
Remove extraneous AC_MSG_RESULT.
Move from TSCalibrationCtl to AbsCalibCtl
This change happened a while ago in inputproto.
2005-11-29 Adam Jackson <ajax@freedesktop.org>
commit 8b32deeefab848e91db970a51d2021a5382107df
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 22:25:20 2007 +0200
* configure.ac:
Only build dlloader modules by default.
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit b7d281dea16e6199bca275bf97a0aa64b2644c37
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 17:14:28 2006 +0000
* configure.ac:
Update package version number for X11R7 RC2 release.
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 749182a5a24d749dab8a277d5451b25304b04e72
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:56 2005 +0000
* configure.ac:
Update pkgcheck dependencies to work with separate build roots.
Update package version for X11R7 release.
commit 6bba5156f762ae93adef40b57d49db5759641aa9
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:50 2005 +0000
Stub COPYING files
commit 14409362d8877400f119d42e76996164148af2e6
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:13 2005 +0000
Update package version number for final X11R7 release candidate.
commit 5937e814d91a32d32ee35199eebe19b2618c4ef9
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:28 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 8f0ecc3c0b693941259b59eec4ce7aaf79232774
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:29 2005 +0000
Update package version number for X11R7 RC3 release.
commit 5874be4a4284f0f58f54614912fcbd3fd2e0894e
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:04 2005 +0000
Remove extraneous AC_MSG_RESULT.
commit 17c716ac993e82fe0ee367b79398f7c28ee013f0
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:29:54 2005 +0000
Only build dlloader modules by default.
commit a5076b6c86ba5a418f67da566eb6b0658f0b8e22
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:06 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit fb386095a0ed7328d1ba4dfeaae6a0ce98817055
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:02 2005 +0000
Add .cvsignores for drivers.
commit a8fd1fc3823cd6c721276f6c9cbe71b3b99945ed
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:11 2005 +0000
Update package version number for X11R7 RC2 release.
commit c41b20d77e9a5a7011d75a5ff3d4ccaf40afc7de
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:49 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
commit ea23c581e7a415170af3ccd1a6176d20fae45ae3
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:47:59 2005 +0000
Update package version number for RC1 release.
commit 4e553e4c61a445e3fad8270f15751975cfa68432
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:01:50 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
commit b448c1547dc6e32ff501dd390da117a020f44901
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:26 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
commit b13a666524a7905e7aa8fb1e89b1cc238af8fb71
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:08:54 2005 +0000
Use sed & cpp to substitute variables in driver man pages
commit df1fb65a86addc4129864287548b8da5cf8c89d2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:38 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
commit 5ed3bb39710c644afc11ca87cc8f4e1f1bb4df0f
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 14:07:22 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
drivers
commit 1d06f19aca00cfd8a49dd81fa66cfffa4659ba4d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:40 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 96b2aceb89dce6232fe20b1f12f47e72d5b4ce21
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 20:03:21 2005 +0000
Make the module dir configurable
commit 06e44d999db63c2f89ab1618f9b4951c0a7bf58e
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 02:20:58 2005 +0000
Update all input drivers to pass distcheck
commit 7f31178f264847498eb3e277b2d44f6202161c93
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 06:15:08 2005 +0000
Build skeletons for input drivers. Should basically work.
commit 4ff28a309b7efba39199719bb52c325e3eb2d60f
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:37:58 2005 +0000
Prep input drivers for modularizing by adding guarded #include "config.h"
commit 23e1cafaf9fcaa81def646ffebc88f88fe03bb3e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:17:01 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
commit 682f15298c5d80c05698bebdb5297e3c06dc005c
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:02 2004 +0000
Merging XORG-CURRENT into trunk
commit e672e5fea83a43f79bc6d68207d57135f154a0c3
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:47 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 13e5fce4f2aa5e3389b36076c54d58915a1e0584
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:30 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 25917d14fbfe369824b887f19a232418a664d12a
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:00 2004 +0000
readding XFree86's cvs IDs
commit 475dba2fb2143aac1e5237ff47705ce70e689a70
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:33 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 586a474381bc5a714f628282973457e2e918e0a5
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:47 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 5363ab3ebc4162b75ffd5b0a6a26370ca0911656
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:56 2003 +0000
XFree86 4.3.0.1
commit 7e85458c23b4b7e7d747ef73d13695fd5d25acac
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:56 2003 +0000
Initial revision

View File

@ -20,3 +20,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST=ChangeLog autogen.sh
CLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog

View File

@ -0,0 +1,12 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-dmc],
1.1.0,
1.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-dmc)

View File

@ -1,3 +1,4 @@
# $Id: Makefile.am,v 1.3 2008/08/23 13:31:26 matthieu Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#

View File

@ -74,7 +74,7 @@ static XF86ModuleVersionInfo VersionRec =
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,
@ -122,7 +122,9 @@ static const char *reqSymbols[] = {
"xf86SetIntOption",
"xf86SetStrOption",
"xf86XInputSetScreen",
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
"xf86XInputSetSendCoreEvents",
#endif
NULL
};
@ -526,7 +528,7 @@ ReadInput (InputInfoPtr pInfo)
static int
ControlProc (InputInfoPtr pInfo, xDeviceCtl * control)
{
xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control;
DMCPrivatePtr priv = (DMCPrivatePtr) (pInfo->private);
priv->min_x = c->min_x;
@ -561,11 +563,13 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
priv->reporting_mode = mode;
return (Success);
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
{
xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
return (Success);
}
#endif
else
return (!Success);
}