From eac54926eab80851c9e50430fcc527dc5906607d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 21 Sep 2010 23:26:27 +0200
Subject: [PATCH] xbmc: add WiiMote Support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/build               |  6 +++
 packages/mediacenter/xbmc/init.d/61_xbmc      |  4 ++
 packages/mediacenter/xbmc/install             |  8 ++-
 packages/mediacenter/xbmc/meta                |  5 ++
 .../xbmc-WiiRemote_crosscompiling-0.1.diff    | 53 +++++++++++++++++++
 5 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 packages/mediacenter/xbmc/patches/xbmc-WiiRemote_crosscompiling-0.1.diff

diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 6ba93c1d49..9299c35965 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -133,3 +133,9 @@ $AUTORECONF xbmc/lib/libid3tag/libid3tag
 make externals
 make xbmc.bin
 make xbmc-xrandr
+
+if [ "$WIIMOTE_SUPPORT" = yes ]; then
+  (cd tools/EventClients/Clients/WiiRemote;
+    $CXX $CFLAGS -lwiiuse WiiUse_WiiRemote.cpp -o WiiUse_WiiRemote;
+  )
+fi
diff --git a/packages/mediacenter/xbmc/init.d/61_xbmc b/packages/mediacenter/xbmc/init.d/61_xbmc
index e688bda135..110cbf241d 100755
--- a/packages/mediacenter/xbmc/init.d/61_xbmc
+++ b/packages/mediacenter/xbmc/init.d/61_xbmc
@@ -34,6 +34,9 @@ progress "starting XBMC"
   [ -f /usr/bin/pulseaudio ] && /usr/bin/pulseaudio \
   --start --log-target=syslog --daemonize 2>&1 > /dev/null
 
+# starting xbmc-wiimote if avaible
+  [ -f /usr/bin/xbmc-wiiremote ] && /usr/bin/xbmc-wiiremote >/dev/null 2>&1 &
+
 # starting autoupdate
   [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
 
@@ -46,6 +49,7 @@ progress "starting XBMC"
     DISPLAY=:0.0 xbmc $XBMC_ARGS > /dev/null 2>&1
     RET=$?
     echo "Exited with code $RET"
+    echo "Last XBMC Exitcode: $RET" >> /storage/.xbmc/temp/last_exit.log
 
     [ "$RET" == 0 ] && sync && poweroff
     [ "$RET" == 64 ] && sync && poweroff
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 9b35b61860..63a858cee8 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -25,7 +25,7 @@ cd $PKG_BUILD
     -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
 cd -
 
-# overriding/remove Splash image
+# overriding Splash image
 mkdir -p $INSTALL/usr/share/xbmc/media
   rm -rf $INSTALL/usr/share/xbmc/media/Splash.png
 #   if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
@@ -47,3 +47,9 @@ mkdir -p $INSTALL/usr/share/xbmc/addons
   $SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
   cp -R $PKG_DIR/config/repository.openelec.tv $INSTALL/usr/share/xbmc/addons
   $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/xbmc/addons/repository.openelec.tv/addon.xml
+
+if [ "$WIIMOTE_SUPPORT" = yes ]; then
+  mkdir -p $INSTALL/usr/bin
+    cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote
+  mkdir -p $INSTALL/usr/share/xbmc/
+fi
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index da22bf197f..d8bffee5eb 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -47,3 +47,8 @@ if [ "$CRYSTALHD" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS crystalhd"
   PKG_DEPENDS="$PKG_DEPENDS crystalhd"
 fi
+
+if [ "$WIIMOTE_SUPPORT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS wiiuse"
+  PKG_DEPENDS="$PKG_DEPENDS wiiuse"
+fi
diff --git a/packages/mediacenter/xbmc/patches/xbmc-WiiRemote_crosscompiling-0.1.diff b/packages/mediacenter/xbmc/patches/xbmc-WiiRemote_crosscompiling-0.1.diff
new file mode 100644
index 0000000000..e63840a6da
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-WiiRemote_crosscompiling-0.1.diff
@@ -0,0 +1,53 @@
+diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile
+--- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile	2010-09-19 14:54:08.000000000 +0200
++++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile	2010-09-21 20:31:58.649299449 +0200
+@@ -1,3 +1,4 @@
++CXX ?= g++
+ CFLAGS = -Wall -pipe -fPIC -funroll-loops
+ OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2)
+ OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so
+@@ -6,7 +7,7 @@
+ 
+ all:
+ 	@$(MAKE) -C wiiuse_$(VERSION)/src $@
+-	g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
++	$(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
+ wiiuse:
+ 	@$(MAKE) -C wiiuse_$(VERSION)/src
+ clean:
+diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile
+--- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2010-09-19 14:54:08.000000000 +0200
++++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2010-09-21 20:28:15.388265664 +0200
+@@ -5,7 +5,7 @@
+ #
+ # Change this to your GCC version.
+ #
+-CC = gcc
++CC ?= gcc
+ 
+ ####################################################
+ #
+diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile
+--- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2010-09-19 14:54:08.000000000 +0200
++++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2010-09-21 20:28:22.476390252 +0200
+@@ -5,7 +5,7 @@
+ #
+ # Change this to your GCC version.
+ #
+-CC = gcc
++CC ?= gcc
+ 
+ ####################################################
+ #
+diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile
+--- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2010-09-19 14:54:08.000000000 +0200
++++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2010-09-21 20:28:32.447265813 +0200
+@@ -5,7 +5,7 @@
+ #
+ # Change this to your GCC version.
+ #
+-CC = gcc
++CC ?= gcc
+ 
+ ####################################################
+ #