diff --git a/docs/changelog.rst b/docs/changelog.rst index 8320eae..20e7293 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,6 +8,8 @@ Changelog - Slightly faster reading of events. +- Fix build on FreeBSD. + 1.8.0 (Jan 25, 2025) ==================== diff --git a/setup.py b/setup.py index c5ab4a0..6b721d7 100755 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ import sys import shutil import textwrap +import platform from pathlib import Path from subprocess import run @@ -25,7 +26,11 @@ def create_ecodes(headers=None): include_paths.update(c_inc_path.split(":")) include_paths.add("/usr/include") - files = ["linux/input.h", "linux/input-event-codes.h", "linux/uinput.h"] + if platform.system().lower() == "freebsd": + files = ["dev/evdev/input.h", "dev/evdev/input-event-codes.h", "dev/evdev/uinput.h"] + else: + files = ["linux/input.h", "linux/input-event-codes.h", "linux/uinput.h"] + headers = [os.path.join(path, file) for path in include_paths for file in files] headers = [header for header in headers if os.path.isfile(header)] diff --git a/src/evdev/genecodes_c.py b/src/evdev/genecodes_c.py index dd3ee91..5c2d946 100644 --- a/src/evdev/genecodes_c.py +++ b/src/evdev/genecodes_c.py @@ -25,7 +25,7 @@ # ----------------------------------------------------------------------------- -macro_regex = r"#define +((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF|INPUT_PROP)_\w+)" +macro_regex = r"#define\s+((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF|INPUT_PROP)_\w+)" macro_regex = re.compile(macro_regex) # Uname without hostname. @@ -38,6 +38,7 @@ #include #ifdef __FreeBSD__ #include +#include #else #include #include