release 2.11.1

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -0,0 +1,65 @@
+name: 🐞 Bug report
+description: Create a report to help us improve
+
+labels: [bug, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to help everyone identify and fix the bug. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: dropdown
+    id: affected-version
+    attributes:
+      label: Select the version
+      options:
+        - 2.11.0.1
+        - Git master branch
+        - other or don't know
+      default: 1
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe your issue
+      placeholder: When I did X then Y happened.
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      placeholder: |
+        1. Start ...
+        2. Do this
+        3. Do that
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: What did you expect?
+      placeholder: I expected this to happen.
+  - type: textarea
+    id: environment
+    attributes:
+      label: Additional Information
+      description: |
+        Additional information you want to provide such as logs, system info, environment, screenshots, etc.
+      placeholder: |
+        Add any other context about the bug here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-evdev/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting this issue! We will get back to you as soon as possible.

.github/ISSUE_TEMPLATE/02-feature-request.yml

@@ -0,0 +1,49 @@
+name: ✨ Feature request
+description: Suggest a feature for this software
+labels: [enhancement, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to properly describe the new software feature you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: "Describe the feature"
+      placeholder: A thing in X that allows to do Y.
+    validations:
+      required: true
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "It should be done because"
+      placeholder: Doing Y is needed for Z.
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: "What are the alternatives?"
+      placeholder: We could do A or B instead.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Additional information you want to provide such as references to related issues or protocols, the implications on existing use cases, etc.
+      placeholder: |
+        Add any other context about the feature request here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-evdev/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your suggestion! Let's see together if it can be done.

.github/ISSUE_TEMPLATE/03-code-cleanup.yml

@@ -0,0 +1,49 @@
+name: 🔧 Code cleanup
+description: Level up the source code
+labels: [code-cleanup, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to properly describe the code cleanup you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: "Describe the cleanup"
+      placeholder: C in X needs to be changed into D.
+    validations:
+      required: true
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "It should be done because"
+      placeholder: Having D is needed for E.
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: "What are the alternatives?"
+      placeholder: We could do A or B instead.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Additional information you want to provide such as implications on existing code, how to ensure API/ABI stability, which tests are needed or to be run, related issues, etc.
+      placeholder: |
+        Add any other context about the cleanup here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-evdev/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for looking at the source code! Let's see together how it can be improved.

.github/ISSUE_TEMPLATE/04-doc-update.yml

@@ -0,0 +1,38 @@
+name: 🔖 Documentation update
+description: Make your mark for better documentation
+
+labels: [documentation, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to help others understand our software. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the update
+      placeholder: These things need to be better documented.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Additional Information
+      description: Additional information you want to provide such as tickets related to changes in the software, affected files, screenshots, etc.
+      placeholder: |
+        Add any other context about the update here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-evdev/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for requesting this update! We will get back to you as soon as possible.

.github/ISSUE_TEMPLATE/05-org-task.yml

@@ -0,0 +1,43 @@
+name: ✅ Organizational task
+description: Create a task for project organization
+
+labels: [needs-triage, organization]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to get organizational things done. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the task
+      placeholder: These things need to be done.
+    validations:
+      required: true
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "It should be done because"
+      placeholder: Doing Y is needed for Z.
+  - type: textarea
+    id: environment
+    attributes:
+      label: Additional Information
+      description: Additional information you want to provide such as the context for bigger tasks, the implicatons on existing workflows, related issues, etc.
+      placeholder: |
+        Add any other context about the task here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-evdev/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for adding this task! We will get back to you as soon as possible.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: XLibre Community Support
+    url: https://github.com/orgs/X11Libre/discussions
+    about: Please ask and answer questions here.
+  - name: Mailing List
+    url: https://www.freelists.org/list/xlibre
+    about: You can join the discussions on our mailing list.

.github/actions/build-driver/action.yaml

@@ -0,0 +1,69 @@
+name: 'build driver'
+description: 'build driver against specific Xserver'
+inputs:
+  xserver-version:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: check out driver repo
+      uses: actions/checkout@v4
+
+    - name: prepare build environment
+      shell: bash
+      run: |
+        MACHINE=`gcc -dumpmachine`
+        echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
+        echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
+        sudo chown root /bin/tar && sudo chmod u+s /bin/tar
+
+    - name: apt cache
+      uses: actions/cache@v4
+      with:
+        path: /var/cache/apt
+        key: apt-cache-${{ hashFiles('.github/scripts/ubuntu/install-pkg.sh') }}
+        restore-keys: apt-cache-
+
+    - name: pkg install
+      shell: bash
+      run:  sudo .github/scripts/ubuntu/install-pkg.sh
+
+    - name: X11 prereq cache
+      uses: actions/cache@v4
+      with:
+        path: |
+            ${{ env.X11_PREFIX }}
+        key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
+        restore-keys: ${{ runner.name }}-x11-deps-
+
+    - name: generic prereq
+      shell: bash
+      run:  .github/scripts/install-prereq.sh
+
+    - name: check out xserver repo
+      uses: actions/checkout@v4
+      with:
+        repository: X11Libre/xserver
+        path: xserver-sdk
+        ref: ${{ inputs.xserver-version }}
+
+    - name: build xserver sdk
+      shell: bash
+      env:
+        MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dnamespace=false -Dxselinux=false -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Ddocs=false
+      run:  |
+        cd xserver-sdk
+        echo -n > .meson_environment
+        echo "export MESON_BUILDDIR=$MESON_BUILDDIR" >> .meson_environment
+        echo "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> .meson_environment
+        .gitlab-ci/meson-build.sh --skip-test
+        sudo meson install --no-rebuild -C "$MESON_BUILDDIR"
+        sudo mkdir -p /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
+        sudo chown -R runner /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
+
+    - name: compile driver
+      shell: bash
+      run: |
+        CFLAGS="-Wall" ./autogen.sh # --prefix=$X11_PREFIX
+        CFLAGS="-Wall" make -j # install

.github/scripts/conf.sh

@@ -0,0 +1,13 @@
+export X11_OS=`uname -s`
+
+export X11_PREFIX="${X11_PREFIX:-$HOME/x11}"
+export X11_BUILD_DIR="${X11_BUILD_DIR:-$HOME/build-deps}"
+export DRV_BUILD_DIR="${DRV_BUILD_DIR:-$HOME/build-drivers}"
+
+case "$X11_OS" in
+Darwin) export FDO_CI_CONCURRENT=`sysctl -n hw.logicalcpu` ;;
+Linux) export FDO_CI_CONCURRENT=`nproc` ;;
+esac
+
+export PATH="$X11_PREFIX/bin:$PATH"
+export PKG_CONFIG_PATH="$X11_PREFIX/lib/x86_64-linux-gnu/pkgconfig:$X11_PREFIX/lib/pkgconfig:$X11_PREFIX/share/pkgconfig:$PKG_CONFIG_PATH"

.github/scripts/github/make-release

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+err() {
+    echo "$0: $*"
+}
+
+[ "$GITHUB_REPOSITORY" ] || err "missing variable GITHUB_REPOSITORY"
+
+TITLE=$(git tag -l --format='%(contents)' $tag)
+
+echo "tag=$tag"
+echo "title=$TITLE"
+
+gh release create "$tag" \
+        --repo="$GITHUB_REPOSITORY" \
+        --title="$tag" \
+        --generate-notes

.github/scripts/install-prereq.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+. .github/scripts/util.sh
+
+mkdir -p $X11_BUILD_DIR
+cd $X11_BUILD_DIR
+
+if [ "$X11_OS" = "Linux" ]; then
+build_meson   drm               https://gitlab.freedesktop.org/mesa/drm                  libdrm-2.4.121   "" \
+    -Domap=enabled
+fi
+build_meson   libxcvt           https://gitlab.freedesktop.org/xorg/lib/libxcvt          libxcvt-0.1.0
+build_ac      xorgproto         https://gitlab.freedesktop.org/xorg/proto/xorgproto      xorgproto-2024.1

.github/scripts/ubuntu/install-pkg.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+set -e
+
+# Packages which are needed by this script, but not for the xserver build
+EPHEMERAL="
+	libexpat-dev
+	libgles2-mesa-dev
+	libxkbcommon-dev
+	x11-utils
+	x11-xserver-utils
+	xauth
+	xvfb
+"
+
+apt-get update
+
+apt-get install -y \
+	$EPHEMERAL \
+	autoconf \
+	automake \
+	build-essential \
+	ca-certificates \
+	libaudit-dev \
+	libbsd-dev \
+	libcairo2-dev \
+	libdbus-1-dev \
+	libdrm-dev \
+	libegl1-mesa-dev \
+	libepoxy-dev \
+	libevdev2 \
+	libexpat1 \
+	libffi-dev \
+	libgbm-dev \
+	libgcrypt-dev \
+	libgl1-mesa-dev \
+	libgles2 \
+	libglx-mesa0 \
+	libinput10 \
+	libinput-dev \
+	libnvidia-egl-wayland-dev \
+	libpciaccess-dev \
+	libpixman-1-dev \
+	libspice-protocol-dev \
+	libsystemd-dev \
+	libudev-dev \
+	libunwind-dev \
+	libx11-dev \
+	libx11-xcb-dev \
+	libxau-dev \
+	libxaw7-dev \
+	libxcb-glx0-dev \
+	libxcb-icccm4-dev \
+	libxcb-image0-dev \
+	libxcb-keysyms1-dev \
+	libxcb-randr0-dev \
+	libxcb-render-util0-dev \
+	libxcb-render0-dev \
+	libxcb-shape0-dev \
+	libxcb-shm0-dev \
+	libxcb-util0-dev \
+	libxcb-xf86dri0-dev \
+	libxcb-xkb-dev \
+	libxcb-xv0-dev \
+	libxcb1-dev \
+	libxdmcp-dev \
+	libxext-dev \
+	libxfixes-dev \
+	libxfont-dev \
+	libxi-dev \
+	libxinerama-dev \
+	libxkbcommon0 \
+	libxkbfile-dev \
+	libxmu-dev \
+	libxmuu-dev \
+	libxpm-dev \
+	libxrender-dev \
+	libxres-dev \
+	libxshmfence-dev \
+	libxt-dev \
+	libxtst-dev \
+	libxv-dev \
+	mesa-common-dev \
+	meson \
+	nettle-dev \
+	libpango1.0-dev \
+	pkg-config \
+	x11-xkb-utils \
+	xfonts-utils \
+	xkb-data \
+	xtrans-dev \
+	xutils-dev \
+	libxaw7-dev \
+	python3-mako

.github/scripts/util.sh

@@ -0,0 +1,85 @@
+
+. .github/scripts/conf.sh
+
+clone_source() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+
+    if [ ! -f $pkgname/.git/config ]; then
+        echo "need to clone $pkgname"
+        if [ "$commit" ]; then
+            git clone $url $pkgname --branch=$ref
+        else
+            git clone $url $pkgname --branch=$ref --depth 1
+        fi
+    else
+        echo "already cloned $pkgname"
+    fi
+
+    if [ "$commit" ]; then
+        ( cd $pkgname && git checkout -f "$commit" )
+    fi
+}
+
+build_meson() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+    shift
+    shift
+    shift
+    shift || true
+    if [ -f $X11_PREFIX/$pkgname.DONE ]; then
+        echo "package $pkgname already built"
+    else
+        clone_source "$pkgname" "$url" "$ref" "$commit"
+        (
+            cd $pkgname
+            meson "$@" build -Dprefix=$X11_PREFIX
+            ninja -j${FDO_CI_CONCURRENT:-4} -C build install
+        )
+        touch $X11_PREFIX/$pkgname.DONE
+    fi
+}
+
+build_ac() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+    shift
+    shift
+    shift
+    shift || true
+    if [ -f $X11_PREFIX/$pkgname.DONE ]; then
+        echo "package $pkgname already built"
+    else
+        clone_source "$pkgname" "$url" "$ref" "$commit"
+        (
+            cd $pkgname
+            ./autogen.sh --prefix=$X11_PREFIX
+            make -j${FDO_CI_CONCURRENT:-4} install
+        )
+        touch $X11_PREFIX/$pkgname.DONE
+    fi
+}
+
+build_drv_ac() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+    shift
+    shift
+    shift
+    shift || true
+    clone_source "$pkgname" "$url" "$ref" "$commit"
+    (
+        cd $pkgname
+        ./autogen.sh # --prefix=$X11_PREFIX
+        make -j${FDO_CI_CONCURRENT:-4} # install
+    )
+}

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+name: Build driver
+
+permissions:
+    contents: write
+
+env:
+    MESON_BUILDDIR:  "build"
+    X11_PREFIX:      /home/runner/x11
+    X11_BUILD_DIR:   /home/runner/build-deps
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    for-xserver-stable-25_0:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: ./.github/actions/build-driver
+              with:
+                  xserver-version: xlibre-xserver-25.0.0.5
+
+    for-xserver-master:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: ./.github/actions/build-driver
+              with:
+                  xserver-version: master
+
+    release:
+        name: Release pushed tag
+        runs-on: ubuntu-latest
+        if: ${{ startsWith(github.ref, 'refs/tags/xlibre-') }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Create release
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  tag: ${{ github.ref_name }}
+              run: .github/scripts/github/make-release

Makefile.am

@@ -19,8 +19,10 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-# Provide an sdk location that is writable by the evdev module
-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
+# During distcheck, system locations (as provided by pkg-config) may
+# not be writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = --with-xorg-module-dir='$${libdir}/xorg/modules' \
+                            --with-sdkdir='$${includedir}/xorg'
 
 SUBDIRS = src man include
 MAINTAINERCLEANFILES = ChangeLog INSTALL

configure.ac

@@ -22,10 +22,10 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xf86-input-evdev],
-        [2.11.0],
-        [https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/issues],
-        [xf86-input-evdev])
+AC_INIT([xlibre-xf86-input-evdev],
+        [2.11.1],
+        [https://github.com/X11Libre/xf86-input-evdev/issues],
+        [xlibre-xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -51,11 +51,12 @@ PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
 PKG_CHECK_MODULES(MTDEV, mtdev)
 
 # Define a configure option for an alternate input module directory
+PKG_PROG_PKG_CONFIG([0.25])
 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]),
             [moduledir="$withval"],
-            [moduledir="$libdir/xorg/modules"])
+            [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 

src/emuWheel.c

@@ -210,9 +210,7 @@ EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
 	    ((up_button > 0) && (up_button <= EVDEV_MAXBUTTONS)) &&
 	    ((down_button > 0) && (down_button <= EVDEV_MAXBUTTONS))) {
 
-	    /* Use xstrdup to allocate a string for us */
-	    msg = xstrdup("buttons XX and YY");
-
+	    msg = strdup("buttons XX and YY");
 	    if (msg)
 		sprintf(msg, "buttons %d and %d", up_button, down_button);
 

src/evdev.c

@@ -704,12 +704,7 @@ EvdevProcessTouch(InputInfoPtr pInfo)
 static int
 num_slots(EvdevPtr pEvdev)
 {
-    int value;
-
-    if (pEvdev->mtdev)
-        value = pEvdev->mtdev->caps.slot.maximum + 1;
-    else
-        value = libevdev_get_num_slots(pEvdev->dev);
+    int value = pEvdev->mtdev ? pEvdev->mtdev->caps.slot.maximum + 1 : libevdev_get_num_slots(pEvdev->dev);
 
     /* If we don't know how many slots there are, assume at least 10 */
     return value > 1 ? value : 10;