XLibre/xf86-input-joystick
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-joystick.git synced 2026-03-24 01:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Dragonfly BSD build

Browse Source 
On Dragonfly the USB headers are in different locations, view #define's
differ in naming.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-23 22:10:59 +01:00
committed by Enrico Weigelt
parent 49c36ac0f1
commit b501e24344
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@@ -69,15 +69,16 @@ if test "x$linux_backend" = xyes; then
AC_DEFINE(LINUX_BACKEND, 1, [Compile Linux joystick backend])
fi
bsd_backend=yes
AC_CHECK_HEADERS([dev/usb/usb.h])
AC_CHECK_HEADERS([usbhid.h dev/usb/usbhid.h],, [bsd_backend=no],
[[#if HAVE_DEV_USB_USB_H
#include <dev/usb/usb.h>
#endif
]])
AC_CHECK_HEADERS([dev/hid/hid.h])
AC_CHECK_LIB([usbhid],[hid_get_item],, [bsd_backend=no])
bsd_backend=no
case $host_os in
*dragonfly*)
AC_CHECK_HEADERS([bus/u4b/usb.h bus/u4b/usbhid.h], [bsd_backend=yes])
;;
*)
AC_CHECK_HEADERS([dev/usb/usbhid.h], [bsd_backend=yes])
;;
esac
AM_CONDITIONAL(BSD_BACKEND, [test "x$bsd_backend" = xyes])
if test "x$bsd_backend" = xyes; then
AC_CHECK_HEADERS([dev/usb/usb_ioctl.h])

13
src/backend_bsd.c
View File

@@ -40,8 +40,21 @@
#include <xf86_OSproc.h>
#include <usbhid.h>
#ifdef __DragonFly__
#include <bus/u4b/usb.h>
#include <bus/u4b/usbhid.h>
#define USB_GET_REPORT_ID UR_GET_REPORT
#else /* __DragonFly__ */
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#endif /* __DragonFly__ */
#ifdef HAVE_DEV_HID_HID_H
#include <dev/hid/hid.h>
#endif