.gitignore | 70 ++++++++++++++++++++++--- COPYING | 41 ++++++-------- Makefile.am | 11 +-- configure.ac | 18 +++--- man/.gitignore | 2 man/Makefile.am | 70 ++++++++----------------- src/.gitignore | 6 -- src/void.c | 156 ++++---------------------------------------------------- 8 files changed, 134 insertions(+), 240 deletions(-)
New commits: commit cb8d19b8ac433d5292502e032f6210ee5151d6e2 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:48:22 2010 +1000 Fix PreInit for ABI 12. Require an xserver 1.9.99.1 or higher and put an ifdef in for ABI 12. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index ed755c2..4271b5a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ inputdir=${moduledir}/input AC_SUBST(inputdir) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/void.c b/src/void.c index 404b8d7..0184893 100644 --- a/src/void.c +++ b/src/void.c @@ -48,14 +48,13 @@ #define MAXBUTTONS 3 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 +#error "XINPUT ABI 12 required." +#endif /****************************************************************************** * Function/Macro keys variables *****************************************************************************/ -static const char *DEFAULTS[] = { - NULL -}; - static void BellProc( int percent, @@ -194,42 +193,20 @@ xf86VoidUninit(InputDriverPtr drv, * * called when the module subsection is found in XF86Config */ -static InputInfoPtr +static int xf86VoidInit(InputDriverPtr drv, - IDevPtr dev, + InputInfoPtr pInfo, int flags) { - InputInfoPtr pInfo; - - if (!(pInfo = xf86AllocateInput(drv, 0))) - return NULL; - /* Initialise the InputInfoRec. */ - pInfo->name = dev->identifier; pInfo->type_name = "Void"; - pInfo->flags = XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; pInfo->device_control = xf86VoidControlProc; pInfo->read_input = NULL; pInfo->control_proc = NULL; - pInfo->close_proc = NULL; pInfo->switch_mode = NULL; - pInfo->conversion_proc = NULL; - pInfo->reverse_conversion_proc = NULL; pInfo->fd = -1; - pInfo->dev = NULL; - pInfo->private_flags = 0; - pInfo->always_core_feedback = NULL; - pInfo->conf_idev = dev; - /* Collect the options, and process the common options. */ - xf86CollectInputOptions(pInfo, DEFAULTS, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); - - /* Mark the device configured */ - pInfo->flags |= XI86_CONFIGURED; - - /* Return the configured device */ - return (pInfo); + return Success; } _X_EXPORT InputDriverRec VOID = { commit 7456467a0453677b9e5bca914c9274a305f35586 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:45:27 2010 +1000 Add mode field to xf86InitValuatorAxisStruct. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/void.c b/src/void.c index c0feca8..404b8d7 100644 --- a/src/void.c +++ b/src/void.c @@ -141,14 +141,16 @@ xf86VoidControlProc(DeviceIntPtr device, int what) 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ - 1); /* max_res */ + 1, /* max_res */ + Absolute); InitValuatorAxisStruct(device, 1, axes_labels[1], 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ - 1); /* max_res */ + 1, /* max_res */ + Absolute); ErrorF("unable to allocate Valuator class device\n"); return !Success; } commit 86084d219f856e420cd1984ebe0320739248eeb4 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:52:15 2010 +1000 Label the axes as absolute, not relative. Not that it matters for this driver, but the axes are set up as absolute, so label them accordingly. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/void.c b/src/void.c index d94ce15..c0feca8 100644 --- a/src/void.c +++ b/src/void.c @@ -97,8 +97,8 @@ xf86VoidControlProc(DeviceIntPtr device, int what) Atom btn_labels[MAXBUTTONS] = {0}; Atom axes_labels[2] = {0}; - axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); - axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); + axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X); + axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y); btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); commit 17f94b5f0f69988058c606ab92d12d394ac6fa5f Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 11:41:11 2010 +1000 Require xserver 1.9 Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index 671ebc5..ed755c2 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ inputdir=${moduledir}/input AC_SUBST(inputdir) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/void.c b/src/void.c index f55110a..d94ce15 100644 --- a/src/void.c +++ b/src/void.c @@ -43,91 +43,14 @@ #include <xf86Module.h> -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <X11/Xatom.h> #include <xserver-properties.h> -#endif #define MAXBUTTONS 3 /****************************************************************************** * Function/Macro keys variables *****************************************************************************/ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 -static KeySym void_map[] = -{ - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - XK_BackSpace, XK_Tab, XK_Linefeed, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, XK_Escape, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - XK_space, XK_exclam, XK_quotedbl, XK_numbersign, - XK_dollar, XK_percent, XK_ampersand, XK_apostrophe, - XK_parenleft, XK_parenright, XK_asterisk, XK_plus, - XK_comma, XK_minus, XK_period, XK_slash, - XK_0, XK_1, XK_2, XK_3, - XK_4, XK_5, XK_6, XK_7, - XK_8, XK_9, XK_colon, XK_semicolon, - XK_less, XK_equal, XK_greater, XK_question, - XK_at, XK_A, XK_B, XK_C, - XK_D, XK_E, XK_F, XK_G, - XK_H, XK_I, XK_J, XK_K, - XK_L, XK_M, XK_N, XK_O, - XK_P, XK_Q, XK_R, XK_S, - XK_T, XK_U, XK_V, XK_W, - XK_X, XK_Y, XK_Z, XK_bracketleft, - XK_backslash, XK_bracketright,XK_asciicircum, XK_underscore, - XK_grave, XK_a, XK_b, XK_c, - XK_d, XK_e, XK_f, XK_g, - XK_h, XK_i, XK_j, XK_k, - XK_l, XK_m, XK_n, XK_o, - XK_p, XK_q, XK_r, XK_s, - XK_t, XK_u, XK_v, XK_w, - XK_x, XK_y, XK_z, XK_braceleft, - XK_bar, XK_braceright, XK_asciitilde, XK_BackSpace, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - XK_nobreakspace,XK_exclamdown, XK_cent, XK_sterling, - XK_currency, XK_yen, XK_brokenbar, XK_section, - XK_diaeresis, XK_copyright, XK_ordfeminine, XK_guillemotleft, - XK_notsign, XK_hyphen, XK_registered, XK_macron, - XK_degree, XK_plusminus, XK_twosuperior, XK_threesuperior, - XK_acute, XK_mu, XK_paragraph, XK_periodcentered, - XK_cedilla, XK_onesuperior, XK_masculine, XK_guillemotright, - XK_onequarter, XK_onehalf, XK_threequarters,XK_questiondown, - XK_Agrave, XK_Aacute, XK_Acircumflex, XK_Atilde, - XK_Adiaeresis, XK_Aring, XK_AE, XK_Ccedilla, - XK_Egrave, XK_Eacute, XK_Ecircumflex, XK_Ediaeresis, - XK_Igrave, XK_Iacute, XK_Icircumflex, XK_Idiaeresis, - XK_ETH, XK_Ntilde, XK_Ograve, XK_Oacute, - XK_Ocircumflex, XK_Otilde, XK_Odiaeresis, XK_multiply, - XK_Ooblique, XK_Ugrave, XK_Uacute, XK_Ucircumflex, - XK_Udiaeresis, XK_Yacute, XK_THORN, XK_ssharp, - XK_agrave, XK_aacute, XK_acircumflex, XK_atilde, - XK_adiaeresis, XK_aring, XK_ae, XK_ccedilla, - XK_egrave, XK_eacute, XK_ecircumflex, XK_ediaeresis, - XK_igrave, XK_iacute, XK_icircumflex, XK_idiaeresis, - XK_eth, XK_ntilde, XK_ograve, XK_oacute, - XK_ocircumflex, XK_otilde, XK_odiaeresis, XK_division, - XK_oslash, XK_ugrave, XK_uacute, XK_ucircumflex, - XK_udiaeresis, XK_yacute, XK_thorn, XK_ydiaeresis -}; - -/* minKeyCode = 8 because this is the min legal key code */ -static KeySymsRec void_keysyms = { - /* map minKeyCode maxKeyCode width */ - void_map, 8, 255, 1 -}; -#endif /* GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 */ static const char *DEFAULTS[] = { NULL @@ -171,7 +94,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what) unsigned char map[MAXBUTTONS + 1]; int i; Bool result; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom btn_labels[MAXBUTTONS] = {0}; Atom axes_labels[2] = {0}; @@ -181,7 +103,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what) btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); -#endif pInfo = device->public.devicePrivate; @@ -196,50 +117,34 @@ xf86VoidControlProc(DeviceIntPtr device, int what) if (InitButtonClassDeviceStruct(device, MAXBUTTONS, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 btn_labels, -#endif map) == FALSE) { ErrorF("unable to allocate Button class device\n"); return !Success; } -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 result = InitKeyboardDeviceStruct(device, NULL, BellProc, KeyControlProc); -#else - result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, - NULL, BellProc, KeyControlProc); -#endif if (!result) { ErrorF("unable to init keyboard device\n"); return !Success; } - if (InitValuatorClassDeviceStruct(device, + if (InitValuatorClassDeviceStruct(device, 2, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels, -#endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - xf86GetMotionEvents, -#endif 0, Absolute) == FALSE) { InitValuatorAxisStruct(device, 0, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], -#endif 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ 1); /* max_res */ InitValuatorAxisStruct(device, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], -#endif 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ @@ -303,10 +208,6 @@ xf86VoidInit(InputDriverPtr drv, pInfo->flags = XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; pInfo->device_control = xf86VoidControlProc; pInfo->read_input = NULL; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - pInfo->motion_history_proc = xf86GetMotionEvents; - pInfo->history_size = 0; -#endif pInfo->control_proc = NULL; pInfo->close_proc = NULL; pInfo->switch_mode = NULL; commit 93daeb169d177fd245d6ca8469e7c7a6de53647a Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 11:43:37 2010 +1000 unifdef XFree86LOADER Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/void.c b/src/void.c index df973fa..f55110a 100644 --- a/src/void.c +++ b/src/void.c @@ -29,11 +29,6 @@ #include "config.h" #endif -#ifndef XFree86LOADER -#include <unistd.h> -#include <errno.h> -#endif - #include <misc.h> #include <xf86.h> #define NEED_XF86_TYPES 1 @@ -46,9 +41,7 @@ #include <X11/keysym.h> #include <mipointer.h> -#ifdef XFree86LOADER #include <xf86Module.h> -#endif #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <X11/Xatom.h> @@ -352,7 +345,6 @@ _X_EXPORT InputDriverRec VOID = { * *************************************************************************** */ -#ifdef XFree86LOADER /* * xf86VoidUnplug -- * @@ -400,4 +392,3 @@ _X_EXPORT XF86ModuleData voidModuleData = { xf86VoidUnplug }; -#endif /* XFree86LOADER */ commit baf55a08ee006d43f5a2e3d72b10da800ab03afd Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 09:25:57 2010 -0700 xf86-input-void 1.3.1 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index cbf9120..671ebc5 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.60) AC_INIT([xf86-input-void], - 1.3.0, + [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-void) commit 27d39d3c95785a1737bd1669850a7747b7dd7140 Author: Gaetan Nadon <[email protected]> Date: Sat Oct 30 09:24:53 2010 -0700 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 0afc629..cbf9120 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.57) +AC_PREREQ(2.60) AC_INIT([xf86-input-void], 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], commit a78b13f1c5ebf40295ce35a4f80cc4d0e3331f8c Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 09:24:25 2010 -0700 Sun's copyrights now belong to Oracle Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index 5119f69..f6e38b1 100644 --- a/COPYING +++ b/COPYING @@ -38,7 +38,7 @@ ADAM JACKSON 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. -Copyright 2005 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/man/Makefile.am b/man/Makefile.am index 399cc9d..a265155 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -19,7 +19,7 @@ # 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. -# +# drivermandir = $(DRIVER_MAN_DIR) driverman_PRE = @[email protected] commit 0d7e2780cf832d0fdf8bbd419d399511c72ef680 Author: Alan Coopersmith <[email protected]> Date: Wed Oct 27 22:23:03 2010 -0700 Remove refcnt field from InputDriverRec. Wasn't used in the server and is now removed. Fixes compiler error: "void.c", line 340: too many struct/union initializers Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/void.c b/src/void.c index c741d87..df973fa 100644 --- a/src/void.c +++ b/src/void.c @@ -343,7 +343,6 @@ _X_EXPORT InputDriverRec VOID = { xf86VoidInit, /* pre-init */ xf86VoidUninit, /* un-init */ NULL, /* module */ - 0 /* ref count */ }; /* commit c4cfc5891ba13f38fcfaa2d330ff99ea7b61b9b6 Author: Gaetan Nadon <[email protected]> Date: Mon Oct 18 19:58:07 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 74e3f8b..0afc629 100644 --- a/configure.ac +++ b/configure.ac @@ -35,10 +35,10 @@ AM_MAINTAINER_MODE DRIVER_NAME=void AC_SUBST([DRIVER_NAME]) -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# 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.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER([config.h]) diff --git a/man/Makefile.am b/man/Makefile.am index 8f2454b..399cc9d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,34 +22,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 06f0a7da7d848a0079272439fd468204688b053d Author: Alan Coopersmith <[email protected]> Date: Fri Jan 15 14:51:59 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index 6d25ee3..5119f69 100644 --- a/COPYING +++ b/COPYING @@ -40,24 +40,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Copyright 2005 Sun Microsystems, Inc. All rights reserved. -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -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 OPEN GROUP 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. - -Except as contained in this notice, the name of the copyright holders shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from the copyright holders. +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, copy, 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: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +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 AUTHORS OR COPYRIGHT HOLDERS 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. diff --git a/man/Makefile.am b/man/Makefile.am index f0eb29b..8f2454b 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# 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 OPEN GROUP 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. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. +# +# 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, copy, 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: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# 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 AUTHORS OR COPYRIGHT HOLDERS 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. # drivermandir = $(DRIVER_MAN_DIR) commit 4d38e6ba6a100fd3b23507f17525f1e40b9bbacd Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 09:25:05 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index d451f3e..4c278ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src man +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL commit 5dc7270bccce4d84589a4465cd0f3b968799dd12 Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:41:41 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Automake 'foreign' option is specified in configure.ac. Remove from Makefile.am diff --git a/Makefile.am b/Makefile.am index 882733f..d451f3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # 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 .PHONY: ChangeLog INSTALL commit 56efaa1d58487727a50d1756ad856525dde8d46f Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:09:09 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/Makefile.am b/Makefile.am index 8b7c3c7..882733f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index bba71c7..74e3f8b 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_INIT([xf86-input-void], AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 8f89812dd9fef33aa7427e3aabd0897fe8ffcc2f Author: Gaetan Nadon <[email protected]> Date: Mon Oct 26 12:54:20 2009 -0400 Several driver modules do not have a ChangeLog target in Makefile.am #23814 The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD diff --git a/Makefile.am b/Makefile.am index 2c2cd08..8b7c3c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,10 +21,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = ChangeLog - -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index a73a3b1..bba71c7 100644 --- a/configure.ac +++ b/configure.ac @@ -36,15 +36,17 @@ DRIVER_NAME=void AC_SUBST([DRIVER_NAME]) # Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -XORG_DEFAULT_OPTIONS AH_TOP([#include "xorg-server.h"]) commit d229780bcb9461386d01f51bf7f26ca295f24cfb Author: Gaetan Nadon <[email protected]> Date: Thu Oct 22 12:55:26 2009 -0400 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 9730646..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo commit b0622025568e790b00df8ff81205d5fe7d4e5503 Author: Gaetan Nadon <[email protected]> Date: Thu Oct 22 12:34:16 2009 -0400 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/.gitignore b/.gitignore index 2df4a8d..5db219d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,78 @@ -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 *~ +*.[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-void +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# commit f78c894fd1c7645460488cf3ebe5e93eb5f73c9d Author: Gaetan Nadon <[email protected]> Date: Sun Sep 27 16:30:48 2009 -0400 Makefile.am: do not include autogen.sh in distribution #24183 This is a private build script that should not be distributed diff --git a/Makefile.am b/Makefile.am index 061da14..2c2cd08 100644 --- a/Makefile.am -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
