Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-03-08 20:44:30 +01:00
commit 49b32c5a3e
14 changed files with 64 additions and 38 deletions

View File

@ -24,6 +24,4 @@
ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest"
chmod +x $ADDON_DIR/lib/*
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest.bin $@

View File

@ -24,6 +24,4 @@
ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest"
chmod +x $ADDON_DIR/lib/*
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest-capture.bin $@

View File

@ -24,6 +24,4 @@
ADDON_DIR="$HOME/.xbmc/addons/debug.tools.htop"
chmod +x $ADDON_DIR/lib/*
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" htop.bin $@

View File

@ -29,6 +29,4 @@
################################################################################
# start ps3d
################################################################################
chmod +x $ADDON_DIR/lib/*
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" wiimote &

View File

@ -26,5 +26,4 @@ ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
chmod 755 $ADDON_DIR/lib/*
makemkvcon.bin $@

View File

@ -1,3 +1,6 @@
2.0.4
- update to transmission-2.50
2.0.3
- rebuild for libiconv changes

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="transmission"
PKG_VERSION="2.42"
PKG_REV="3"
PKG_VERSION="2.50"
PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.transmissionbt.com/"

View File

@ -1,14 +0,0 @@
--- a/third-party/libutp/utypes.h.orig Wed Sep 28 19:46:15 2011
+++ b/third-party/libutp/utypes.h Wed Sep 28 19:47:06 2011
@@ -36,7 +36,11 @@ typedef const char * cstr;
typedef char * str;
#ifndef __cplusplus
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#else
typedef uint8 bool;
+#endif
#endif
#endif //__UTYPES_H__

View File

@ -26,6 +26,9 @@ ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission"
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission"
LOG_FILE="$ADDON_HOME/service.log"
LOCKDIR="/var/lock/"
LOCKFILE="transmission.disabled"
export TRANSMISSION_WEB_HOME="$ADDON_DIR/web"
mkdir -p $ADDON_HOME
@ -65,7 +68,14 @@ else
fi
if [ ! "$(pidof transmission-daemon)" ];then
chmod +x $ADDON_DIR/lib/*
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
fi
while [ true ] ; do
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE
sleep 1
done &
fi

View File

@ -0,0 +1,32 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile
LOCKDIR="/var/lock/"
LOCKFILE="transmission.disabled"
if [ "$(pidof transmission-daemon)" ];then
mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
killall -9 transmission-daemon
fi

View File

@ -21,12 +21,24 @@
import os
import sys
import xbmcaddon
import time
import subprocess
__scriptname__ = "Transmission BT Client"
__author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__settings__ = xbmcaddon.Addon(id='service.downloadmanager.transmission')
__cwd__ = __settings__.getAddonInfo('path')
__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.service") )
__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.start") )
__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.stop") )
#make binary files executable in adson bin folder
subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
subprocess.Popen(__start__, shell=True, close_fds=True)
while (not xbmc.abortRequested):
time.sleep(0.250)
subprocess.Popen(__stop__, shell=True, close_fds=True)
os.system(__path__)

View File

@ -24,6 +24,4 @@
ADDON_DIR="$HOME/.xbmc/addons/shell.texteditor.nano"
chmod +x $ADDON_DIR/lib/*
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" nano.bin $@

View File

@ -36,9 +36,6 @@ fi
# hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
# hack: make addon-libs executable
chmod +x /storage/.xbmc/addons/*/lib/* > /dev/null 2>&1
# hack to support user installed fonts
SUBFONTS="/storage/.xbmc/userdata/fonts"
if [ -d "$SUBFONTS" ]; then

View File

@ -36,9 +36,6 @@ fi
# hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
# hack: make addon-libs executable
chmod +x /storage/.xbmc/addons/*/lib/* > /dev/null 2>&1
# hack to support user installed fonts
SUBFONTS="/storage/.xbmc/userdata/fonts"
if [ -d "$SUBFONTS" ]; then