cwiid: new package
PATCH v2 1/1 cwiid: new package
This patch only add the native cwiid library and a couple of tools.
The 2 first cwiid patches are retrieved from upstream and fix build issues, so does the 3rd one.
The 4th patch allows to disable wmgui build, so allows to reduce to number of dependencies.
---
changes v1 -> v2:
- fix missing 'select' in Config.in
- disable ldconfig call
--- package/Config.in | 1 + package/cwiid/Config.in | 25 ++++ ...id-0001-fix-link-options-for-as-needed-90.patch | 166 +++++++++++++++++++++ .../cwiid-0002-Update-for-BlueZ-changes.patch | 28 ++++ ...linking-by-adding-the-missing-lbluetooth-.patch | 27 ++++ ...-0004-configure-make-wmgui-build-optional.patch | 64 ++++++++ package/cwiid/cwiid.mk | 30 ++++ 7 files changed, 341 insertions(+) create mode 100644 package/cwiid/Config.in create mode 100644 package/cwiid/cwiid-0001-fix-link-options-for-as-needed-90.patch create mode 100644 package/cwiid/cwiid-0002-Update-for-BlueZ-changes.patch create mode 100644 package/cwiid/cwiid-0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch create mode 100644 package/cwiid/cwiid-0004-configure-make-wmgui-build-optional.patch create mode 100644 package/cwiid/cwiid.mk
package/Config.in +1 -0
@@ -264,6 +264,7 @@ source "package/acpid/Config.in" source "package/avrdude/Config.in" source "package/cdrkit/Config.in" source "package/cryptsetup/Config.in" +source "package/cwiid/Config.in" source "package/dbus/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"
package/cwiid/Config.in new file +25 -0
@@ -0,0 +1,25 @@ +config BR2_PACKAGE_CWIID + bool "cwiid" + depends on !BR2_avr32 # bluez_utils + depends on !BR2_PREFER_STATIC_LIB # bluez_utils + depends on BR2_USE_WCHAR # bluez_utils -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2 + depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2 + select BR2_PACKAGE_BLUEZ_UTILS + help + A collection of Linux tools written in C for interfacing to the + Nintendo Wiimote. + + http://abstrakraft.org/cwiid/ + +if BR2_PACKAGE_CWIID +config BR2_PACKAGE_CWIID_WMGUI + bool "wmgui" + depends on BR2_PACKAGE_XORG7 # libgtk2 + depends on BR2_USE_WCHAR # libgtk2 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 + depends on BR2_USE_MMU # libgtk2 -> libglib2 + depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGTK2 +endif
package/cwiid/cwiid-0001-fix-link-options-for-as-needed-90.patch new file +166 -0
166 lines not on this page · raw message
package/cwiid/cwiid-0002-Update-for-BlueZ-changes.patch new file +28 -0
@@ -0,0 +1,28 @@ +From c5dd7d4a9af5a7d8ead8ad26d9e5e0f8f8292d29 Mon Sep 17 00:00:00 2001 +From: "L. Donnie Smith" <[email protected]> +Date: Sun, 30 Nov 2008 22:34:08 +0000 +Subject: [PATCH] Update for BlueZ changes. + +git-svn-id: http://abstrakraft.org/cwiid/svn/trunk at 183 918edb2d-ff29-0410-9de2-eb38e7f22bc7 +--- + libcwiid/bluetooth.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libcwiid/bluetooth.c b/libcwiid/bluetooth.c +index 63284a8..e986f75 100644 +--- a/libcwiid/bluetooth.c ++++ b/libcwiid/bluetooth.c +@@ -122,8 +122,8 @@ int cwiid_get_bdinfo_array(int dev_id, unsigned int timeout, int max_bdinfo, + } + + /* timeout (10000) in milliseconds */ +- if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, +- (*bdinfo)[bdinfo_count].name, 10000)) { ++ if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, ++ (*bdinfo)[bdinfo_count].name, 10000)) { + cwiid_err(NULL, "Bluetooth name read error"); + err = 1; + goto CODA; +-- +1.8.5.2 +
package/cwiid/cwiid-0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch new file +27 -0
@@ -0,0 +1,27 @@ +From af6bffb5b8b71e99e0f9bbbd2cf1fbd695a643c2 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Sat, 8 Dec 2012 13:32:40 +0100 +Subject: [PATCH 1/2] wmdemo: fix linking by adding the missing -lbluetooth to + LDLIBS + +Signed-off-by: Samuel Martin <[email protected]> +--- + wmdemo/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wmdemo/Makefile.in b/wmdemo/Makefile.in +index 56aed58..1eccc02 100644 +--- a/wmdemo/Makefile.in ++++ b/wmdemo/Makefile.in +@@ -8,7 +8,7 @@ SOURCES = wmdemo.c + + CFLAGS += -I at top_builddir@/libcwiid + LDFLAGS += -L at top_builddir@/libcwiid +-LDLIBS += -lcwiid ++LDLIBS += -lcwiid -lbluetooth + INST_DIR = @bindir@ + + include $(COMMON)/include/app.mak +-- +1.8.5.2 +
package/cwiid/cwiid-0004-configure-make-wmgui-build-optional.patch new file +64 -0
64 lines not on this page · raw message
package/cwiid/cwiid.mk new file +30 -0
@@ -0,0 +1,30 @@ +################################################################################ +# +# cwiid +# +################################################################################ + +CWIID_VERSION = 0.6.00 +CWIID_SOURCE = cwiid-$(CWIID_VERSION).tgz +CWIID_SITE = http://abstrakraft.org/cwiid/downloads +CWIID_LICENSE = GPLv2+ +CWIID_LICENSE_FILES = COPYING + +CWIID_AUTORECONF = YES +CWIID_INSTALL_STAGING = YES + +CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils + +# Disable python support. This disables the 2 following things: +# - wminput Python plugin support +# - cwiid Python module +CWIID_CONF_OPT = --without-python --disable-ldconfig + +ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y) +CWIID_DEPENDENCIES += libgtk2 libglib2 +CWIID_CONF_OPT += --enable-wmgui +else +CWIID_CONF_OPT += --disable-wmgui +endif + +$(eval $(autotools-package))
Signature · 1 line
1.8.5.2
PATCH v2 1/1 cwiid: new package
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
This patch only add the native cwiid library and a couple of tools. The 2 first cwiid patches are retrieved from upstream and fix build issues, so does the 3rd one.
The 4th patch allows to disable wmgui build, so allows to reduce to number of dependencies.Cc Eric Jarrige <[email protected]>Signed-off-by Samuel Martin <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 1/1 cwiid: new package
In reply to Samuel MartinDear Samuel Martin,
Quoted 8 lines · Samuel Martin
package/cwiid/Config.in new file +8
-0+if BR2_PACKAGE_CWIID +config BR2_PACKAGE_CWIID_WMGUI + bool "wmgui" + depends on BR2_PACKAGE_XORG7 # libgtk2 + depends on BR2_USE_WCHAR # libgtk2 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 + depends on BR2_USE_MMU # libgtk2 -> libglib2 + depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango
package/cwiid/Config.in
Quoted 10 lines
package/cwiid/Config.in new file +9
-0+ select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGTK2 +endif +ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y) +CWIID_DEPENDENCIES += libgtk2 libglib2 +CWIID_CONF_OPT += --enable-wmgui +else +CWIID_CONF_OPT += --disable-wmgui +endif
That's a very minor nitpick, but libgtk2 strongly requires libglib2, so selecting and depending on both isn't very useful. Having the select and dependency on gtk2 would probably have been sufficient, IMO.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com