From ed78b5e3c74ee95bedd2fc6582c46149c8cb94df Mon Sep 17 00:00:00 2001 From: Adam Boeglin Date: Sat, 28 Jan 2012 19:23:31 -0500 Subject: [PATCH 1/6] Fixed so that the instance won't start if it's already running. --- .../boblightd/source/bin/boblightd.service | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service index c118773fe2..d789a536a0 100755 --- a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service +++ b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service @@ -37,24 +37,30 @@ BOBLIGHT_CONFIG="$ADDON_HOME/boblight.conf" # Flag file to start boblight-x11 daemon BOBLIGHT_X11="$ADDON_HOME/boblight.X11" +export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" + cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1 -if [ -e $BOBLIGHT_CONFIG ]; then - - # Make sure the xserver has started up - wait_for_xorg +if [ ! $(pidof boblightd) ]; then + if [ -e $BOBLIGHT_CONFIG ]; then - # Start the boblight daemon - boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1 - + # Make sure the xserver has started up + wait_for_xorg + + # Start the boblight daemon + boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1 + + fi fi -if [ -e $BOBLIGHT_X11 ]; then - - # Make sure the xserver has started up - wait_for_xorg - - # Start the boblight daemon - boblight-X11 -f >> $LOG_FILE 2>&1 - +if [ ! $(pidof boblight-X11) ]; then + if [ -e $BOBLIGHT_X11 ]; then + + # Make sure the xserver has started up + wait_for_xorg + + # Start the boblight daemon + boblight-X11 -f >> $LOG_FILE 2>&1 + + fi fi From fa52a9961ef464a9afe734ead6657f29daf95eec Mon Sep 17 00:00:00 2001 From: Adam Boeglin Date: Sat, 28 Jan 2012 22:54:48 -0500 Subject: [PATCH 2/6] Updated changelog and version. --- packages/addons/service/multimedia/boblightd/changelog.txt | 3 +++ packages/addons/service/multimedia/boblightd/meta | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt index 49ba90c485..4709b5211b 100644 --- a/packages/addons/service/multimedia/boblightd/changelog.txt +++ b/packages/addons/service/multimedia/boblightd/changelog.txt @@ -1,3 +1,6 @@ +2.0.4 +- Fixed so that boblightd will not start it's already running + 2.0.3 - Removed LD_LIBRARY_PATH dependencies diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index c38d3d6981..04bed3ad36 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="boblightd" -PKG_VERSION="2.0.3" -PKG_REV="3" +PKG_VERSION="2.0.4" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" From 78e48520c7bde5aab02ae3dbaf7636feff694f0a Mon Sep 17 00:00:00 2001 From: Aidan O'Mahony Date: Sat, 4 Feb 2012 14:46:08 +1100 Subject: [PATCH 3/6] adding CherryPy package --- packages/python/web/CherryPy/build | 33 +++++++++++++++++++++++++++ packages/python/web/CherryPy/meta | 36 ++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100755 packages/python/web/CherryPy/build create mode 100644 packages/python/web/CherryPy/meta diff --git a/packages/python/web/CherryPy/build b/packages/python/web/CherryPy/build new file mode 100755 index 0000000000..191ff8365e --- /dev/null +++ b/packages/python/web/CherryPy/build @@ -0,0 +1,33 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" +export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" + +cd $PKG_BUILD + +python setup.py build +python setup.py install -O0 --no-compile --prefix /usr --root .install + +rm -rf .install/usr/bin diff --git a/packages/python/web/CherryPy/meta b/packages/python/web/CherryPy/meta new file mode 100644 index 0000000000..69fffb61c6 --- /dev/null +++ b/packages/python/web/CherryPy/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="CherryPy" +PKG_VERSION="3.2.2" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="BSD" +PKG_SITE="http://cherrypy.org/" +PKG_URL="http://download.cherrypy.org/cherrypy/3.2.2/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="Python distribute" +PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" +PKG_PRIORITY="optional" +PKG_SECTION="python/web" +PKG_SHORTDESC="CherrPy: A Pythonic, object-orientated web framework" +PKG_LONGDESC="CherryPy allows developers to build web applications in much the same way they would build any other object-oriented Python program. This results in smaller source code developed in less time." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 781b8204b294372585c60fb46547269d09e4c5b3 Mon Sep 17 00:00:00 2001 From: Aidan O'Mahony Date: Sat, 4 Feb 2012 17:43:39 +1100 Subject: [PATCH 4/6] adding Maraschino addon --- packages/addons/service/web/maraschino/addon | 31 ++++++++++++++ .../service/web/maraschino/changelog.txt | 2 + .../service/web/maraschino/icon/icon.png | Bin 0 -> 6833 bytes packages/addons/service/web/maraschino/meta | 38 ++++++++++++++++++ .../maraschino/source/bin/maraschino.service | 32 +++++++++++++++ .../service/web/maraschino/source/default.py | 23 +++++++++++ 6 files changed, 126 insertions(+) create mode 100755 packages/addons/service/web/maraschino/addon create mode 100644 packages/addons/service/web/maraschino/changelog.txt create mode 100644 packages/addons/service/web/maraschino/icon/icon.png create mode 100644 packages/addons/service/web/maraschino/meta create mode 100755 packages/addons/service/web/maraschino/source/bin/maraschino.service create mode 100644 packages/addons/service/web/maraschino/source/default.py diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon new file mode 100755 index 0000000000..1c2f35f10d --- /dev/null +++ b/packages/addons/service/web/maraschino/addon @@ -0,0 +1,31 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ + cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/ + cp -PR $ADDON_BUILD/$PKG_ADDON_ID/settings_example.py $ADDON_BUILD/$PKG_ADDON_ID/settings.py + sed 's/\/path\/to\/maraschino.db/\/storage\/.xbmc\/userdata\/addon_data\/service.web.maraschino\/maraschino.db/' -i $ADDON_BUILD/$PKG_ADDON_ID/settings.py + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib + cp -R $BUILD/CherryPy*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib \ No newline at end of file diff --git a/packages/addons/service/web/maraschino/changelog.txt b/packages/addons/service/web/maraschino/changelog.txt new file mode 100644 index 0000000000..80e79ec0cf --- /dev/null +++ b/packages/addons/service/web/maraschino/changelog.txt @@ -0,0 +1,2 @@ +0.99.1 +- initial version maraschino-923de4c diff --git a/packages/addons/service/web/maraschino/icon/icon.png b/packages/addons/service/web/maraschino/icon/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5112b330ee3182f716e463a376f0a228b8493e0e GIT binary patch literal 6833 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 literal 0 HcmV?d00001 diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta new file mode 100644 index 0000000000..1f955948f2 --- /dev/null +++ b/packages/addons/service/web/maraschino/meta @@ -0,0 +1,38 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="maraschino" +PKG_VERSION="923de4c" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.maraschinoproject.com/" +PKG_URL="https://dl.dropbox.com/u/9676785/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="Python" +PKG_BUILD_DEPENDS="toolchain Python CherryPy" +PKG_PRIORITY="optional" +PKG_SECTION="service/web" +PKG_SHORTDESC="Maraschino: Web interface to act as a nice overview/front page for my XBMC HTPC" +PKG_LONGDESC="Maraschino is an XBMC web interface with customisable applications module providing quick access to your web interfaces (e.g. SABnzb+, SickBeard, or whatever else you want to link to), recently added episodes module, media library browser, currently playing bar and disk space module." + +PKG_IS_ADDON="yes" +PKG_ADDON_TYPE="xbmc.service" + +PKG_AUTORECONF="no" diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service new file mode 100755 index 0000000000..d4e4dc9ee7 --- /dev/null +++ b/packages/addons/service/web/maraschino/source/bin/maraschino.service @@ -0,0 +1,32 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# Addon settings + ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino" + ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino" + + export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib" + +################################################################################ +# start maraschino +################################################################################ + python $ADDON_DIR/maraschino-cherrypy.py -q diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py new file mode 100644 index 0000000000..254cbf4f0f --- /dev/null +++ b/packages/addons/service/web/maraschino/source/default.py @@ -0,0 +1,23 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +import xbmc, time, os, subprocess + +os.system("maraschino.service") From 972739f0f62012823e6b50e038615ddca8454ee4 Mon Sep 17 00:00:00 2001 From: Aidan O'Mahony Date: Wed, 8 Feb 2012 17:10:44 +1100 Subject: [PATCH 5/6] adding patch to fix maraschino remote icon --- .../patches/maraschino-923de4c-remote.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch diff --git a/packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch b/packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch new file mode 100644 index 0000000000..4f62c2b6b4 --- /dev/null +++ b/packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch @@ -0,0 +1,13 @@ +--- a/modules/remote.py ++++ b/modules/remote.py +@@ -13,7 +13,7 @@ connected = False + def update_xbmc_object(): + host = get_setting_value('server_hostname') + try: +- icon = os.path.abspath('static/images/maraschino_logo.png') ++ icon = os.path.abspath('/storage/.xbmc/addons/service.web.maraschino/static/images/maraschino_logo.png') + + if not os.path.exists(icon): + icon = os.path.abspath('maraschino/static/images/maraschino_logo.png') + + From c215e4aaa444a714aa4e78b895ac725d0cb77b96 Mon Sep 17 00:00:00 2001 From: Aidan O'Mahony Date: Wed, 8 Feb 2012 17:11:52 +1100 Subject: [PATCH 6/6] fix to stop maraschino from stealing XBMC web port --- packages/addons/service/web/maraschino/source/default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py index 254cbf4f0f..70e35dda15 100644 --- a/packages/addons/service/web/maraschino/source/default.py +++ b/packages/addons/service/web/maraschino/source/default.py @@ -20,4 +20,4 @@ import xbmc, time, os, subprocess -os.system("maraschino.service") +subprocess.Popen("maraschino.service", shell=True, close_fds=True)