[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/driver/xserver-xorg-input-joystick][upstream-unstable] 14 commits: configure: Drop AM_MAINTAINER_MODE

Title: GitLab

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / driver / xserver-xorg-input-joystick

Commits:

  • 2a35c37b
    by Peter Hutterer at 2017-01-26T11:18:15+10:00 
    configure: Drop AM_MAINTAINER_MODE

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  • 99a2b495
    by Colin Walters at 2017-01-26T11:25:39+10:00 
    autogen.sh: Implement GNOME Build API

http://people.gnome.org/~walters/docs/build-api.txt

Signed-off-by: Adam Jackson <ajax@redhat.com>
  • 73a8c290
    by Peter Hutterer at 2017-01-26T11:25:39+10:00 
    autogen.sh: use exec instead of waiting for configure to finish

Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
  • 6920963c
    by Emil Velikov at 2017-01-26T11:26:20+10:00 
    autogen.sh: use quoted string variables

Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  • e28608c8
    by Mihail Konev at 2017-01-26T14:00:21+10:00 
    autogen: add default patch prefix

Signed-off-by: Mihail Konev <k.mvc@ya.ru>
  • f45c3d0f
    by Manuel Bouyer at 2018-01-08T15:09:06-05:00 
    Adapt to USB HID header changes on NetBSD-8.99.9.

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
  • 463fd02a
    by Alan Coopersmith at 2018-08-16T22:58:22-07:00 
    Fix quoting in man page synopsis section

Fixes: https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick/issues/1

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 64d03c11
    by Alan Coopersmith at 2018-11-18T11:32:37-08:00 
    Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 2d7f96e5
    by Alan Coopersmith at 2018-11-25T12:46:18-08:00 
    Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • aca8dee2
    by Alan Coopersmith at 2022-01-16T10:58:36-08:00 
    Build xz tarballs instead of bzip2

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 758adebe
    by Alan Coopersmith at 2022-01-16T11:01:54-08:00 
    Fix spelling/wording issues

Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 0e37171b
    by Alan Coopersmith at 2022-01-16T11:23:24-08:00 
    gitlab CI: add a basic build test

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 9bb1dbba
    by Alan Coopersmith at 2022-12-08T16:01:29-08:00 
    gitlab CI: stop requiring Signed-off-by in commits

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 8326644a
    by Alan Coopersmith at 2022-12-08T16:03:10-08:00 
    xf86-input-joystick 1.6.4

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

13 changed files:

Changes:

  • .gitlab-ci.yml
    1 
    +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
    2 
    +#
    3 
    +# This CI uses the freedesktop.org ci-templates.
    4 
    +# Please see the ci-templates documentation for details:
    5 
    +# https://freedesktop.pages.freedesktop.org/ci-templates/
    6 
    +
    7 
    +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
    8 
    +
    9 
    +
    10 
    +include:
    11 
    +  # Arch container builder template
    12 
    +  - project: 'freedesktop/ci-templates'
    13 
    +    ref: *template_sha
    14 
    +    file: '/templates/arch.yml'
    15 
    +  - project: 'freedesktop/ci-templates'
    16 
    +    ref: *template_sha
    17 
    +    file: '/templates/ci-fairy.yml'
    18 
    +  - template: Security/SAST.gitlab-ci.yml
    19 
    +
    20 
    +
    21 
    +stages:
    22 
    +  - prep             # prep work like rebuilding the container images if there is a change
    23 
    +  - build            # for actually building and testing things in a container
    24 
    +  - test
    25 
    +  - deploy
    26 
    +
    27 
    +
    28 
    +variables:
    29 
    +  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-input-joystick'
    30 
    +  # The tag should be updated each time the list of packages is updated.
    31 
    +  # Changing a tag forces the associated image to be rebuilt.
    32 
    +  # Note: the tag has no meaning, we use a date format purely for readability
    33 
    +  FDO_DISTRIBUTION_TAG:  '2022-01-16.0'
    34 
    +  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel pixman'
    35 
    +
    36 
    +
    37 
    +#
    38 
    +# Verify that commit messages are as expected
    39 
    +#
    40 
    +check-commits:
    41 
    +  extends:
    42 
    +    - .fdo.ci-fairy
    43 
    +  stage: prep
    44 
    +  script:
    45 
    +    - ci-fairy check-commits --junit-xml=results.xml
    46 
    +  except:
    47 
    +    - master@xorg/driver/xf86-input-joystick
    48 
    +  variables:
    49 
    +    GIT_DEPTH: 100
    50 
    +  artifacts:
    51 
    +    reports:
    52 
    +      junit: results.xml
    53 
    +
    54 
    +#
    55 
    +# Verify that the merge request has the allow-collaboration checkbox ticked
    56 
    +#
    57 
    +check-merge-request:
    58 
    +  extends:
    59 
    +    - .fdo.ci-fairy
    60 
    +  stage: deploy
    61 
    +  script:
    62 
    +    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
    63 
    +  artifacts:
    64 
    +    when: on_failure
    65 
    +    reports:
    66 
    +      junit: results.xml
    67 
    +  allow_failure: true
    68 
    +
    69 
    +
    70 
    +#
    71 
    +# Build a container with the given tag and the packages pre-installed.
    72 
    +# This only happens if the tag changes, otherwise the existing image is
    73 
    +# re-used.
    74 
    +#
    75 
    +container-prep:
    76 
    +  extends:
    77 
    +    - .fdo.container-build@arch
    78 
    +  stage: prep
    79 
    +  variables:
    80 
    +    GIT_STRATEGY: none
    81 
    +
    82 
    +
    83 
    +#
    84 
    +# The default build, runs on the image built above.
    85 
    +#
    86 
    +build:
    87 
    +  stage: build
    88 
    +  extends:
    89 
    +    - .fdo.distribution-image@arch
    90 
    +  script:
    91 
    +    - autoreconf -ivf
    92 
    +    - mkdir _builddir
    93 
    +    - pushd _builddir > /dev/null
    94 
    +    - ../configure --disable-silent-rules
    95 
    +    - make
    96 
    +    - make check
    97 
    +    - make distcheck
    98 
    +    - popd > /dev/null

  • Makefile.am
    ... ... @@ -34,3 +34,5 @@ ChangeLog:
    34 34 
     	$(CHANGELOG_CMD)
    35 35
    36 36 
     dist-hook: ChangeLog INSTALL
    37 
    +
    38 
    +EXTRA_DIST = README.md

  • README deleted
    1 
    -xf86-input-joystick - Joystick input driver for the Xorg X server
    2 
    -
    3 
    -Please submit bugs & patches to the Xorg bugzilla:
    4 
    -
    5 
    -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
    6 
    -
    7 
    -All questions regarding this software should be directed at the
    8 
    -Xorg mailing list:
    9 
    -
    10 
    -        http://lists.freedesktop.org/mailman/listinfo/xorg
    11 
    -
    12 
    -The master development code repository can be found at:
    13 
    -
    14 
    -        git://anongit.freedesktop.org/git/xorg/driver/xf86-input-joystick
    15 
    -
    16 
    -        http://cgit.freedesktop.org/xorg/driver/xf86-input-joystick
    17 
    -
    18 
    -For more information on the git code manager, see:
    19 
    -
    20 
    -        http://wiki.x.org/wiki/GitPage

  • README.md
    1 
    +xf86-input-joystick - Joystick input driver for the Xorg X server
    2 
    +-----------------------------------------------------------------
    3 
    +
    4 
    +All questions regarding this software should be directed at the
    5 
    +Xorg mailing list:
    6 
    +
    7 
    +  https://lists.x.org/mailman/listinfo/xorg
    8 
    +
    9 
    +The primary development code repository can be found at:
    10 
    +
    11 
    +  https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
    12 
    +
    13 
    +Please submit bug reports and requests to merge patches there.
    14 
    +
    15 
    +For patch submission instructions, see:
    16 
    +
    17 
    +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
    18 
    +

  • autogen.sh
    1 1 
     #! /bin/sh
    2 2
    3 
    -srcdir=`dirname $0`
    3 
    +srcdir=`dirname "$0"`
    4 4 
     test -z "$srcdir" && srcdir=.
    5 5
    6 6 
     ORIGDIR=`pwd`
    7 
    -cd $srcdir
    7 
    +cd "$srcdir"
    8 8
    9 9 
     autoreconf -v --install || exit 1
    10 
    -cd $ORIGDIR || exit $?
    10 
    +cd "$ORIGDIR" || exit $?
    11 11
    12 
    -$srcdir/configure --enable-maintainer-mode "$@"
    12 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    13 
    +    git config --local format.subjectPrefix "PATCH xf86-input-joystick"
    14 
    +
    15 
    +if test -z "$NOCONFIGURE"; then
    16 
    +    exec "$srcdir"/configure "$@"
    17 
    +fi

  • configure.ac
    ... ... @@ -23,16 +23,15 @@
    23 23 
     # Initialize Autoconf
    24 24 
     AC_PREREQ([2.60])
    25 25 
     AC_INIT([xf86-input-joystick],
    26 
    -        [1.6.3],
    27 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
    26 
    +        [1.6.4],
    27 
    +        [https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick/-/issues],
    28 28 
             [xf86-input-joystick])
    29 29 
     AC_CONFIG_SRCDIR([Makefile.am])
    30 30 
     AC_CONFIG_HEADERS([config.h])
    31 31 
     AC_CONFIG_AUX_DIR(.)
    32 32
    33 33 
     # Initialize Automake
    34 
    -AM_INIT_AUTOMAKE([foreign dist-bzip2])
    35 
    -AM_MAINTAINER_MODE
    34 
    +AM_INIT_AUTOMAKE([foreign dist-xz])
    36 35
    37 36 
     # Initialize libtool
    38 37 
     AC_DISABLE_STATIC
    ... ... @@ -101,6 +100,7 @@ AC_CHECK_HEADERS([usbhid.h dev/usb/usbhid.h],, [bsd_backend=no],
    101 100 
     #include <dev/usb/usb.h>
    102 101 
     #endif
    103 102 
     ]])
    103 
    +AC_CHECK_HEADERS([dev/hid/hid.h])
    104 104 
     AC_CHECK_LIB([usbhid],[hid_get_item],, [bsd_backend=no])
    105 105 
     AM_CONDITIONAL(BSD_BACKEND, [test "x$bsd_backend" = xyes])
    106 106 
     if test "x$bsd_backend" = xyes; then

  • man/joystick.man
    ... ... @@ -11,7 +11,7 @@ Snipped for xorg.conf.d(5):
    11 11 
     .BI "  Identifier \*q" joystick-all \*q
    12 12 
     .BI "  Driver \*q" joystick \*q
    13 13 
     .BI "  Option \*qMatchIsJoystick\*q   \*q" on \*q
    14 
    -.BI "  Option \*qMatchDevicePath \*q" /dev/input/event* \*q
    14 
    +.BI "  Option \*qMatchDevicePath\*q   \*q" /dev/input/event* \*q
    15 15 
     \ \ ...
    16 16 
     .B EndSection
    17 17 
     .fi
    ... ... @@ -380,7 +380,7 @@ You might also want to set the device "floating" to stop it from reporting core
    380 380 
     .SH "NOTES"
    381 381 
     It is not recommended to enable the
    382 382 
     .B joystick
    383 
    -input driver by default unless explicitely requested by the user.
    383 
    +input driver by default unless explicitly requested by the user.
    384 384
    385 385 
     Configuration through
    386 386 
     .I InputClass

  • src/backend_bsd.c
    ... ... @@ -44,6 +44,9 @@
    44 44 
     #include <usbhid.h>
    45 45 
     #include <dev/usb/usb.h>
    46 46 
     #include <dev/usb/usbhid.h>
    47 
    +#ifdef HAVE_DEV_HID_HID_H
    48 
    +    #include <dev/hid/hid.h>
    49 
    +#endif
    47 50 
     #ifdef HAVE_DEV_USB_USB_IOCTL_H
    48 51 
         #include <dev/usb/usb_ioctl.h>
    49 52 
     #endif
    ... ... @@ -227,7 +230,7 @@ jstkCloseDevice_bsd(JoystickDevPtr joystick)
    227 230 
      *
    228 231 
      * Reads data from fd and stores it in the JoystickDevRec struct
    229 232 
      * fills in the type of event and the number of the button/axis
    230 
    - * return 1 if success, 0 otherwise. Success does not neccessarily
    233 
    + * return 1 if success, 0 otherwise. Success does not necessarily
    231 234 
      * mean that there is a new event waiting.
    232 235 
      *
    233 236 
      ***********************************************************************

  • src/backend_evdev.c
    ... ... @@ -226,7 +226,7 @@ jstkCloseDevice_evdev(JoystickDevPtr joystick)
    226 226 
      *
    227 227 
      * Reads data from fd and stores it in the JoystickDevRec struct
    228 228 
      * fills in the type of event and the number of the button/axis
    229 
    - * return 1 if success, 0 otherwise. Success does not neccessarily
    229 
    + * return 1 if success, 0 otherwise. Success does not necessarily
    230 230 
      * mean that there is a new event waiting.
    231 231 
      *
    232 232 
      ***********************************************************************

  • src/backend_joystick.c
    ... ... @@ -139,7 +139,7 @@ jstkOpenDevice_joystick(JoystickDevPtr joystick, Bool probe)
    139 139 
      *
    140 140 
      * Reads data from fd and stores it in the JoystickDevRec struct
    141 141 
      * fills in the type of event and the number of the button/axis
    142 
    - * return 1 if success, 0 otherwise. Success does not neccessarily
    142 
    + * return 1 if success, 0 otherwise. Success does not necessarily
    143 143 
      * mean that there is a new event waiting.
    144 144 
      *
    145 145 
      ***********************************************************************

  • src/jstk.h
    ... ... @@ -107,7 +107,7 @@ typedef struct _JoystickDevRec {
    107 107 
         jstkOpenDeviceProc open_proc; /* Call for re-open backend */
    108 108 
         jstkCloseDeviceProc close_proc; /* Callback for closing the backend */
    109 109 
         jstkReadDataProc read_proc; /* Callback for reading data from the backend */
    110 
    -    void         *devicedata; /* Extra platform device dependend data */
    110 
    +    void         *devicedata; /* Extra platform device dependent data */
    111 111 
         char         *device;     /* Name of the device */
    112 112 
         InputInfoPtr joystick_device; /* Back pointer to the joystick device */
    113 113 
         InputInfoPtr keyboard_device; /* Slave device for keyboard events */

  • src/jstk_axis.c
    ... ... @@ -125,7 +125,7 @@ jstkAxisTimer(OsTimerPtr timer,
    125 125 
     	     *
    126 126 
     	     *   a >>= 1.414
    127 127 
     	     *
    128 
    -	     * the following formula achieves results inbetween,
    128 
    +	     * the following formula achieves results in between,
    129 129 
     	     * so it should feel natural on both devices while maintaining a
    130 130 
     	     * nice acceleration:
    131 131 
     	     *

  • src/jstk_options.c
    ... ... @@ -78,7 +78,7 @@ jstkGetAxisMapping(float *value, const char* param, const char* name)
    78 78 
      *
    79 79 
      * jstkParseButtonOption --
    80 80 
      *
    81 
    - * Interpretes one ButtonMappingX option, given in 'org'
    81 
    + * Interprets one ButtonMappingX option, given in 'org'
    82 82 
      * stores the result in *button
    83 83 
      * name is the name of the InputDevice
    84 84 
      *
    ... ... @@ -163,7 +163,7 @@ jstkParseButtonOption(const char* org,
    163 163 
      *
    164 164 
      * jstkParseAxisOption --
    165 165 
      *
    166 
    - * Interpretes one AxisMappingX option, given in 'org'
    166 
    + * Interprets one AxisMappingX option, given in 'org'
    167 167 
      * stores the result in *axis
    168 168 
      * name is the name of the InputDevice
    169 169 
      *

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: