[Git][xorg-team/driver/xserver-xorg-input-keyboard][upstream-unstable] 13 commits: gitlab CI: stop requiring Signed-off-by in commits
"Samuel Thibault (@sthibault)" <[email protected]>
| Newsgroups | gmane.linux.debian.devel.x |
|---|---|
| Message-ID | <[email protected]> |
Samuel Thibault pushed to branch upstream-unstable at X Strike Force / driver / xserver-xorg-input-keyboard Commits: fd257556 by Alan Coopersmith at 2023-02-09T12:06:54-08:00 gitlab CI: stop requiring Signed-off-by in commits Signed-off-by: Alan Coopersmith <[email protected]> - - - - - 7812c11c by Alan Coopersmith at 2023-02-25T09:06:53-08:00 Remove "All rights reserved" from Oracle copyright notices Oracle no longer includes this term in our copyright & license notices. Signed-off-by: Alan Coopersmith <[email protected]> - - - - - ced00875 by Alan Coopersmith at 2023-12-02T12:03:32-08:00 gitlab CI: update to latest ci-templates & FreeBSD 14.0 Needed to avoid "Failed to unpack image" errors in the container-prep job since FreeBSD 13.0 images are no longer available for download Signed-off-by: Alan Coopersmith <[email protected]> - - - - - f3510885 by Alan Coopersmith at 2023-12-02T20:12:38+00:00 configure.ac: updates to quiet obsolete macro warnings Clears autoconf warnings: configure.ac:38: warning: The macro 'AC_PROG_LIBTOOL' is obsolete. configure.ac:38: You should run autoupdate. aclocal.m4:3465: AC_PROG_LIBTOOL is expanded from... configure.ac:38: the top level configure.ac:51: warning: The macro 'AC_HELP_STRING' is obsolete. configure.ac:51: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... configure.ac:51: the top level Signed-off-by: Alan Coopersmith <[email protected]> - - - - - 40ef7d9e by Alan Coopersmith at 2024-03-18T17:45:30-07:00 sun_kbd.c: #include <sys/kbio.h> directly It's needed for the definitions of the KIO* ioctls used in this file, but is currently being indirectly included via xf86_OSlib.h. Signed-off-by: Alan Coopersmith <[email protected]> - - - - - f92191b9 by Alan Coopersmith at 2024-05-03T12:19:09-07:00 gitlab CI: install xorgproto from git before building the Xserver Xserver git is now failing to build due to: Dependency presentproto found: NO found 1.3 but need: '>= 1.4' Signed-off-by: Alan Coopersmith <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/10> - - - - - e93624c2 by nia at 2024-05-03T19:30:06+00:00 bsd: Add some missing special keys from Japanese keyboards >From Yasushi Oshima. Signed-off-by: Nia Alarie <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/9> - - - - - d6d6a3c8 by Enrico Weigelt, metux IT consult at 2024-05-24T14:09:53+02:00 gitlab CI: install libepoll-shim Since MR #1559, the Xserver needs libepoll-shim on FreeBSD. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/11> - - - - - 5f76f920 by Enrico Weigelt, metux IT consult at 2024-05-24T14:10:00+02:00 gitlab CI: fix FreeBSD build On FreeBSD need to make sure, all pkg-config pathes are searched in the correct order. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/11> - - - - - 3507c281 by Enrico Weigelt, metux IT consult at 2024-05-24T14:10:02+02:00 bump minimal xorg version to 1.18 1.18 was released a decade ago, so it seems reasonable stop supporting older ones. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/11> - - - - - 8f6fd126 by Enrico Weigelt, metux IT consult at 2024-05-24T14:10:02+02:00 drop compat for XINPUT < 18 Relying on xserver >= 1.18, which has XINPUT 22.1. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/11> - - - - - 6c2a8e59 by Alan Coopersmith at 2024-07-14T11:33:37-07:00 Move sizeof to second argument in calloc calls Clears -Wcalloc-transposed-args warnings from gcc 14.1, such as: kbd.c: In function ‘KbdPreInit’: kbd.c:160:32: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 160 | if (!(pKbd = calloc(sizeof(KbdDevRec), 1))) { | ^~~~~~~~~ kbd.c:160:32: note: earlier argument should specify number of elements, later size of each element Signed-off-by: Alan Coopersmith <[email protected]> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/merge_requests/14> - - - - - 15cbd2da by Alan Coopersmith at 2024-11-13T16:36:11-08:00 xf86-input-keyboard 2.1.0 Signed-off-by: Alan Coopersmith <[email protected]> - - - - - 10 changed files: - .gitlab-ci.yml - COPYING - configure.ac - man/Makefile.am - src/bsd_KbdMap.c - src/bsd_kbd.c - src/kbd.c - src/sun_kbd.c - src/sun_kbd.h - src/xf86OSKbd.h Changes: ===================================== .gitlab-ci.yml ===================================== @@ -4,7 +4,7 @@ # Please see the ci-templates documentation for details: # https://freedesktop.pages.freedesktop.org/ci-templates/ -.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 81f66518561308ef294142663198f0890c99d195 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -30,21 +30,21 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2022-01-17.0' - FDO_DISTRIBUTION_VERSION: '13.0' + FDO_DISTRIBUTION_TAG: '2024-05-24.0' + FDO_DISTRIBUTION_VERSION: '14.0' # Packages needed to build enough of xorg-server to build this driver EXTRA_PACKAGES: 'meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto $EXTRA_PACKAGES' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto libepoll-shim $EXTRA_PACKAGES' # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected # check-commits: extends: - .fdo.ci-fairy stage: prep script: - - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + - ci-fairy check-commits --junit-xml=results.xml except: - master@xorg/driver/xf86-input-keyboard variables: @@ -91,6 +91,7 @@ build: - .fdo.distribution-image@freebsd variables: XSERVER_MESON_FLAGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false + PKGCONF_PATH: /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/local/libdata/pkgconfig script: # start the VM. This also sets up ssh/scp to connect to "vm" # correctly. @@ -101,20 +102,26 @@ build: # We don't want any failed commands to exit our script until VM # cleanup has been completed. - set +e - # First we need to build and install the Xorg server to get the SDK headers + # First we need to install the latest xorgproto needed to build Xserver + - | + /app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/proto/xorgproto.git" + /app/vmctl exec "mkdir xorgproto/_builddir" + /app/vmctl exec "cd xorgproto/_builddir && meson setup" + /app/vmctl exec "cd xorgproto/_builddir && ninja install" + # Then we need to build and install the Xorg server to get the SDK headers - | /app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/xserver.git" /app/vmctl exec "mkdir xserver/_builddir" - /app/vmctl exec "cd xserver/_builddir && meson setup $XSERVER_MESON_FLAGS" + /app/vmctl exec "cd xserver/_builddir && env PKG_CONFIG_PATH=$PKGCONF_PATH meson setup $XSERVER_MESON_FLAGS" /app/vmctl exec "cd xserver/_builddir && ninja" /app/vmctl exec "cd xserver/_builddir && ninja install" # Now build this driver - | /app/vmctl exec "mkdir $CI_PROJECT_NAME/_builddir" - /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && ../autogen.sh --disable-silent-rules PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" + /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && ../autogen.sh --disable-silent-rules PKG_CONFIG_PATH=$PKGCONF_PATH" /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && make" /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && make check" - /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig make distcheck" && touch .success + /app/vmctl exec "cd $CI_PROJECT_NAME/_builddir && env PKG_CONFIG_PATH=$PKGCONF_PATH make distcheck" && touch .success # copy any test results from the VM to our container so we can # save them as artifacts # - scp -r vm:$CI_PROJECT_NAME/test-results.xml . ===================================== COPYING ===================================== @@ -171,7 +171,7 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Copyright (c) 2004-2009, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2004-2009, Oracle and/or its affiliates. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), ===================================== configure.ac ===================================== @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-keyboard], - [2.0.0], - [https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/issues], + [2.1.0], + [https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard/-/issues], [xf86-input-keyboard]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -34,8 +34,7 @@ AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([foreign dist-xz]) # Initialize libtool -AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT([disable-static]) # Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -44,12 +43,12 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18] xproto inputproto) # Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, - AC_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), + AS_HELP_STRING([--with-xorg-module-dir=DIR], + [Default xorg module directory [default=$libdir/xorg/modules]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) inputdir=${moduledir}/input ===================================== man/Makefile.am ===================================== @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), ===================================== src/bsd_KbdMap.c ===================================== @@ -581,20 +581,20 @@ static CARD8 wsXtMap[] = { /* 109 */ KEY_NOTUSED, /* 110 */ KEY_NOTUSED, /* 111 */ KEY_NOTUSED, - /* 112 */ KEY_NOTUSED, + /* 112 */ KEY_HKTG, /* 113 */ KEY_NOTUSED, /* 114 */ KEY_NOTUSED, - /* 115 */ KEY_NOTUSED, + /* 115 */ KEY_BSlash2, /* 116 */ KEY_NOTUSED, /* 117 */ KEY_NOTUSED, /* 118 */ KEY_NOTUSED, /* 119 */ KEY_NOTUSED, /* 120 */ KEY_NOTUSED, - /* 121 */ KEY_NOTUSED, + /* 121 */ KEY_XFER, /* 122 */ KEY_NOTUSED, - /* 123 */ KEY_NOTUSED, + /* 123 */ KEY_NFER, /* 124 */ KEY_NOTUSED, - /* 125 */ KEY_NOTUSED, + /* 125 */ KEY_Yen, /* 126 */ KEY_NOTUSED, /* 127 */ KEY_Pause, /* 128 */ KEY_NOTUSED, ===================================== src/bsd_kbd.c ===================================== @@ -507,7 +507,7 @@ xf86OSKbdPreInit(InputInfoPtr pInfo) pKbd->OpenKeyboard = OpenKeyboard; - pKbd->private = calloc(sizeof(BsdKbdPrivRec), 1); + pKbd->private = calloc(1, sizeof(BsdKbdPrivRec)); if (pKbd->private == NULL) { xf86Msg(X_ERROR,"can't allocate keyboard OS private data\n"); return FALSE; ===================================== src/kbd.c ===================================== @@ -157,7 +157,7 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) xf86CollectInputOptions(pInfo, defaults); xf86ProcessCommonOptions(pInfo, pInfo->options); - if (!(pKbd = calloc(sizeof(KbdDevRec), 1))) { + if (!(pKbd = calloc(1, sizeof(KbdDevRec)))) { rc = BadAlloc; goto out; } ===================================== src/sun_kbd.c ===================================== @@ -23,7 +23,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* - * Copyright (c) 2004-2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004-2009, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -59,6 +59,7 @@ #include <sys/stropts.h> #include <sys/vuid_event.h> #include <sys/kbd.h> +#include <sys/kbio.h> #include <sys/note.h> /* needed before including older versions of hid.h */ #include <sys/usb/clients/hid/hid.h> @@ -524,7 +525,7 @@ xf86OSKbdPreInit(InputInfoPtr pInfo) pKbd->OpenKeyboard = OpenKeyboard; - pKbd->private = calloc(sizeof(sunKbdPrivRec), 1); + pKbd->private = calloc(1, sizeof(sunKbdPrivRec)); if (pKbd->private == NULL) { xf86Msg(X_ERROR,"can't allocate keyboard OS private data\n"); return FALSE; ===================================== src/sun_kbd.h ===================================== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), ===================================== src/xf86OSKbd.h ===================================== @@ -29,10 +29,6 @@ #include "xf86Xinput.h" -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18 -#define LogMessageVerbSigSafe xf86MsgVerb -#endif - Bool ATScancode(InputInfoPtr pInfo, int *scanCode); /* Public interface to OS-specific keyboard support. */ View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-input-keyboard/-/compare/c0c98ec2072a78cee53e52b3ec3b03527b276403...15cbd2daff2883bd60c3b14aaebced2849189a50 -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-input-keyboard/-/compare/c0c98ec2072a78cee53e52b3ec3b03527b276403...15cbd2daff2883bd60c3b14aaebced2849189a50 You're receiving this email because of your account on salsa.debian.org.