From 27a462853c4f3bcb173f0ccccf2a14895d2e74db Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Apr 2012 21:41:21 +0300 Subject: [PATCH 1/3] boblightd: configure without '--without-ffmpeg' --- packages/addons/service/multimedia/boblightd/build | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/addons/service/multimedia/boblightd/build b/packages/addons/service/multimedia/boblightd/build index 94f9754dc5..6c32ba94a2 100755 --- a/packages/addons/service/multimedia/boblightd/build +++ b/packages/addons/service/multimedia/boblightd/build @@ -31,7 +31,6 @@ cd $PKG_BUILD --enable-shared \ --disable-static \ --without-portaudio \ - --without-ffmpeg make From aac212f307fa25a643d7f86bd5cc1d1eabcf3969 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Apr 2012 21:41:41 +0300 Subject: [PATCH 2/3] boblightd: add patch to build with gcc-4.7 this fixes the following build error: clients/flagmanager.cpp:88:3: error: 'opterr' was not declared in this scope clients/flagmanager.cpp:90:49: error: 'getopt' was not declared in this scope .. --- .../patches/boblightd-2.0.5-getopt-includes.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch diff --git a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch new file mode 100644 index 0000000000..aacca116cc --- /dev/null +++ b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch @@ -0,0 +1,13 @@ +diff --git a/src/clients/flagmanager.cpp b/src/clients/flagmanager.cpp +index d9f3cbf..82eb978 100644 +--- a/src/clients/flagmanager.cpp ++++ b/src/clients/flagmanager.cpp +@@ -25,6 +25,8 @@ + #define BOBLIGHT_DLOPEN_EXTERN + #include "../lib/boblight.h" + ++#include ++ + using namespace std; + + //very simple, store a copy of argc and argv From 112de1285fb4078f8deb6fece61101b736858102 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Apr 2012 21:42:44 +0300 Subject: [PATCH 3/3] boblightd: boblightd.power: don't use xbmc-send --- .../boblightd/source/sleep.d/boblightd.power | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power b/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power index 34e79c356c..1d4d4f06e5 100644 --- a/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power +++ b/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power @@ -22,12 +22,20 @@ . /etc/profile +LOCKFILE="/var/lock/boblightd.sleep" + case "$1" in hibernate|suspend) + progress "Shutting down boblightd for suspending..." boblightd.stop + touch $LOCKFILE ;; thaw|resume) - xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.boblightd)" & + progress "Restarting boblightd for wakeup..." + if [ -f "$LOCKFILE" ] ; then + rm -rf "$LOCKFILE" + boblightd.start + fi ;; *) exit $NA ;;