Date: Tue, 27 Sep 2022 13:07:40 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 47fa29206f1d - main - devel/sdl20: fix build with disabled JOYSTICK Message-ID: <202209271307.28RD7et5054427@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=47fa29206f1df1cc709c8dd7b5d19118d9fd0987 commit 47fa29206f1df1cc709c8dd7b5d19118d9fd0987 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-09-27 13:06:21 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-09-27 13:07:34 +0000 devel/sdl20: fix build with disabled JOYSTICK Upstream issue: https://github.com/libsdl-org/SDL/issues/6169 Upstream fix: https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51 --- devel/sdl20/Makefile | 1 - .../patch-src_core_linux_SDL__evdev_capabilities.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index 0257b27ff029..d84a9679030b 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -91,7 +91,6 @@ JACK_LIB_DEPENDS= libjack.so:audio/jack JOYSTICK_CONFIGURE_ENABLE= joystick haptic JOYSTICK_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto JOYSTICK_LIB_DEPENDS= libinotify.so:devel/libinotify -JOYSTICK_BROKEN_OFF= Does not build with JOYSTICK disabled NAS_CONFIGURE_ENABLE= nas nas-shared NAS_LIB_DEPENDS= libaudio.so:audio/nas OSS_CONFIGURE_ENABLE= oss diff --git a/devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h b/devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h new file mode 100644 index 000000000000..3c756ebcc9b1 --- /dev/null +++ b/devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h @@ -0,0 +1,20 @@ +--- src/core/linux/SDL_evdev_capabilities.h.orig 2022-01-08 02:29:52 UTC ++++ src/core/linux/SDL_evdev_capabilities.h +@@ -25,8 +25,6 @@ + #ifndef SDL_evdev_capabilities_h_ + #define SDL_evdev_capabilities_h_ + +-#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) +- + #include <linux/input.h> + + /* A device can be any combination of these classes */ +@@ -52,8 +50,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bi + unsigned long bitmask_abs[NBITS(ABS_MAX)], + unsigned long bitmask_key[NBITS(KEY_MAX)], + unsigned long bitmask_rel[NBITS(REL_MAX)]); +- +-#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */ + + #endif /* SDL_evdev_capabilities_h_ */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209271307.28RD7et5054427>