Commit 9c47cd5b authored by Samuel Martin's avatar Samuel Martin Committed by Peter Korsgaard
Browse files

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.

Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
parent 0e8e3c28

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,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-cpp/Config.in"

source "package/dbus-glib/Config.in"

package/cwiid/Config.in

0 → 100644
+25 −0
Original line number Diff line number Diff line 
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

0 → 100644
+166 −0
Original line number Diff line number Diff line 
From 6af678616531eb1f3d3d0a052313ef9d8125bac7 Mon Sep 17 00:00:00 2001

From: "L. Donnie Smith" <donnie.smith@gatech.edu>

Date: Thu, 4 Feb 2010 22:53:41 -0500

Subject: [PATCH] fix link options for --as-needed (#90)



also fix a couple of includes

---

 common/include/app.mak    | 2 +-

 common/include/lib.mak.in | 4 ++--

 common/include/plugin.mak | 2 +-

 lswm/Makefile.in          | 2 +-

 python/Makefile.in        | 2 +-

 python/Wiimote.c          | 2 +-

 python/cwiidmodule.c      | 2 +-

 wmdemo/wmdemo.c           | 1 +

 wmgui/Makefile.in         | 2 +-

 wminput/Makefile.in       | 2 +-

 wminput/main.c            | 1 +

 11 files changed, 12 insertions(+), 10 deletions(-)



diff --git a/common/include/app.mak b/common/include/app.mak

index f00cf12..c26d0ff 100644

--- a/common/include/app.mak

+++ b/common/include/app.mak

@@ -10,7 +10,7 @@ DEST_INST_DIR = $(ROOTDIR)$(INST_DIR)

 all: $(APP_NAME)

 

 $(APP_NAME): $(OBJECTS)

-	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS)

+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS)

 

 install: $(APP_NAME)

 	install -D $(APP_NAME) $(DEST_INST_DIR)/$(APP_NAME)

diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in

index 5e81ff3..3afbb14 100644

--- a/common/include/lib.mak.in

+++ b/common/include/lib.mak.in

@@ -25,8 +25,8 @@ $(STATIC_LIB): $(OBJECTS)

 	ar rcs $(STATIC_LIB) $(OBJECTS)

 

 $(SHARED_LIB): $(OBJECTS)

-	$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) $(LDLIBS) \

-	      -o $(SHARED_LIB) $(OBJECTS)

+	$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \

+	      $(OBJECTS) $(LDLIBS)

 

 install: install_header install_static install_shared

 

diff --git a/common/include/plugin.mak b/common/include/plugin.mak

index 0f61502..a2d5c85 100644

--- a/common/include/plugin.mak

+++ b/common/include/plugin.mak

@@ -16,7 +16,7 @@ DEST_INST_DIR = $(INST_DIR)

 all: $(LIB_NAME)

 

 $(LIB_NAME): $(OBJECTS)

-	$(CC) -shared $(LDFLAGS) $(LDLIBS) -o $(LIB_NAME) $(OBJECTS)

+	$(CC) -shared $(LDFLAGS) -o $(LIB_NAME) $(OBJECTS) $(LDLIBS)

 

 install: $(LIB_NAME)

 	install -D $(LIB_NAME) $(DEST_INST_DIR)/$(LIB_NAME)

diff --git a/lswm/Makefile.in b/lswm/Makefile.in

index 79e8b5b..017104f 100644

--- a/lswm/Makefile.in

+++ b/lswm/Makefile.in

@@ -8,7 +8,7 @@ SOURCES = lswm.c

 

 CFLAGS += -I@top_builddir@/libcwiid

 LDFLAGS += -L@top_builddir@/libcwiid

-LDLIBS += -lcwiid

+LDLIBS += -lcwiid -lbluetooth

 INST_DIR = @bindir@

 

 include $(COMMON)/include/app.mak

diff --git a/python/Makefile.in b/python/Makefile.in

index 0d7efdf..0ca57ca 100644

--- a/python/Makefile.in

+++ b/python/Makefile.in

@@ -7,7 +7,7 @@ ifdef ROOTDIR

 endif

 

 all:

-	$(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid

+	$(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid -lbluetooth

 

 install:

 	$(PYTHON) setup.py install --install-lib=${libdir}/python@PYTHON_VERSION@/site-packages $(SET_ROOT_DIR)

diff --git a/python/Wiimote.c b/python/Wiimote.c

index 794e7e2..523185e 100644

--- a/python/Wiimote.c

+++ b/python/Wiimote.c

@@ -24,7 +24,7 @@

 #include "structmember.h"

 #include <errno.h>

 #include <bluetooth/bluetooth.h>

-#include "cwiid.h"

+#include <cwiid.h>

 

 #if (PY_VERSION_HEX < 0x02050000)

   #ifndef PY_SSIZE_T_MIN

diff --git a/python/cwiidmodule.c b/python/cwiidmodule.c

index f6a8f33..a01ed82 100644

--- a/python/cwiidmodule.c

+++ b/python/cwiidmodule.c

@@ -24,7 +24,7 @@

 

 #include <stdlib.h>

 

-#include "cwiid.h"

+#include <cwiid.h>

 #include "structmember.h"

 

 /* externally defined types */

diff --git a/wmdemo/wmdemo.c b/wmdemo/wmdemo.c

index 70a25a1..b7aaa7f 100644

--- a/wmdemo/wmdemo.c

+++ b/wmdemo/wmdemo.c

@@ -2,6 +2,7 @@

 #include <stdio.h>

 #include <stdlib.h>

 

+#include <bluetooth/bluetooth.h>

 #include <cwiid.h>

 

 /* This is a sample program written to demonstrate basic CWiid libwiimote

diff --git a/wmgui/Makefile.in b/wmgui/Makefile.in

index 41b205e..14d1c1e 100644

--- a/wmgui/Makefile.in

+++ b/wmgui/Makefile.in

@@ -8,7 +8,7 @@ SOURCES = main.c interface.c support.c

 

 CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid

 LDFLAGS += -L@top_builddir@/libcwiid

-LDLIBS += @GTK_LIBS@ -lm -lcwiid

+LDLIBS += @GTK_LIBS@ -lcwiid -lbluetooth -lm

 INST_DIR = @bindir@

 

 include $(COMMON)/include/app.mak

diff --git a/wminput/Makefile.in b/wminput/Makefile.in

index 009d4d5..d3c3679 100644

--- a/wminput/Makefile.in

+++ b/wminput/Makefile.in

@@ -14,7 +14,7 @@ CFLAGS += -I@top_builddir@/libcwiid \

 	-DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \

 	-DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\"

 

-LDLIBS += -lcwiid -ldl

+LDLIBS += -lcwiid -lbluetooth -ldl -lpthread

 LDFLAGS += -L@top_builddir@/libcwiid -rdynamic

 INST_DIR = @bindir@

 

diff --git a/wminput/main.c b/wminput/main.c

index c3a7445..bbc98d9 100644

--- a/wminput/main.c

+++ b/wminput/main.c

@@ -30,6 +30,7 @@

 #include <signal.h>

 #include <sys/types.h>

 #include <unistd.h>

+#include <bluetooth/bluetooth.h>

 

 #include <cwiid.h>

 

-- 

1.8.5.2

package/cwiid/cwiid-0002-Update-for-BlueZ-changes.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
From c5dd7d4a9af5a7d8ead8ad26d9e5e0f8f8292d29 Mon Sep 17 00:00:00 2001

From: "L. Donnie Smith" <donnie.smith@gatech.edu>

Date: Sun, 30 Nov 2008 22:34:08 +0000

Subject: [PATCH] Update for BlueZ changes.



git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
From af6bffb5b8b71e99e0f9bbbd2cf1fbd695a643c2 Mon Sep 17 00:00:00 2001

From: Samuel Martin <s.martin49@gmail.com>

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 <s.martin49@gmail.com>

---

 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@top_builddir@/libcwiid

 LDFLAGS += -L@top_builddir@/libcwiid

-LDLIBS += -lcwiid

+LDLIBS += -lcwiid -lbluetooth

 INST_DIR = @bindir@

 

 include $(COMMON)/include/app.mak

-- 

1.8.5.2