Hi Landry, Hi Matthieu, Hi ports@, please find below my final version to move github.com/mherrb/libinput to github.com/sizeofvoid/libopeninput. You may ask why? Let me explain.
Matthieu's libinput is based on my old sizeofvoid/libinput repository which is based on mpi init work. While working on KWin (WM for Plasma) I noticed that libinput moves fast and KWin also needs new API version. I have decided to start with lib(open)input which is forked from the upstream project[1]. The last few days I have to apply all the changes of Matthieu and make it happy with sysutils/libevdev-openbsd and other parts d bring it to 1.24.0 Since I can't currently get Wayland to start on my ThinkPad X1gen10, Landry was so nice and could test it for me. It looks like it works like Matthieu's libinput. I Would like to update libinput to import (unhooked) KDE Plasma. OK? All changes can be tracked in the pull request: https://github.com/sizeofvoid/libopeninput/pull/1 Cheers, Rafael [1]: https://gitlab.freedesktop.org/libinput Index: Makefile =================================================================== RCS file: /cvs/ports/wayland/libinput-openbsd/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile 13 Aug 2023 12:06:29 -0000 1.3 +++ Makefile 4 Sep 2023 13:57:04 -0000 @@ -1,22 +1,34 @@ -COMMENT = OpenBSD port of libinput -DISTNAME = libinput-openbsd-20230714 -REVISION = 1 +COMMENT = wscons(4) and kqueue(2) based port of libinput -SHARED_LIBS = input 0.0 +CATEGORIES = x11 wayland -GH_ACCOUNT = mherrb -GH_PROJECT = libinput -GH_COMMIT = 8d1fa015a90733b9db502bfe2de31f15b1d85b48 +GH_ACCOUNT = sizeofvoid +GH_PROJECT = libopeninput +GH_COMMIT = 1c9a092a5008425797d60697fc76a61378893c09 -CATEGORIES = wayland -HOMEPAGE = https://github.com/sizeofvoid/libinput +V = 1.24.0 +DISTNAME = libinput-openbsd-${V} -# MIT -PERMIT_PACKAGE = Yes +SHARED_LIBS = input 0.0 -post-install: - cd $(WRKSRC) && make includes DESTDIR="" +WANTLIB += epoll-shim m udev -DEBUG_PACKAGES = ${BUILD_PACKAGES} +# BSD +PERMIT_PACKAGE = Yes + +INSTALL_STRIP = + +MODULES = devel/meson \ + lang/python + +LIB_DEPENDS = devel/epoll-shim \ + sysutils/libudev-openbsd + +CONFIGURE_ARGS = -Dlibwacom=false \ + -Ddocumentation=false + +CFLAGS = -O0 -g + +DEBUG_PACKAGES = ${BUILD_PACKAGES} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/wayland/libinput-openbsd/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo 13 Aug 2023 08:44:26 -0000 1.1.1.1 +++ distinfo 4 Sep 2023 13:57:04 -0000 @@ -1,2 +1,2 @@ -SHA256 (libinput-openbsd-20230714-8d1fa015.tar.gz) = 4OlEZzQW2tKAj53qUYNjsMgwvx1+nRTOp8/T7GRnATE= -SIZE (libinput-openbsd-20230714-8d1fa015.tar.gz) = 71542 +SHA256 (libinput-openbsd-1.24.0-1c9a092a.tar.gz) = xsms6gXJCAfNePF8xq58Vdqq5ofgYVLzTKupQzm1nMg= +SIZE (libinput-openbsd-1.24.0-1c9a092a.tar.gz) = 1036737 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/wayland/libinput-openbsd/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 13 Aug 2023 08:44:26 -0000 1.1.1.1 +++ pkg/PLIST 4 Sep 2023 13:57:04 -0000 @@ -1,7 +1,77 @@ include/libinput.h include/linux/ +include/linux/freebsd/ +include/linux/freebsd/input-event-codes.h +include/linux/freebsd/input.h include/linux/input-event-codes.h include/linux/input.h -@static-lib lib/libinput.a +include/linux/linux/ +include/linux/linux/input-event-codes.h +include/linux/linux/input.h @lib lib/libinput.so.${LIBinput_VERSION} lib/pkgconfig/libinput.pc +@man man/man1/libinput-analyze-per-slot-delta.1 +@man man/man1/libinput-analyze-recording.1 +@man man/man1/libinput-analyze-touch-down-state.1 +@man man/man1/libinput-analyze.1 +@man man/man1/libinput-debug-events.1 +@man man/man1/libinput-debug-tablet.1 +@man man/man1/libinput-list-devices.1 +@man man/man1/libinput-list-kernel-devices.1 +@man man/man1/libinput-measure-fuzz.1 +@man man/man1/libinput-measure-touch-size.1 +@man man/man1/libinput-measure-touchpad-pressure.1 +@man man/man1/libinput-measure-touchpad-size.1 +@man man/man1/libinput-measure-touchpad-tap.1 +@man man/man1/libinput-measure.1 +@man man/man1/libinput-quirks-list.1 +@man man/man1/libinput-quirks-validate.1 +@man man/man1/libinput-quirks.1 +@man man/man1/libinput-record.1 +@man man/man1/libinput-replay.1 +@man man/man1/libinput-test.1 +@man man/man1/libinput.1 +share/libinput/ +share/libinput/10-generic-keyboard.quirks +share/libinput/10-generic-mouse.quirks +share/libinput/10-generic-trackball.quirks +share/libinput/30-vendor-a4tech.quirks +share/libinput/30-vendor-aiptek.quirks +share/libinput/30-vendor-alps.quirks +share/libinput/30-vendor-contour.quirks +share/libinput/30-vendor-cypress.quirks +share/libinput/30-vendor-elantech.quirks +share/libinput/30-vendor-glorious.quirks +share/libinput/30-vendor-ibm.quirks +share/libinput/30-vendor-kensington.quirks +share/libinput/30-vendor-logitech.quirks +share/libinput/30-vendor-madcatz.quirks +share/libinput/30-vendor-microsoft.quirks +share/libinput/30-vendor-razer.quirks +share/libinput/30-vendor-synaptics.quirks +share/libinput/30-vendor-trust.quirks +share/libinput/30-vendor-vmware.quirks +share/libinput/30-vendor-wacom.quirks +share/libinput/50-framework.quirks +share/libinput/50-system-acer.quirks +share/libinput/50-system-apple.quirks +share/libinput/50-system-asus.quirks +share/libinput/50-system-chicony.quirks +share/libinput/50-system-chuwi.quirks +share/libinput/50-system-cyborg.quirks +share/libinput/50-system-dell.quirks +share/libinput/50-system-gigabyte.quirks +share/libinput/50-system-google.quirks +share/libinput/50-system-gpd.quirks +share/libinput/50-system-hp.quirks +share/libinput/50-system-huawei.quirks +share/libinput/50-system-lenovo.quirks +share/libinput/50-system-pine64.quirks +share/libinput/50-system-sony.quirks +share/libinput/50-system-starlabs.quirks +share/libinput/50-system-system76.quirks +share/libinput/50-system-toshiba.quirks +share/libinput/50-system-vaio.quirks +share/zsh/ +share/zsh/site-functions/ +share/zsh/site-functions/_libinput
