mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/bluez5_utils: hid and hog needs headers >= 3.18

Browse Source 
Fix the following build failure with hid and hog raised since their
addition in commit fb9fc969d9 and
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd
because UHID_GET_REPORT is only available since kernel 3.18 and
fa71f32b5d:

profiles/input/device.c: In function 'uhid_send_get_report_reply':
profiles/input/device.c:222:24: error: 'union <anonymous>' has no member named 'get_report_reply'
  if (size > sizeof(ev.u.get_report_reply.data))
                        ^
profiles/input/device.c:223:21: error: 'union <anonymous>' has no member named 'get_report_reply'
   size = sizeof(ev.u.get_report_reply.data);
                     ^
profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function)
  ev.type = UHID_GET_REPORT_REPLY;
            ^

Fixes:
 - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
2022-03-20 17:20:12 +01:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent d76b7564f1
commit 328516a5ad
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/bluez5_utils/Config.in
View File

@@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID
bool "build hid plugin" bool "build hid plugin"
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG
help help
Build plugin for HID (input) profiles. Build plugin for HID (input) profiles.
comment "hid plugin needs a toolchain w/ headers >= 3.18"
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG
bool "build hog plugin" bool "build hog plugin"
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
help help
Build plugin for HoG (input) profiles. Build plugin for HoG (input) profiles.
comment "hog plugin needs a toolchain w/ headers >= 3.18"
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH
bool "build mesh plugin" bool "build mesh plugin"
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell
@@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
bool "build sixaxis plugin" bool "build sixaxis plugin"
depends on BR2_PACKAGE_HAS_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime
help help
Build sixaxis plugin (support Sony Dualshock Build sixaxis plugin (support Sony Dualshock
controller) controller)
comment "sixaxis plugin needs a toolchain w/ headers >= 3.18"
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
comment "sixaxis plugin needs udev /dev management" comment "sixaxis plugin needs udev /dev management"
depends on !BR2_PACKAGE_HAS_UDEV depends on !BR2_PACKAGE_HAS_UDEV
@@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST
config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI
bool "build hid2hci tool" bool "build hid2hci tool"
depends on BR2_PACKAGE_HAS_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime
select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS
help help
Build hid2hci tool Build hid2hci tool
comment "hid2hci tool needs a toolchain w/ headers >= 3.18"
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
comment "hid2hci tool needs udev /dev management" comment "hid2hci tool needs udev /dev management"
depends on !BR2_PACKAGE_HAS_UDEV depends on !BR2_PACKAGE_HAS_UDEV

2
package/brltty/Config.in
View File

@@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime
help help
A daemon providing access to the Linux console for a blind A daemon providing access to the Linux console for a blind
person using a refreshable braille display. person using a refreshable braille display.

6
package/cwiid/Config.in
View File

@@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID
depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_USE_WCHAR # bluez5_utils -> libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils
select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime
@@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI
select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBGTK2
endif endif
comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
depends on !BR2_USE_MMU depends on !BR2_USE_MMU

6
package/kodi/Config.in
View File

@@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI
config BR2_PACKAGE_KODI_BLUEZ config BR2_PACKAGE_KODI_BLUEZ
bool "bluetooth" bool "bluetooth"
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils
select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO
@@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ
help help
Enable bluetooth support Enable bluetooth support
comment "bluetooth support needs a toolchain w/ headers >= 3.4" comment "bluetooth support needs a toolchain w/ headers >= 3.18"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
config BR2_PACKAGE_KODI_DBUS config BR2_PACKAGE_KODI_DBUS
bool "dbus" bool "dbus"

2
package/supertuxkart/Config.in
View File

@@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART
select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2
select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime
help help
Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart
racer with multiple karts, tracks and modes you can play. racer with multiple karts, tracks and modes you can play.