jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package/cwiid: add optional dependency to bluez5_utils"

Browse Source 
This reverts commit d4c4c259d25a8f2c5c2e2a5736609ba285fdd018. It was
mistakenly committed and pushed: it causes Kconfig circular
dependencies, so it cannot be applied as-is.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-03-01 22:38:37 +01:00
parent 701380c53b
commit 331ee5b7b0
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/cwiid/Config.in
View File

@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID
depends on BR2_USE_WCHAR # bluez_utils -> libglib2 depends on BR2_USE_WCHAR # bluez_utils -> libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2 depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2
select BR2_PACKAGE_BLUEZ_UTILS if !BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ_UTILS
help help
A collection of Linux tools written in C for interfacing to the A collection of Linux tools written in C for interfacing to the
Nintendo Wiimote. Nintendo Wiimote.

8
package/cwiid/cwiid.mk
View File

@ -12,19 +12,13 @@ CWIID_LICENSE_FILES = COPYING
CWIID_AUTORECONF = YES CWIID_AUTORECONF = YES
CWIID_INSTALL_STAGING = YES CWIID_INSTALL_STAGING = YES
CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils
# Disable python support. This disables the 2 following things: # Disable python support. This disables the 2 following things:
# - wminput Python plugin support # - wminput Python plugin support
# - cwiid Python module # - cwiid Python module
CWIID_CONF_OPTS = --without-python --disable-ldconfig CWIID_CONF_OPTS = --without-python --disable-ldconfig
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
CWIID_DEPENDENCIES += bluez5_utils
else
CWIID_DEPENDENCIES += bluez_utils
endif
ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y) ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y)
CWIID_DEPENDENCIES += libgtk2 libglib2 CWIID_DEPENDENCIES += libgtk2 libglib2
CWIID_CONF_OPTS += --enable-wmgui CWIID_CONF_OPTS += --enable-wmgui