xserver-xorg-input-penmount: Changes to 'debian-unstable'
COPYING | 28 +++++++++++++------
ChangeLog | 44 ++++++++++++++++++++++++++++++
Makefile.am | 2 -
README | 13 ++++++---
configure.ac | 31 ++++-----------------
debian/changelog | 8 ++++-
src/Makefile.am | 1
src/xf86PM.c | 79 ++++++++++++++++++-------------------------------------
src/xf86PM.h | 1
9 files changed, 114 insertions(+), 93 deletions(-)
New commits:
commit 11df7928d7f6a7756626029ef02dd385a02a6c72
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Mar 4 21:30:49 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 714794e..15f90e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low
[ Timo Aaltonen ]
* Bump Standards-Version to 3.8.3.
@@ -13,7 +13,7 @@ xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low
* New upstream release.
+ Fix FTBFS against Xserver 1.7, closes: #569400.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:04 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 04 Mar 2010 21:30:38 +0100
xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
commit e59ecc43257dc6a46c50a1ce696272859dc7b810
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Mar 4 21:26:31 2010 +0100
New upstream release
diff --git a/ChangeLog b/ChangeLog
index dc92b61..a5040ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Mar 3 23:41:39 2010 +0100
+
+ Bump to 1.4.1
+
+commit a6fedb3d2fd0288283602fef14f2a0a460b2afef
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Mar 3 23:48:33 2010 +0100
+
+ Don't use obsolete loader functions
+
+commit 1d6ba7c8c8c7183569f9dc708090f36de8b6bdd6
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Mar 3 23:40:11 2010 +0100
+
+ Janitorial configure.ac/Makefile.am updates
+
+ Use XORG_DEFAULT_OPTIONS and update ChangeLog rule to work with newer
+ git. Also set AM_CFLAGS in Makefile.am instead of setting CFLAGS from
+ configure.ac.
+
+commit dab0c2742c034750e3e9673167eb20812b679818
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 17 13:59:43 2009 +1000
+
+ Cope with XINPUT ABI 7.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fedbe483260a4bc8e2cc77e7d6a543ba37170448
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 11 20:04:51 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
+commit b5a8cdbd73939aa62cf3ae08957db67c65e6b51f
+Author: Steve Bian <s@pictorii.com>
+Date: Sun Jan 18 23:33:52 2009 +1100
+
+ Added InvertX option
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 0536f70861f11192820439d36de951ef106d4e5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 19 16:32:32 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 99d7fd6..714794e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Bump Standards-Version to 3.8.3.
@@ -9,6 +9,10 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Brice Goglin ]
+ * New upstream release.
+ + Fix FTBFS against Xserver 1.7, closes: #569400.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:04 +0200
xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 3 23:41:39 2010 +0100
Bump to 1.4.1
diff --git a/configure.ac b/configure.ac
index 1377a00..1a68272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-penmount],
- 1.4.0,
+ 1.4.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-penmount)
commit a6fedb3d2fd0288283602fef14f2a0a460b2afef
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 3 23:48:33 2010 +0100
Don't use obsolete loader functions
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 1e38124..14cbe22 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -84,62 +84,12 @@ static XF86ModuleVersionInfo VersionRec =
* a tool */
};
-
-static const char *reqSymbols[] = {
- "AddEnabledDevice",
- "ErrorF",
- "InitButtonClassDeviceStruct",
- "InitProximityClassDeviceStruct",
- "InitValuatorAxisStruct",
- "InitValuatorClassDeviceStruct",
- "InitPtrFeedbackClassDeviceStruct",
- "RemoveEnabledDevice",
- "Xcalloc",
- "Xfree",
- "XisbBlockDuration",
- "XisbFree",
- "XisbNew",
- "XisbRead",
- "XisbTrace",
- "screenInfo",
- "xf86AddInputDriver",
- "xf86AllocateInput",
- "xf86CloseSerial",
- "xf86CollectInputOptions",
- "xf86ErrorFVerb",
- "xf86FindOptionValue",
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- "xf86GetMotionEvents",
-#endif
- "xf86GetVerbosity",
- "xf86MotionHistoryAllocate",
- "xf86NameCmp",
- "xf86OpenSerial",
- "xf86OptionListCreate",
- "xf86OptionListMerge",
- "xf86OptionListReport",
- "xf86PostButtonEvent",
- "xf86PostMotionEvent",
- "xf86PostProximityEvent",
- "xf86ProcessCommonOptions",
- "xf86ScaleAxis",
- "xf86SetIntOption",
- "xf86SetStrOption",
- "xf86XInputSetScreen",
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- "xf86XInputSetSendCoreEvents",
-#endif
- NULL
-};
-
-
static pointer
PenMountSetupProc( pointer module,
pointer options,
int *errmaj,
int *errmin )
{
- xf86LoaderReqSymLists(reqSymbols, NULL);
xf86AddInputDriver(&PENMOUNT, module, 0);
return (pointer) 1;
}
commit 1d6ba7c8c8c7183569f9dc708090f36de8b6bdd6
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 3 23:40:11 2010 +0100
Janitorial configure.ac/Makefile.am updates
Use XORG_DEFAULT_OPTIONS and update ChangeLog rule to work with newer
git. Also set AM_CFLAGS in Makefile.am instead of setting CFLAGS from
configure.ac.
diff --git a/Makefile.am b/Makefile.am
index 42f8b54..21ae771 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,4 +27,4 @@ EXTRA_DIST = 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)
+ $(CHANGELOG_CMD)
diff --git a/configure.ac b/configure.ac
index e32aeea..1377a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ AC_INIT([xf86-input-penmount],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-penmount)
+# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -41,27 +45,10 @@ AM_CONFIG_HEADER([config.h])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
-#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
-
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
@@ -78,15 +65,9 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
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'
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2042e32..56ecc23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@
# 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.
+AM_CFLAGS = $(XORG_CFLAGS) -I$(top_srcdir)/src
# this is obnoxious:
# -module lets us name the module exactly how we want
commit dab0c2742c034750e3e9673167eb20812b679818
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 17 13:59:43 2009 +1000
Cope with XINPUT ABI 7.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 0c01760..1e38124 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -181,6 +181,9 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
unsigned char map[] =
{0, 1};
int min_x, min_y, max_x, max_y;
+ Atom axis_labels[2] = { 0, 0 };
+ Atom btn_label = 0;
+
/*
* these have to be here instead of in the SetupProc, because when the
* SetupProc is run at server startup, screenInfo is not setup yet
@@ -191,7 +194,11 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
/*
* Device reports button press for 1 button.
*/
- if (InitButtonClassDeviceStruct (dev, 1, map) == FALSE)
+ if (InitButtonClassDeviceStruct (dev, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ &btn_label,
+#endif
+ map) == FALSE)
{
ErrorF ("Unable to allocate PenMount ButtonClassDeviceStruct\n");
return !Success;
@@ -202,6 +209,9 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
* Axes min and max values are reported in raw coordinates.
*/
if (InitValuatorClassDeviceStruct (dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
@@ -234,11 +244,19 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
min_y = 0;
}
- InitValuatorAxisStruct (dev, 0, min_x, max_x,
+ InitValuatorAxisStruct (dev, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels[0],
+#endif
+ min_x, max_x,
9500,
0 /* min_res */ ,
9500 /* max_res */ );
- InitValuatorAxisStruct (dev, 1, min_y, max_y,
+ InitValuatorAxisStruct (dev, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels[1],
+#endif
+ min_y, max_y,
10500,
0 /* min_res */ ,
10500 /* max_res */ );
commit fedbe483260a4bc8e2cc77e7d6a543ba37170448
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 11 20:04:51 2009 -0700
Fill in COPYING file, add SubmittingPatches URL to README
diff --git a/COPYING b/COPYING
index 7f33cbf..bed7479 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,24 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1999 Machine Vision Holdings Incorporated
+Template driver used: Copyright (c) 1998 Metro Link Incorporated
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, cpy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER 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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
diff --git a/README b/README
index f857884..6cf5a78 100644
--- a/README
+++ b/README
@@ -1,20 +1,25 @@
xf86-input-penmount - PenMount input driver for the Xorg X server
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/driver/xf86-input-penmount
http://cgit.freedesktop.org/xorg/driver/xf86-input-penmount
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
+
commit b5a8cdbd73939aa62cf3ae08957db67c65e6b51f
Author: Steve Bian <s@pictorii.com>
Date: Sun Jan 18 23:33:52 2009 +1100
Added InvertX option
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86PM.c b/src/xf86PM.c
index d07e242..0c01760 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -529,6 +529,7 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->button_number = xf86SetIntOption( pInfo->options, "ButtonNumber", 1 );
priv->swap_xy = xf86SetIntOption( pInfo->options, "SwapXY", 0 );
priv->invert_y = xf86SetIntOption( pInfo->options, "InvertY", 0 );
+ priv->invert_x = xf86SetIntOption( pInfo->options, "InvertX", 0 );
priv->buffer = NULL;
s = xf86FindOptionValue (pInfo->options, "ReportingMode");
if ((s) && (xf86NameCmp (s, "raw") == 0))
@@ -848,6 +849,10 @@ DMC9000_ReadInput (InputInfoPtr pInfo)
{
y = priv->max_y - y + priv->min_y;
}
+ if (priv->invert_x)
+ {
+ x = priv->max_x - x + priv->min_x;
+ }
priv->packet[0] = priv->pen_down ? 0x01 : 0x00;
if (priv->reporting_mode == TS_Scaled)
diff --git a/src/xf86PM.h b/src/xf86PM.h
index d13cbee..ff1d158 100644
--- a/src/xf86PM.h
+++ b/src/xf86PM.h
@@ -63,6 +63,7 @@ typedef struct _PenMountPrivateRec
int proximity;
int swap_xy;
int invert_y;
+ int invert_x;
XISBuffer *buffer;
unsigned char packet[PENMOUNT_PACKET_SIZE]; /* packet being/just read */
PenMountState lex_mode;
Reply to: