diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f60e02..8c540b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: ubuntu: strategy: matrix: - xserver-version: [ master, xlibre-xserver-25.1.0, xlibre-xserver-25.0.0.18 ] + xserver-version: [ master, xlibre-xserver-25.1.1, xlibre-xserver-25.0.0.20 ] runs-on: ubuntu-latest steps: - uses: X11Libre/action-build-driver/target/ubuntu@v0.3.8 @@ -19,7 +19,7 @@ jobs: freebsd: strategy: matrix: - xserver-version: [ master, xlibre-xserver-25.1.0, xlibre-xserver-25.0.0.18 ] + xserver-version: [ master, xlibre-xserver-25.1.1, xlibre-xserver-25.0.0.20 ] runs-on: ubuntu-latest steps: - uses: X11Libre/action-build-driver/target/freebsd@v0.3.8 @@ -30,7 +30,7 @@ jobs: strategy: matrix: # xlibre-xserver-25.0.x not compiling on dragonfly yet - xserver-version: [ master, xlibre-xserver-25.1.0 ] + xserver-version: [ master, xlibre-xserver-25.1.1 ] runs-on: ubuntu-latest steps: - uses: X11Libre/action-build-driver/target/dragonfly@v0.3.8 @@ -40,7 +40,7 @@ jobs: netbsd: strategy: matrix: - xserver-version: [ master, xlibre-xserver-25.1.0 ] + xserver-version: [ master, xlibre-xserver-25.1.1 ] runs-on: ubuntu-latest steps: - uses: X11Libre/action-build-driver/target/netbsd@v0.3.8 diff --git a/configure.ac b/configure.ac index 437c17c..81d5e13 100644 --- a/configure.ac +++ b/configure.ac @@ -1,59 +1,9 @@ -# Copyright 2005 Adam Jackson. -# -# 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 -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# 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. -# -# Process this file with autoconf to produce a configure script - -# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xlibre-xf86-input-elographics], [25.0.1], [https://github.com/X11Libre/xf86-input-elographics/issues], [xlibre-xf86-input-elographics]) -AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_AUX_DIR(.) -AC_CONFIG_HEADERS([config.h]) -# Initialize Automake -AM_INIT_AUTOMAKE([dist-xz]) +XLIBRE_INIT_MODULE_AM(elographics) -# 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.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS - -# Initialize libtool -LT_INIT([disable-static]) - -AH_TOP([#include "xorg-server.h"]) - -PKG_PROG_PKG_CONFIG([0.25]) -AC_ARG_WITH(xorg-module-dir, - AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory]), - [moduledir="$withval"], - [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`]) -inputdir=${moduledir}/input -AC_SUBST(inputdir) - -PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0]) - -AC_CONFIG_FILES([Makefile src/Makefile man/Makefile man/elographics.man]) -AC_OUTPUT +AC_OUTPUT([Makefile src/Makefile man/Makefile man/elographics.man]) diff --git a/man/Makefile.am b/man/Makefile.am index ea18177..7e77e8f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,39 +1,12 @@ +# SPDX-License-Identifier: MIT OR X11 # -# 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. +# Copyright © 2026 Enrico Weigelt, metux IT consult # -DRIVER_MAN_SUFFIX = 4 +drvmandir = @xlibre_driver_man_dir@ +drvman_DATA = @xlibre_driver_name@.@xlibre_driver_man_section@ -drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX) -driverman_DATA = elographics.$(DRIVER_MAN_SUFFIX) +CLEANFILES = $(drvman_DATA) -EXTRA_DIST = elographics.man - -CLEANFILES = $(driverman_DATA) - -# SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -.man.$(DRIVER_MAN_SUFFIX): +.man.@xlibre_driver_man_section@: cp $< $@ diff --git a/src/Makefile.am b/src/Makefile.am index 257d114..7c004b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,32 +1,6 @@ -# Copyright 2005 Adam Jackson. -# -# 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 -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# 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. - - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(XLIBRE_SERVER_CFLAGS) elographics_drv_la_LTLIBRARIES = elographics_drv.la elographics_drv_la_LDFLAGS = -module -avoid-version -elographics_drv_ladir = @inputdir@ +elographics_drv_ladir = @xlibre_input_drivers_dir@ elographics_drv_la_SOURCES = elographics.c diff --git a/src/elographics.c b/src/elographics.c index 3a67739..110e1df 100644 --- a/src/elographics.c +++ b/src/elographics.c @@ -1108,7 +1108,9 @@ static XF86ModuleVersionInfo version_rec = { MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, + XLIBRE_MODULE_VERSION_MAJOR, + XLIBRE_MODULE_VERSION_MINOR, + XLIBRE_MODULE_VERSION_PATCH, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT,