release 25.0.0

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

.gitlab-ci.yml

@@ -1,106 +0,0 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
-#
-# This CI uses the freedesktop.org ci-templates.
-# Please see the ci-templates documentation for details:
-# https://freedesktop.pages.freedesktop.org/ci-templates/
-
-.templates_sha: &template_sha 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-
-include:
-  # Arch container builder template
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/arch.yml'
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/ci-fairy.yml'
-  - template: Security/SAST.gitlab-ci.yml
-
-
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    - if: $CI_COMMIT_BRANCH
-
-
-stages:
-  - prep             # prep work like rebuilding the container images if there is a change
-  - build            # for actually building and testing things in a container
-  - test
-  - deploy
-
-
-variables:
-  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-input-evdev'
-  # 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:  '2023-10-01.0'
-  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto xorg-server-devel pixman systemd-libs libevdev mtdev'
-
-
-#
-# Verify that commit messages are as expected
-#
-check-commits:
-  extends:
-    - .fdo.ci-fairy
-  stage: prep
-  script:
-    - ci-fairy check-commits --junit-xml=results.xml
-  except:
-    - master@xorg/driver/xf86-input-evdev
-  variables:
-    GIT_DEPTH: 100
-  artifacts:
-    reports:
-      junit: results.xml
-
-#
-# Verify that the merge request has the allow-collaboration checkbox ticked
-#
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: deploy
-  script:
-    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-  artifacts:
-    when: on_failure
-    reports:
-      junit: results.xml
-  allow_failure: true
-
-
-#
-# Build a container with the given tag and the packages pre-installed.
-# This only happens if the tag changes, otherwise the existing image is
-# re-used.
-#
-container-prep:
-  extends:
-    - .fdo.container-build@arch
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-
-
-#
-# The default build, runs on the image built above.
-#
-build:
-  stage: build
-  extends:
-    - .fdo.distribution-image@arch
-  script:
-    - autoreconf -ivf
-    - mkdir _builddir
-    - pushd _builddir > /dev/null
-    - ../configure --disable-silent-rules
-    - make
-    - make check
-    - make distcheck
-    - popd > /dev/null

Makefile.am

@@ -27,9 +27,6 @@ DISTCHECK_CONFIGURE_FLAGS = --with-xorg-module-dir='$${libdir}/xorg/modules' \
 SUBDIRS = src man include
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xorg-evdev.pc
-
 dist_xorgconf_DATA = 10-evdev.conf
 
 .PHONY: ChangeLog INSTALL

README.md

@@ -1,18 +1,8 @@
-xf86-input-evdev - Generic Linux input driver for the Xorg X server
--------------------------------------------------------------------
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-  https://lists.x.org/mailman/listinfo/xorg
+xf86-input-evdev - Generic Linux input driver for the XLibre X server
+---------------------------------------------------------------------
 
 The primary development code repository can be found at:
 
-  https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
+  https://github.com/X11Libre/xf86-input-evdev
 
 Please submit bug reports and requests to merge patches there.
-
-For patch submission instructions, see:
-
-  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-

configure.ac

@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xlibre-xf86-input-evdev],
-        [2.11.1],
+        [25.0.0],
         [https://github.com/X11Libre/xf86-input-evdev/issues],
         [xlibre-xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -76,12 +76,5 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
 AC_SUBST([sdkdir])
 
-DRIVER_NAME=evdev
-AC_SUBST([DRIVER_NAME])
-
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 man/Makefile
-                 include/Makefile
-                 xorg-evdev.pc])
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile include/Makefile])
 AC_OUTPUT

man/Makefile.am

@@ -22,11 +22,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = $(DRIVER_NAME).man
+driverman_PRE = evdev.man
 
 driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
 
-EXTRA_DIST = $(DRIVER_NAME).man
+EXTRA_DIST = evdev.man
 
 CLEANFILES = $(driverman_DATA)
 

man/evdev.man

@@ -2,7 +2,7 @@
 .ds q \N'34'
 .TH EVDEV __drivermansuffix__ 2016-11-17 __vendorversion__
 .SH NAME
-evdev \- Generic Linux input driver for Xorg
+evdev \- Generic Linux input driver for XLibre
 .SH SYNOPSIS
 .nf
 .B "Section \*qInputDevice\*q"
@@ -17,7 +17,7 @@ evdev \- Generic Linux input driver for Xorg
 .fi
 .SH DESCRIPTION
 .B evdev
-is an Xorg input driver for Linux\'s generic event devices.
+is an XLibre input driver for Linux\'s generic event devices.
 It therefore supports all input devices that the kernel knows about,
 including most mice, keyboards, tablets, and touchscreens.
 .B evdev
@@ -363,7 +363,7 @@ Value range 0-32, 0 disables a value.
 .SH AUTHORS
 Kristian Høgsberg, Peter Hutterer
 .SH "SEE ALSO"
-.BR Xorg (__appmansuffix__),
+.BR XLibre (__appmansuffix__),
 .BR xorg.conf (__filemansuffix__),
 .BR Xserver (__appmansuffix__),
 .BR X (__miscmansuffix__)

src/Makefile.am

@@ -28,17 +28,16 @@
 AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
 AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBEVDEV_CFLAGS)
 
-@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS)
-@DRIVER_NAME@_drv_ladir = @inputdir@
+evdev_drv_la_LTLIBRARIES = evdev_drv.la
+evdev_drv_la_LDFLAGS = -module -avoid-version
+evdev_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS)
+evdev_drv_ladir = @inputdir@
 
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
-                               @DRIVER_NAME@.h \
+evdev_drv_la_SOURCES = evdev.c \
+                               evdev.h \
                                emuMB.c \
                                emuThird.c \
                                emuWheel.c \
                                draglock.c \
                                apple.c \
                                axis_labels.h
-

src/apple.c

@@ -24,9 +24,7 @@
  *	Peter Hutterer (peter.hutterer@redhat.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <evdev.h>
 #include <evdev-properties.h>

src/axis_labels.h

@@ -21,9 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xserver-properties.h>
 

src/draglock.c

@@ -32,9 +32,7 @@
 
 /* Draglock code */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "evdev.h"
 
 #include <xf86.h>

src/emuMB.c

@@ -30,10 +30,7 @@
 
 /* Middle mouse button emulation code. */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 #include "evdev.h"
 
 #include <X11/Xatom.h>

src/emuThird.c

@@ -29,10 +29,7 @@
  * generated.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 #include "evdev.h"
 
 #include <X11/Xatom.h>

src/emuWheel.c

@@ -30,9 +30,7 @@
 */
 
 /* Mouse wheel emulation code. */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "evdev.h"
 
 #include <X11/Xatom.h>

src/evdev.c

@@ -28,10 +28,7 @@
  *	Thomas H.P. Andersen (phomes@gmail.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 #include "evdev.h"
 #include "axis_labels.h"
 

src/evdev.h

@@ -28,9 +28,7 @@
  *	Oliver McFadden (oliver.mcfadden@nokia.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifndef EVDEV_H
 #define EVDEV_H

xorg-evdev.pc.in

@@ -1,6 +0,0 @@
-sdkdir=@sdkdir@
-
-Name: xorg-evdev
-Description: X.Org evdev input driver.
-Version: @PACKAGE_VERSION@
-Cflags: -I${sdkdir}