.gitignore | 72 +++++++++++++++++++++--- Makefile.am | 10 ++- configure.ac | 53 +++++++++-------- man/Makefile.am | 25 -------- src/xf86PM.c | 165 +++++++++++++------------------------------------------- src/xf86PM.h | 7 -- 6 files changed, 141 insertions(+), 191 deletions(-)
New commits: commit 30bf5a6bb20b8ad703f305bcde0ade2a99328b6c Author: Peter Hutterer <[email protected]> Date: Tue Jun 28 10:38:27 2011 +1000 penmount 1.5.0 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index c0b3685..1d0b819 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.60) AC_INIT([xf86-input-penmount], - [1.4.99], + [1.5.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-penmount]) AC_CONFIG_SRCDIR([Makefile.am]) commit f0158bd0eb8efe2e051bb00d98d17b6071224062 Author: Peter Hutterer <[email protected]> Date: Tue Jun 28 10:37:53 2011 +1000 Require server 1.10 instead of manual ABI checks Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 8ad433b..c0b3685 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99] xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto $REQUIRED_MODULES) # Define an Automake variable for the driver name DRIVER_NAME=penmount diff --git a/src/xf86PM.c b/src/xf86PM.c index 8d7539e..edcf6f8 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -57,10 +57,6 @@ #define TS_Raw 60 #define TS_Scaled 61 -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 -#error "Need server with input ABI 12" -#endif - /* * Be sure to set vmin appropriately for your device's protocol. You want to * read a full packet before returning commit 6658e9ad22923e8bb90ff84c079e870a8e416976 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:34:06 2010 +1000 Support (and require) input ABI 12. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/configure.ac b/configure.ac index 94869c2..8ad433b 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99] xproto $REQUIRED_MODULES) # Define an Automake variable for the driver name DRIVER_NAME=penmount diff --git a/src/xf86PM.c b/src/xf86PM.c index 2034200..8d7539e 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -57,11 +57,15 @@ #define TS_Raw 60 #define TS_Scaled 61 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 +#error "Need server with input ABI 12" +#endif + /* * Be sure to set vmin appropriately for your device's protocol. You want to * read a full packet before returning */ -static const char *default_options[] = +static char *default_options[] = { /* "Device", "/dev/ttyS1",*/ "BaudRate", "19200", @@ -81,7 +85,8 @@ _X_EXPORT InputDriverRec PENMOUNT = { PenMountPreInit, /*PenMountUnInit*/NULL, NULL, -}; + default_options +}; static XF86ModuleVersionInfo VersionRec = { @@ -183,12 +188,14 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) min_x, max_x, 9500, 0 /* min_res */ , - 9500 /* max_res */ ); + 9500 /* max_res */, + Absolute); InitValuatorAxisStruct (dev, 1, axis_labels[1], min_y, max_y, 10500, 0 /* min_res */ , - 10500 /* max_res */ ); + 10500 /* max_res */, + Absolute); } if (InitProximityClassDeviceStruct (dev) == FALSE) @@ -411,21 +418,15 @@ DMC9512_ProcessDeviceOn(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr return Success; } -static InputInfoPtr -PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) -{ - InputInfoPtr pInfo; +static int +PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) +{ PenMountPrivatePtr priv = calloc (1, sizeof (PenMountPrivateRec)); char *s; if (!priv) - return NULL; + return BadAlloc; - if (!(pInfo = xf86AllocateInput(drv, 0))) { - free(priv); - return NULL; - } - priv->min_x = 0; priv->max_x = 1024; priv->min_y = 768; @@ -446,12 +447,7 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->read_input = ReadInput; pInfo->control_proc = ControlProc; pInfo->switch_mode = SwitchMode; - pInfo->dev = NULL; pInfo->private = priv; - pInfo->private_flags = 0; - pInfo->conf_idev = dev; - - xf86CollectInputOptions(pInfo, default_options, NULL); xf86OptionListReport( pInfo->options ); @@ -502,10 +498,8 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) /* this results in an xstrdup that must be freed later */ pInfo->name = xf86SetStrOption( pInfo->options, "DeviceName", "PenMount"); - xf86ProcessCommonOptions(pInfo, pInfo->options); - pInfo->flags |= XI86_CONFIGURED; - return (pInfo); + return Success; SetupProc_fail: if ((pInfo) && (pInfo->fd)) @@ -517,7 +511,7 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) XisbFree (priv->buffer); if (priv) free (priv); - return (pInfo); + return BadValue; } static Bool diff --git a/src/xf86PM.h b/src/xf86PM.h index ee1bf47..5183f91 100644 --- a/src/xf86PM.h +++ b/src/xf86PM.h @@ -91,8 +91,8 @@ static Bool PenMountGetPacket (PenMountPrivatePtr priv); static Bool DMC9000_PenMountGetPacket (PenMountPrivatePtr priv); static Bool PenMountSendPacket (PenMountPrivatePtr priv, unsigned char *buf, int len ); -static InputInfoPtr -PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags); +static int +PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags); static void PenMountPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl); commit 55f9e93bb67bda172de9ba71c465d2fbd0a80410 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:33:11 2010 +1000 Move default_options up no functional changes, prep work for ABI 12 Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index bb1424c..2034200 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -57,6 +57,23 @@ #define TS_Raw 60 #define TS_Scaled 61 +/* + * Be sure to set vmin appropriately for your device's protocol. You want to + * read a full packet before returning + */ +static const char *default_options[] = +{ + /* "Device", "/dev/ttyS1",*/ + "BaudRate", "19200", + "StopBits", "1", + "DataBits", "8", + "Parity", "None", + "Vmin", "3", + "Vtime", "1", + "FlowControl", "None", + NULL, +}; + _X_EXPORT InputDriverRec PENMOUNT = { 1, "penmount", @@ -97,24 +114,6 @@ _X_EXPORT XF86ModuleData penmountModuleData = { NULL }; -/* - * Be sure to set vmin appropriately for your device's protocol. You want to - * read a full packet before returning - */ -static const char *default_options[] = -{ - /* "Device", "/dev/ttyS1",*/ - "BaudRate", "19200", - "StopBits", "1", - "DataBits", "8", - "Parity", "None", - "Vmin", "3", - "Vtime", "1", - "FlowControl", "None", - NULL, -}; - - /***************************************************************************** * Function Definitions ****************************************************************************/ commit 79c7b3641c9b42ff13c0472707d20133707aa96f Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:30:08 2010 +1000 Add TS_Raw and TS_Scaled defines The use of these is driver-internal, they used to be in the server but not since ABI 12. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index b5b2e70..bb1424c 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -54,6 +54,9 @@ #include <string.h> #include "xf86PM.h" +#define TS_Raw 60 +#define TS_Scaled 61 + _X_EXPORT InputDriverRec PENMOUNT = { 1, "penmount", commit 4ac7e6e92ae7ae935b1a79aaa63a0343bb6ed08d Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:29:23 2010 +1000 Drop driver-specific motion history size handling. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index 7b8c3f0..b5b2e70 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -148,7 +148,7 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) * Axes min and max values are reported in raw coordinates. */ if (InitValuatorClassDeviceStruct (dev, 2, axis_labels, - pInfo->history_size, Absolute) == FALSE) + GetMotionHistorySize(), Absolute) == FALSE) { ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n"); return !Success; commit ad6785f44be7d5bc6ba27ea3e05a688d9b672ddd Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:23:40 2010 +1000 Drop write-only flags POINTER_CAPABLE and SEND_DRAG_EVENTS Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index 673618a..7b8c3f0 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -447,7 +447,6 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->dev = NULL; pInfo->private = priv; pInfo->private_flags = 0; - pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; pInfo->conf_idev = dev; xf86CollectInputOptions(pInfo, default_options, NULL); commit 0fbd6613c9eb7fbf1e820982551380652e040233 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:23:07 2010 +1000 Drop close_proc, conversion_proc. Both aren't called by the server. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index a45e67d..673618a 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -443,9 +443,7 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->device_control = DeviceControl; pInfo->read_input = ReadInput; pInfo->control_proc = ControlProc; - pInfo->close_proc = CloseProc; pInfo->switch_mode = SwitchMode; - pInfo->conversion_proc = ConvertProc; pInfo->dev = NULL; pInfo->private = priv; pInfo->private_flags = 0; @@ -871,15 +869,6 @@ ControlProc (InputInfoPtr pInfo, xDeviceCtl * control) } /* - * the CloseProc should not need to be tailored to your device - */ -static void -CloseProc (InputInfoPtr pInfo) -{ - -} - -/* * The SwitchMode function may need to be tailored for your device */ static int @@ -899,41 +888,6 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode) } /* - * The ConvertProc function may need to be tailored for your device. - * This function converts the device's valuator outputs to x and y coordinates - * to simulate mouse events. - */ -static Bool -ConvertProc (InputInfoPtr pInfo, - int first, - int num, - int v0, - int v1, - int v2, - int v3, - int v4, - int v5, - int *x, - int *y) -{ - PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private); - - if (priv->reporting_mode == TS_Raw) - { - *x = xf86ScaleAxis (v0, 0, priv->screen_width, priv->min_x, - priv->max_x); - *y = xf86ScaleAxis (v1, 0, priv->screen_height, priv->min_y, - priv->max_y); - } - else - { - *x = v0; - *y = v1; - } - return (TRUE); -} - -/* * the QueryHardware fuction should be tailored to your device to * verify the device is attached and functional and perform any * needed initialization. diff --git a/src/xf86PM.h b/src/xf86PM.h index a62903f..ee1bf47 100644 --- a/src/xf86PM.h +++ b/src/xf86PM.h @@ -85,9 +85,7 @@ static Bool DeviceControl (DeviceIntPtr, int); static void ReadInput (InputInfoPtr); static void DMC9000_ReadInput (InputInfoPtr); static int ControlProc (InputInfoPtr, xDeviceCtl *); -static void CloseProc (InputInfoPtr); static int SwitchMode (ClientPtr, DeviceIntPtr, int); -static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *); static Bool QueryHardware (PenMountPrivatePtr); static Bool PenMountGetPacket (PenMountPrivatePtr priv); static Bool DMC9000_PenMountGetPacket (PenMountPrivatePtr priv); commit 84fc05ccc0a0477d9e11eb3486d1a64735ae7050 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:20:05 2010 +1000 Fix compiler warning, unused variable "map". xf86PM.c: In function 'DeviceControl': xf86PM.c:530:16: warning: unused variable 'map' Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index 328ad28..a45e67d 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -526,8 +526,6 @@ DeviceControl (DeviceIntPtr dev, int mode) { InputInfoPtr pInfo = dev->public.devicePrivate; PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private); - unsigned char map[] = - {0, 1}; switch (mode) { commit f2bd17021c5efb9118b813a6586da423aa5d2f4d Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:19:20 2010 +1000 Drop libc wrappers for free, malloc Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index 1ba947f..328ad28 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -413,14 +413,14 @@ static InputInfoPtr PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { InputInfoPtr pInfo; - PenMountPrivatePtr priv = xcalloc (1, sizeof (PenMountPrivateRec)); + PenMountPrivatePtr priv = calloc (1, sizeof (PenMountPrivateRec)); char *s; if (!priv) return NULL; if (!(pInfo = xf86AllocateInput(drv, 0))) { - xfree(priv); + free(priv); return NULL; } @@ -512,12 +512,12 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) if ((pInfo) && (pInfo->fd)) xf86CloseSerial (pInfo->fd); if ((pInfo) && (pInfo->name)) - xfree (pInfo->name); + free (pInfo->name); if ((priv) && (priv->buffer)) XisbFree (priv->buffer); if (priv) - xfree (priv); + free (priv); return (pInfo); } commit 22cd19a9e91fcd722cc30a3b8d21725512169219 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:17:38 2010 +1000 unifdef XFree86LOADER Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index 7b42d62..1ba947f 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -63,10 +63,6 @@ _X_EXPORT InputDriverRec PENMOUNT = { NULL, }; - - -#ifdef XFree86LOADER - static XF86ModuleVersionInfo VersionRec = { "penmount", @@ -98,9 +94,6 @@ _X_EXPORT XF86ModuleData penmountModuleData = { NULL }; -#endif /* XFree86LOADER */ - - /* * Be sure to set vmin appropriately for your device's protocol. You want to * read a full packet before returning commit f3c472b4b5596685c1c094a51876dcc06be3a968 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:17:24 2010 +1000 Require server 1.9, drop earlier ABI support Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Trevor Woerner <[email protected]> diff --git a/configure.ac b/configure.ac index 3eb54cc..94869c2 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto $REQUIRED_MODULES) # Define an Automake variable for the driver name DRIVER_NAME=penmount diff --git a/src/xf86PM.c b/src/xf86PM.c index 5a3f8a8..7b42d62 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -143,9 +143,7 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) * Device reports button press for 1 button. */ if (InitButtonClassDeviceStruct (dev, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 &btn_label, -#endif map) == FALSE) { ErrorF ("Unable to allocate PenMount ButtonClassDeviceStruct\n"); @@ -156,13 +154,7 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) * Device reports motions on 2 axes in absolute coordinates. * 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 + if (InitValuatorClassDeviceStruct (dev, 2, axis_labels, pInfo->history_size, Absolute) == FALSE) { ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n"); @@ -192,18 +184,12 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) min_y = 0; } - InitValuatorAxisStruct (dev, 0, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axis_labels[0], -#endif + InitValuatorAxisStruct (dev, 0, axis_labels[0], min_x, max_x, 9500, 0 /* min_res */ , 9500 /* max_res */ ); - InitValuatorAxisStruct (dev, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axis_labels[1], -#endif + InitValuatorAxisStruct (dev, 1, axis_labels[1], min_y, max_y, 10500, 0 /* min_res */ , @@ -917,13 +903,6 @@ 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); } commit 8d4b4b7a827d9dd48d598c39ba5d3229dc45d3d4 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:22:16 2010 +1000 Purge CVS tags Signed-off-by: Peter Hutterer <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index fb3d36d..5a3f8a8 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -37,7 +37,6 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.c,v 1.2 2000/08/11 19:10:46 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xf86PM.h b/src/xf86PM.h index ff1d158..a62903f 100644 --- a/src/xf86PM.h +++ b/src/xf86PM.h @@ -27,7 +27,6 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.h,v 1.2 1999/08/22 05:57:37 dawes Exp $ */ #ifndef _PENMOUNT_H_ #define _PENMOUNT_H_ commit 68a9e64e780f2ac01a6e6700e271dcaebe7f7e86 Author: Peter Hutterer <[email protected]> Date: Thu Dec 2 14:15:56 2010 +1000 Bump to 1.4.99 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index e3f7ab0..3eb54cc 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.60) AC_INIT([xf86-input-penmount], - [1.4.1], + [1.4.99], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-penmount]) AC_CONFIG_SRCDIR([Makefile.am]) commit af7e7c0aa603b67b12e4046bcda9bc58026cd82b Author: Alan Coopersmith <[email protected]> Date: Wed Oct 27 22:21:20 2010 -0700 Remove refcnt field from InputDriverRec. Wasn't used in the server and is now removed. Fixes compiler error: "xf86PM.c", line 59: too many struct/union initializers Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/xf86PM.c b/src/xf86PM.c index 14cbe22..fb3d36d 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -62,7 +62,6 @@ _X_EXPORT InputDriverRec PENMOUNT = { PenMountPreInit, /*PenMountUnInit*/NULL, NULL, - 0 }; commit 63d1539957f1618af8ebca520f61ca712070d950 Author: Gaetan Nadon <[email protected]> Date: Mon Oct 18 19:39:08 2010 -0400 config: upgrade to util-macros 1.8 for additional man page support Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Use the appropriate platform version of sed Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 2746411..e3f7ab0 100644 --- a/configure.ac +++ b/configure.ac @@ -44,10 +44,10 @@ AH_TOP([#include "xorg-server.h"]) AC_PROG_CC AC_PROG_INSTALL -# Initialize X.Org macros +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Define a configure option for an alternate input module directory diff --git a/man/Makefile.am b/man/Makefile.am index bf7ec17..48cef63 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -26,34 +26,13 @@ # drivermandir = $(DRIVER_MAN_DIR) - driverman_PRE = @[email protected] - driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) EXTRA_DIST = @[email protected] - CLEANFILES = $(driverman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ commit 6dab63a36c5b89fa2de1128538b88e2bbce9a34c Author: Gaetan Nadon <[email protected]> Date: Mon Apr 12 13:36:10 2010 -0400 config: disable inadvertently re-enabled static library creation AC_DISABLE_STATIC must be places before AC_PROG_LIBTOOL, requirement which is not documented in libtool. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index ef7e83e..2746411 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Initialize libtool -AC_PROG_LIBTOOL AC_DISABLE_STATIC +AC_PROG_LIBTOOL # Initialize Autoheader AH_TOP([#include "xorg-server.h"]) commit a1d3a8a54d96b23adf1dd819726e80be1bc0eebb Author: Gaetan Nadon <[email protected]> Date: Sat Mar 6 09:03:20 2010 -0500 config: remove unused sdkdir variable Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index bc613d9..ef7e83e 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ AC_INIT([xf86-input-penmount], [xf86-input-penmount]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) -AC_CANONICAL_HOST # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -43,8 +42,6 @@ AH_TOP([#include "xorg-server.h"]) # Checks for programs. AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_CXX AC_PROG_INSTALL # Initialize X.Org macros @@ -68,7 +65,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Define an Automake variable for the driver name DRIVER_NAME=penmount commit 5902c15cac1ee0c163256e132f85b8720aed845e Author: Gaetan Nadon <[email protected]> Date: Fri Mar 5 11:57:47 2010 -0500 Configuration upgrades, .gitignore, INSTALL file Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/.gitignore b/.gitignore index 04b9542..f3b889b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,78 @@ -ChangeLog -Makefile -Makefile.in -*.la -*.lo +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -stamp-h1 +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -man/penmount.? +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xf86-input-synaptics +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/Makefile.am b/Makefile.am index 21ae771..0aabe2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,13 +18,15 @@ # 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. -AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -CLEANFILES = ChangeLog -EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 1a68272..bc613d9 100644 --- a/configure.ac +++ b/configure.ac @@ -20,37 +20,42 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.57) +# Initialize Autoconf +AC_PREREQ(2.60) AC_INIT([xf86-input-penmount], - 1.4.1, + [1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
