config/version: set version to 1.95.6 (2.0 beta-6)

Signed-off-by: Stephan Raue <stephan@openelec.tv>

.gitignore

@@ -18,3 +18,11 @@ mkpkg-temp
 
 # private working directory
 /.work/
+
+# symlinks...
+/sources
+/.work
+
+# backup files
+*.orig
+

CHANGELOG

@@ -5,12 +5,12 @@ Changelog OpenELEC-1.0 to OpenELEC-2.0
 Package updates:
   - update XBMC to XBMC-11.0 (Eden)
   - update eglibc to eglibc-2.15
-  - update Python to Python-2.7.2
-  - update gcc to gcc-4.7.0
+  - update Python to Python-2.7
+  - update gcc to gcc-4.7
   - update openssl to openssl-1.0.1
-  - update xorg-server to xorg-server-1.11
-  - update to Kernel 3.2
-  - update to Mesa-8.0.1
+  - update xorg-server to xorg-server-1.12
+  - update linux to Kernel 3.2
+  - update Mesa to Mesa-8.0
 
 Added functions:
   - PXE netboot support:
@@ -22,10 +22,11 @@ Added functions:
   - CEC support
   - libaacs support
   - automatic framebuffer detection
+  - exFAT filesystem support
 
 Changed functions
-  - change bootsplash from plymouth-lite to fbsplash
   - changed ATV build to use Nvidia binary graphic driver (incl HDMI audio)
+  - added support for native XVBA incl. High@L5.1 support, which replaces VAAPI-XVBA support
 
 Removed functions:
   - remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)

config/arch.arm

@@ -29,23 +29,26 @@
       TARGET_ABI=eabi
       TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
+      SIMD_SUPPORT="no"
       ;;
     cortex-a8)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
       TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
+      SIMD_SUPPORT="yes"
       ;;
     cortex-a9)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
       TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
+      SIMD_SUPPORT="yes"
       ;;
   esac
 
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_SUBARCH -mcpu=$TARGET_CPU -mabi=aapcs-linux $TARGET_EXTRA_FLAGS"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
-  TARGET_LDFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU"
+  TARGET_LDFLAGS="-march=$TARGET_SUBARCH -mtune=$TARGET_CPU"
   GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"

config/arch.i386

@@ -9,3 +9,6 @@
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_CPU -m32"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
+
+# build with SIMD support ( yes / no )
+  SIMD_SUPPORT="yes"

config/arch.x86_64

@@ -9,3 +9,6 @@
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_CPU -m64"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m64"
+
+# build with SIMD support ( yes / no )
+  SIMD_SUPPORT="yes"

config/functions

@@ -186,6 +186,20 @@ fix_module_depends() {
   rm new.modinfo*
 }
 
+check_path() {
+dashes="==========================="
+  if [ "${PWD##/usr}" != "${PWD}" ]; then
+    check_pathmessage="$check_pathmessage\n $dashes$dashes$dashes"
+    check_pathmessage="$check_pathmessage\n ERROR: You try to build inside /usr"
+    check_pathmessage="$check_pathmessage\n $dashes$dashes$dashes"
+    check_pathmessage="$check_pathmessage\n This is not supported with our buildsystem."
+    check_pathmessage="$check_pathmessage\n Please use another dir (for example your \$HOME) to build $DISTRONAME"
+
+    echo -e $check_pathmessage
+    exit 1
+  fi
+}
+
 check_config() {
 dashes="==========================="
   if [ ! -d $PROJECT_DIR/$PROJECT ]; then
@@ -230,6 +244,7 @@ show_config() {
   config_message="$config_message\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)"
   config_message="$config_message\n - FLOAT:\t\t\t\t $TARGET_FLOAT"
   config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU"
+  config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT"
   config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
   config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
@@ -333,6 +348,7 @@ show_config() {
 if [ "$SWAP_SUPPORT" = "yes" ]; then
   config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
 fi
+  config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT"
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 

config/graphic

@@ -1,11 +1,13 @@
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+  SDL_SUPPORT="yes"
+else
+  SDL_SUPPORT="no"
+fi
+
 if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
-  XORG_SUPPORT="no"
-  SDL_SUPPORT="no"
 else
   OPENGL_SUPPORT="yes"
-  XORG_SUPPORT="yes"
-  SDL_SUPPORT="yes"
 fi
 
 if [ "$OPENGLES" = no ]; then
@@ -20,10 +22,8 @@ fi
 
 if [ "$OPENMAX" = no ]; then
   OPENMAX_SUPPORT="no"
-  ALSA_SUPPORT=yes
 else
   OPENMAX_SUPPORT="yes"
-  ALSA_SUPPORT="no"
 fi
 
 if [ "$OPENGL_SUPPORT" = no ]; then
@@ -44,6 +44,12 @@ get_graphicdrivers() {
       XINERAMA_SUPPORT="yes"
     fi
 
+    if [ "$drv" = "fglrx-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
 #      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"

config/optimize

@@ -18,7 +18,9 @@ fi
 
 if [ "$OPTIMIZATIONS" = size ];then
   GCC_OPTIM="$GCC_OPTIM -Os"
-  LD_OPTIM=""
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$LTO_SUPPORT" = yes ];then

config/options

@@ -1,3 +1,6 @@
+# set default language for buildsystem
+  export LC_ALL=C
+
 # determines PROJECT, if not forced by user
 # default is Generic
 if [ -z "$PROJECT" ]; then

config/path

@@ -54,7 +54,14 @@ SED="sed -i"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
 
-  [ -n "$1" ] && PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
+  if [ -n "$1" ]; then
+    PKG_DIR=`find $PACKAGES -type d -name $1 ! -wholename \*\/source\/\* 2>/dev/null`
+    if [ "${PKG_DIR}" != "$(echo $PKG_DIR | tr -d '\n')" ]; then
+      echo "Error - multiple package folders:"
+      echo "$PKG_DIR"
+      exit 1
+    fi
+  fi
 
   [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
   [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
@@ -106,7 +113,9 @@ HOST_PKG_CONFIG_PATH=""
 HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
 HOST_PKG_CONFIG_SYSROOT_DIR=""
 
-export CCACHE_DIR=$HOME/.ccache-openelec
+if [ -z "$CCACHE_DIR" ]; then
+    export CCACHE_DIR=$HOME/.ccache-openelec
+fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
 
@@ -114,9 +123,14 @@ if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
   export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
 fi
 
+if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
+  export LD_LIBRARY_PATH="$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
+fi
+
 VERSION_SUFFIX=$TARGET_ARCH
 . config/functions
 
+check_path
 check_config
 
 setup_toolchain target

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="1.95.4"
+  OPENELEC_VERSION="1.95.6"
 
 # OS_VERSION: OS Version
   OS_VERSION="2.0"

licenses/APSL.txt

@@ -1,4 +1,4 @@
-PPLE PUBLIC SOURCE LICENSE
+APPLE PUBLIC SOURCE LICENSE
 Version 2.0 -  August 6, 2003
 
 Please read this License carefully before downloading this software.  By

licenses/OFL1_1.txt

@@ -0,0 +1,102 @@
+Digitized data copyright (c) 2010 Google Corporation
+	with Reserved Font Arimo, Tinos and Cousine.
+Copyright (c) 2012 Red Hat, Inc.
+	with Reserved Font Name Liberation.
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+
+PREAMBLE The goals of the Open Font License (OFL) are to stimulate
+worldwide development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to provide
+a free and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves.
+The fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works.  The fonts and derivatives,
+however, cannot be released under any other type of license.  The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+ 
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such.
+This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting ? in part or in whole ?
+any of the components of the Original Version, by changing formats or
+by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer
+or other person who contributed to the Font Software.
+
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,in
+   Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the
+   corresponding Copyright Holder. This restriction only applies to the
+   primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must
+   be distributed entirely under this license, and must not be distributed
+   under any other license. The requirement for fonts to remain under
+   this license does not apply to any document created using the Font
+   Software.
+
+
+ 
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+ 
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
+

packages/3rdparty/download/CouchPotato/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="CouchPotato"
-PKG_VERSION="46dbb59"
+PKG_VERSION="806bed6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/CouchPotatoServer/meta

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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
+################################################################################
+
+PKG_NAME="CouchPotatoServer"
+PKG_VERSION="e1d7440"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/RuudBurger/CouchPotatoServer"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="Python SABnzbd"
+PKG_BUILD_DEPENDS="toolchain Python"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="CouchPotatoServer: automated movie downloading."
+PKG_LONGDESC="CouchPotatoServer: automated movie downloading."
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/download/Headphones/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="Headphones"
-PKG_VERSION="298463a"
+PKG_VERSION="d07dc39"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SABnzbd/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="SABnzbd"
-PKG_VERSION="0.6.15"
+PKG_VERSION="0.7.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
+PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
 PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
 PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
 PKG_PRIORITY="optional"

packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.3-001_remove_default_settings-0.3.patch

@@ -1,6 +1,7 @@
-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl
---- SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl	2011-06-08 00:02:34.000000000 +0200
-+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl	2011-06-13 16:37:49.027611932 +0200
+diff --git a/interfaces/Plush/templates/config_folders.tmpl b/interfaces/Plush/templates/config_folders.tmpl
+index 92bb5d1..94c1502 100644
+--- a/interfaces/Plush/templates/config_folders.tmpl
++++ b/interfaces/Plush/templates/config_folders.tmpl
 @@ -76,16 +76,6 @@
            <span class="component-desc">$T('explain-dirscan_speed')</span>
          </label>
@@ -68,9 +69,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABn
    <div class="component-group-last clearfix">
      <div class="component-group-desc">
        <h3>&nbsp;</h3>
-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl
---- SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl	2011-06-08 00:02:34.000000000 +0200
-+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl	2011-06-13 16:35:26.411903234 +0200
+diff --git a/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl
+index 0c293ec..56f9488 100644
+--- a/interfaces/Plush/templates/config_general.tmpl
++++ b/interfaces/Plush/templates/config_general.tmpl
 @@ -14,82 +14,6 @@
      </div>
      <fieldset class="component-group-list">
@@ -154,7 +156,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
          <label class="nocheck clearfix" for="language">
            <span class="component-title">$T('opt-language')</span>
            <select name="language" id="language" id="language" class="select">
-@@ -129,13 +53,6 @@
+@@ -131,13 +55,6 @@
            <span class="component-desc">$T('explain-nzbkey')</span>
          </label>
        </div>
@@ -168,7 +170,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
      </fieldset>
    </div><!-- /component-group1 -->
  
-@@ -152,36 +69,6 @@
+@@ -154,36 +71,6 @@
            <span class="component-desc">$T('explain-enable_https')</span>
          </label>
        </div>
@@ -205,9 +207,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
      </fieldset>
    </div><!-- /component-group2 -->
  
-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl
---- SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl	2011-06-08 00:02:34.000000000 +0200
-+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl	2011-06-13 16:35:26.446903654 +0200
+diff --git a/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl
+index a8f1069..6f50b49 100644
+--- a/interfaces/Plush/templates/config_switches.tmpl
++++ b/interfaces/Plush/templates/config_switches.tmpl
 @@ -12,20 +12,6 @@
        <h3>$T('swtag-general')</h3>
      </div>

packages/3rdparty/download/SickBeard/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="SickBeard"
-PKG_VERSION="b3a7afe"
+PKG_VERSION="b7cf06e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/driver/dvbhdhomerun/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvbhdhomerun"
-PKG_VERSION="0.0.9"
+PKG_VERSION="0.0.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch

@@ -1,10 +1,11 @@
-diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.9/userhdhomerun/hdhomerun_tuner.cpp
---- dvbhdhomerun-0.0.9-orig/userhdhomerun/hdhomerun_tuner.cpp	2011-03-06 21:00:01.000000000 +0100
-+++ dvbhdhomerun-0.0.9/userhdhomerun/hdhomerun_tuner.cpp	2011-12-21 09:12:03.000000000 +0100
-@@ -80,11 +80,29 @@
+diff -uNr dvbhdhomerun-0.0.10-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.10/userhdhomerun/hdhomerun_tuner.cpp
+--- dvbhdhomerun-0.0.10-orig/userhdhomerun/hdhomerun_tuner.cpp	2012-04-28 18:05:40.000000000 +0200
++++ dvbhdhomerun-0.0.10/userhdhomerun/hdhomerun_tuner.cpp	2012-06-05 13:21:16.000000000 +0200
+@@ -97,12 +97,28 @@
           string type(tmp);
           LOG() << "Type of device: " << type << endl;
           if(type == "hdhomerun_dvbt") {
+-            LOG() << "Notice, setting to DVB-C!! Use /etc/dvbhdhomerun to change that." << endl;
 -            m_type = HdhomerunTuner::DVBC;
 +            m_type = HdhomerunTuner::DVBT;
           }
@@ -28,7 +29,6 @@ diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun
 +            LOG() << "Auto detecting tuner type set to \"" << type 
 +                  << "\" based on auto detecting" << endl;
 +         }
-+
        }
        else {
           ERR() << "get_model_str from HDHomeRun failed!" << endl;

packages/3rdparty/driver/sundtek/build

@@ -22,9 +22,16 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/avplay $ADDON_BUILD/$PKG_ADDON_ID/bin
+cd $PKG_BUILD
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
-  cp $PKG_BUILD/presets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
+# binary search & replace (strings must be same length!)
+# mediasrv
+# /etc/sunI»dtek.conf
+# /etc/sundtek.conf
+# libdrv_em28xx.so
+# /etc/sundtek.conf
+# mediaclient
+# /etc/sundtek_diseqc.conf
+perl -pi -e 's|/etc|/tmp|g' opt/bin/mediasrv
+perl -pi -e 's|/etc|/tmp|g' opt/bin/dvb/libdrv_em28xx.so
+perl -pi -e 's|/etc|/tmp|g' opt/bin/mediaclient

packages/3rdparty/driver/sundtek/meta

@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="sundtek"
-#PKG_VERSION="installer_111001.1658"
-PKG_VERSION="installer_development"
+PKG_VERSION="20120525"
 PKG_REV="0"
-PKG_ARCH="any"
+PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
-PKG_URL="http://www.sundtek.de/media/${PKG_NAME}_${PKG_VERSION}.sh"
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${ARCH}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"

packages/3rdparty/driver/sundtek/unpack

@@ -1,77 +0,0 @@
-#!/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
-################################################################################
-
-. config/options $1
-
-mkdir -p $BUILD/${PKG_NAME}_${PKG_VERSION}
-
-(
-  cd $BUILD/${PKG_NAME}_${PKG_VERSION}
-
-  CHAR=`echo $SOURCES | awk '{ch=substr($0, 0, 1); printf("%c", ch); }'`
-  if [ ${CHAR} = "/" ]; then
-    SRC_INSTALLER_ROOT=""
-  else
-    SRC_INSTALLER_ROOT="$ROOT/"
-  fi
-
-  sh ${SRC_INSTALLER_ROOT}$SOURCES/$1/${PKG_NAME}_${PKG_VERSION}.sh -e >/dev/null 2>&1
-
-  rm chk* installer.tar.gz
-  rm -r 32bit23 arm* dreambox mips* openwrtmipsr2 ppc*
-)
-
-[ "$TARGET_ARCH" = "i386" ] && ARCH_DIR=32bit
-[ "$TARGET_ARCH" = "x86_64" ] && ARCH_DIR=64bit
-
-SUNDTEK_ROOT=$BUILD/${PKG_NAME}_${PKG_VERSION}/rootsys
-
-mkdir -p $SUNDTEK_ROOT
-tar xzf $BUILD/${PKG_NAME}_${PKG_VERSION}/$ARCH_DIR/installer.tar.gz -C $SUNDTEK_ROOT
-
-# fix permissions (on mediasrv binary)
-chmod 755 $SUNDTEK_ROOT/opt/bin/*
-
-# binary search & replace (strings must be same length!)
-# mediasrv
-# /etc/sunI<6E>dtek.conf
-# /etc/sundtek.conf
-# libdrv_em28xx.so
-# /etc/sundtek.conf
-# mediaclient
-# /etc/sundtek_diseqc.conf
-#perl -pi -e 's|\x2F\x65\x74\x63\x2F\x73\x75\x6E\x49\xBB\x64\x74\x65\x6B\x2E\x63\x6F\x6E\x66|\x2F\x74\x6D\x70\x2F\x73\x75\x6E\x49\xBB\x64\x74\x65\x6B\x2E\x63\x6F\x6E\x66|g' $SUNDTEK_ROOT/opt/bin/mediasrv
-#perl -pi -e 's|/etc/sundtek.conf|/tmp/sundtek.conf|g' $SUNDTEK_ROOT/opt/bin/mediasrv
-#perl -pi -e 's|/etc/sundtek.conf|/tmp/sundtek.conf|g' $SUNDTEK_ROOT/opt/bin/dvb/libdrv_em28xx.so
-#perl -pi -e 's|/etc/sundtek_diseqc.conf|/tmp/sundtek_diseqc.conf|g' $SUNDTEK_ROOT/opt/bin/mediaclient
-
-perl -pi -e 's|/etc|/tmp|g' $SUNDTEK_ROOT/opt/bin/mediasrv
-perl -pi -e 's|/etc|/tmp|g' $SUNDTEK_ROOT/opt/bin/dvb/libdrv_em28xx.so
-perl -pi -e 's|/etc|/tmp|g' $SUNDTEK_ROOT/opt/bin/mediaclient
-
-if [ "$PKG_VERSION" = "installer_development" ]; then
-  wget -q -t 3 -T 3 -O $SUNDTEK_ROOT/sundtek_version.html http://support.sundtek.com/index.php/topic,708.0.html
-else
-  cat >$SUNDTEK_ROOT/sundtek_version.html << MYDATA
-<html><body>${PKG_NAME}_${PKG_VERSION}.sh</body></html>
-MYDATA
-fi

packages/3rdparty/lib/ffmpeg/build

@@ -1,65 +0,0 @@
-#!/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
-
-cd $PKG_BUILD
-
-./configure --prefix=/usr \
-            --cross-prefix=$TARGET_PREFIX \
-            --arch=$TARGET_ARCH \
-            --cpu=$TARGET_CPU \
-            --sysroot=$SYSROOT_PREFIX \
-            --sysinclude="$SYSROOT_PREFIX/usr/include" \
-            --nm="$NM" \
-            --ar="$AR" \
-            --as="$CC" \
-            --cc="$CC" \
-            --ld="$CC" \
-            --host-cc="$HOST_CC" \
-            --host-cflags="$HOST_CFLAGS" \
-            --host-ldflags="$HOST_LDFLAGS" \
-            --host-libs="" \
-            --extra-cflags="$CFLAGS" \
-            --extra-ldflags="$LDFLAGS" \
-            --build-suffix="" \
-            --target-os="linux" \
-            --enable-cross-compile \
-            --disable-static \
-            --enable-shared \
-            --disable-ffmpeg \
-            --disable-ffplay \
-            --disable-ffprobe \
-            --disable-ffserver \
-            --enable-gpl \
-            --enable-postproc \
-            --enable-swscale \
-            --enable-avfilter \
-            --enable-pthreads \
-            --disable-debug \
-            --enable-runtime-cpudetect \
-            --disable-crystalhd \
-            --enable-vdpau \
-            --disable-vaapi
-
-make
-$MAKEINSTALL

packages/3rdparty/lib/libccid/build

@@ -1,5 +1,25 @@
 #!/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
+################################################################################
+
 . config/options $1
 
 cd $PKG_BUILD

packages/3rdparty/lib/libccid/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="libccid"
-PKG_VERSION="1.4.5"
+PKG_VERSION="1.4.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3672/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3730/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain pcsc-lite"
 PKG_PRIORITY="optional"

packages/3rdparty/lib/libccid/rename

@@ -1,5 +1,25 @@
 #!/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
+################################################################################
+
 . config/options $1
 
 cd $BUILD

packages/3rdparty/lib/libhdhomerun/build

@@ -1,5 +1,25 @@
 #!/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
+################################################################################
+
 . config/options $1
 
 cd $PKG_BUILD

packages/3rdparty/lib/libhdhomerun/rename

@@ -1,5 +1,25 @@
 #!/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
+################################################################################
+
 . config/options $1
 
 cd $BUILD

packages/3rdparty/lib/libpcap/build

@@ -28,6 +28,7 @@ cd $BUILD/$1*
 # forcing it
 sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' configure
 
+LIBS="-lpthread" \
 ./configure \
        --host=$TARGET_NAME \
        --build=$HOST_NAME \

packages/3rdparty/lib/libpcap/meta

@@ -1,5 +1,25 @@
+################################################################################
+#      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
+################################################################################
+
 PKG_NAME="libpcap"
-PKG_VERSION="1.1.1"
+PKG_VERSION="1.3.0"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
 PKG_REV=1
@@ -8,5 +28,6 @@ PKG_PRIORITY=optional
 PKG_SECTION=libs
 PKG_SHORTDESC="system interface for user-level packet capture"
 PKG_LONGDESC="libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc."
+PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"

packages/3rdparty/lib/libxslt/build

@@ -36,6 +36,7 @@ fi
              --enable-shared \
              $CONFIG_LIBXML \
              --disable-ipv6 \
+             --without-python \
              --without-crypto
 
 make

packages/3rdparty/lib/xine-lib/build

@@ -26,6 +26,8 @@ VDR_GUI_ADDON_DIR="/storage/.xbmc/addons/script.video.vdr-gui"
 
 cd $PKG_BUILD
 
+strip_lto
+
 ./autogen.sh --host=$TARGET_NAME \
              --build=$HOST_NAME \
              --with-external-ffmpeg \

packages/3rdparty/multimedia/vdr-dynamite/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-dynamite"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="vdr udev"
-PKG_BUILD_DEPENDS="toolchain vdr udev"
+PKG_DEPENDS="vdr systemd"
+PKG_BUILD_DEPENDS="toolchain vdr systemd"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-dynamite turns the dvbdevices into hotpluggable devices. They can be dynamically attached and detached while vdr is running."

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch

@@ -0,0 +1,35 @@
+From c7cd9b614762103a95f3da27783e03ce115d43fb Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sun, 20 May 2012 16:05:51 +0300
+Subject: [PATCH] vdr-iptv: skip header processing
+
+---
+ protocolhttp.c |   12 +-----------
+ 1 files changed, 1 insertions(+), 11 deletions(-)
+
+diff --git a/protocolhttp.c b/protocolhttp.c
+index de50f64..45c5425 100644
+--- a/protocolhttp.c
++++ b/protocolhttp.c
+@@ -140,17 +140,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
+     memset(buf, '\0', sizeof(buf));
+     if (!GetHeaderLine(buf, sizeof(buf), lineLength))
+        return false;
+-    if (!responseFound && sscanf(buf, fmt, &version, &response) != 2) {
+-       error("Expected HTTP header not found\n");
+-       continue;
+-       }
+-    else
+-       responseFound = true;
+-    // Allow only 'OK' and 'Partial Content'
+-    if ((response != 200) && (response != 206)) {
+-       error("Invalid HTTP response (%d): %s\n", response, buf);
+-       return false;
+-       }
++      responseFound = true;
+     }
+   return true;
+ }
+-- 
+1.7.2.5
+

packages/3rdparty/multimedia/vdr-plugin-streamdev/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-streamdev"
-PKG_VERSION="8719007"
+PKG_VERSION="6a47e20"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-sc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-sc"
-PKG_VERSION="605"
+PKG_VERSION="613"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-xmltv2vdr/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
 PKG_URL="http://projects.vdr-developer.org/attachments/download/946/${PKG_NAME}-${PKG_VERSION}.tgz"
-PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt enca"
+PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt"
 PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"

packages/3rdparty/multimedia/vdr/build

@@ -32,6 +32,7 @@ PLUGINLIBDIR = /usr/lib/vdr
 VIDEODIR = /storage/videos
 CONFDIR = /storage/.config/vdr
 LOCDIR = /usr/share/locale
+LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
 
 NO_KBD=yes
 VDR_USER=root

packages/3rdparty/multimedia/vdr/meta

@@ -26,8 +26,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
 PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="fontconfig freetype fribidi libcap libjpeg-turbo"
-PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo"
+PKG_DEPENDS="fontconfig freetype libcap"
+PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/3rdparty/system/pcsc-lite/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="1.8.2"
+PKG_VERSION="1.8.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3695/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3706/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libusb"
 PKG_PRIORITY="optional"

packages/3rdparty/web/pycurl/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://pycurl.sourceforge.net/"
 PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python distribute curl"
-PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross curl"
+PKG_DEPENDS="Python curl"
+PKG_BUILD_DEPENDS="toolchain Python distutilscross curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/web"
 PKG_SHORTDESC="pycurl: a Python interface to libcurl"

packages/3rdparty/web/tntnet/build

@@ -47,6 +47,8 @@ cd ..
 
 setup_toolchain target
 
+strip_lto
+
 mkdir -p .build-target && cd .build-target
 
 ../configure --host=$TARGET_NAME \

packages/addons/debugging/tools/evtest/addon

@@ -23,5 +23,5 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest.bin
-  cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest-capture.bin
+  cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/debugging/tools/evtest/changelog.txt

@@ -1,3 +1,6 @@
+2.1.3
+- update to evtest-1.30
+
 2.1.2
 - cleanup
 

packages/addons/debugging/tools/evtest/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="evtest"
-PKG_VERSION="1.29"
-PKG_REV="2"
+PKG_VERSION="1.30"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,6 @@
+2.1.2
+- dvbhdhomerun upgraded to 0.0.10
+
 2.1.1
 - rebuild for addon version 2.1
 

packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample

@@ -1,16 +1,25 @@
-#
-# /tmp/dvbhdhomerun
-#
-# Types can any of:
+# Remember to exchange the XXXXYYYY-Z with the serial number of your HDHomeRun
+# tuner:
+
+# Auto detect tuner type is not possible in all cases, so you can force it
 # DVB-C
 # DVB-T
 # ATSC
 
-# You can change the tuner type for each tuner on your HDHomeRun by
-# exchanging the 1210E3DC-X with the serial number of your tuner:
+[XXXXYYYY-0]
+tuner_type=DVB-T
 
-#[12109F6E-0]
-#tuner_type=DVB-T
+[XXXXYYYY-1]
+tuner_type=DVB-C
 
-#[12109F6E-1]
-#tuner_type=DVB-T
+# You can use a full name including tuner ID. Meaning the tuner will appear as
+# "HDHomeRun DVB-C 1234EA3D-0" instead of just "HDHomeRun DVB-C" in for example
+# TVHeadend.
+
+[XXXXYYYY-0]
+use_full_name=true
+
+# You can disable certain tuners. As default all detected hdhomeruns are used
+
+[XXXXYYYY-2]
+disable=true

packages/addons/driver/hdhomerun/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="2.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -37,14 +37,24 @@ if [ -z "$(pidof userhdhomerun)" ]; then
     ln -s $ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
   fi
 
+  # could be useful
+  if [ -f $ADDON_HOME/extra-wait.sh ]; then
+    sh $ADDON_HOME/extra-wait.sh
+  fi
+  
   # if not already added
   modprobe dvb_hdhomerun
   modprobe dvb_hdhomerun_fe
 
+  # could be useful
+  if [ -f $ADDON_HOME/extra-wait.sh ]; then
+    sh $ADDON_HOME/extra-wait.sh
+  fi
+
   mkdir -p /var/log/
   rm -f /var/log/dvbhdhomerun.log
   
-  export LD_LIBRARY_PATH=$ADDON_DIR/lib:$LD_LIBRARY_PATH
+  export LD_LIBRARY_PATH=$ADDON_DIR/lib
 
   userhdhomerun -f
   # how much time should we wait?

packages/addons/driver/sundtek-mediatv/addon

@@ -25,10 +25,8 @@
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
   cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
 
-  cp -P $ROOT/$BUILD/sundtek_*/rootsys/sundtek_version.html $ADDON_BUILD/$PKG_ADDON_ID/
-  
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-  cp -Pa $ROOT/$BUILD/sundtek_*/rootsys/opt/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  cp -Pa $ROOT/$BUILD/sundtek-*/opt/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -Pa $ROOT/$BUILD/sundtek_*/rootsys/opt/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  cp -Pa $ROOT/$BUILD/sundtek-*/opt/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,10 @@
+2.1.3
+  support for network tuner
+  
+2.1.2
+  support for multiple Sundtek tuners
+  support for working with other tuners (kernel drivers)
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/driver/sundtek-mediatv/config/sundtek.conf

@@ -5,9 +5,18 @@
 # Do not change this line!
 device_attach=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/bin/device-attached.sh
 
+# network tuner IP address (OpenELEC specific)
+#network_tuner_ip=xxx.xxx.xxx.xxx
+
 # Infrared Control Support is disabled/enabled
 ir_disabled=1
 
+# trigger device_attach only once if more devices is used
+bulk_notification=on
+
+# Lowest adapter number to start with, e.g. /dev/dvb/adapter5/frontend0
+#first_adapter=5
+
 # Get adapter serial number with mediaclient -e
 # or look into file adapter_serial_number.txt
 [SERIALNUMBER]

packages/addons/driver/sundtek-mediatv/config/sundtek.conf.full

@@ -3,73 +3,104 @@
 #
 # ----- GLOBAL SECTION -----
 #Set loglevel for logging to /var/log/mediasrv.log
-#loglevel=[off|max]
-#default: min
-#max .. little bit more debug
-#loglevel=off
-loglevel=max
+#loglevel=[off|max]			#default: min
+					#max .. little bit more debug
+#bulk_notification[on|off]              #default off, bulk_notification will only trigger device_attach once
+                                        #after the the first device scan when the driver is started up
+                                        #after this first scan, the notification will be triggered
+                                        #normally again for each device.
+                                        #
+                                        #for example when 2 devices are attached to the system only one
+                                        #notification will be triggered initially, any at a later time
+                                        #attached device will generate another device_attach notification
+                                        #by default each device will call the script which is set up with
+                                        #device_attach
+#use_hwpidfilter=[on|off]               #For DVB-C, DVB-T, DVB-S/S2
+                                        #enable PID filter, please be careful with that, there are only 15 HW Pid filters available
+                                        #when more than 15 pids are set up the pid filter will be disabled automatically
 
-#Call attach script when new device appears
-#device_attach=[PATH_TO_SCRIPT] [PARAMETER|DEVID] #"DEVID" will automatically be replaced with the device ID
-device_attach=/opt/bin/restartAddons.sh
+#dmhwpidfilter=[on|off]                 #default on, in some cases off might be useful to disable hw pid filter for settopboxes
+                                        #if you get a black image when capturing a TV channel and watching another channel on the
+                                        #same transponder - try this option and reboot
 
-#Call detach script when device disappears
-#device_detach=[PATH_TO_SCRIPT] [PARAMETER|DEVID] #"DEVID" will automatically be replaced with the device ID
+#usb_transaction_delay=[0-20]           #throttle the USB setup transactions, this can solve problems with weak USB stacks for
+                                        #example for embedded boards, unit is milliseconds
 
-#Infrared Control Support is disabled/disabled
-ir_disabled=1
+#usb_timeout=[0 - N]                    #USB timeout for each transaction in milliseconds, 0 default infinite
+#voltage_tone_off=[1 or 0]              #0 .. default, normal behaviour
+                                        #1 .. force DVB-S/S2 to not use any Voltage or Tone (ignore any user parameters)
+                                        
+#ir_disabled=[1 or 0]                   #0 .. enable remote control polling, the driver will permanently check for remote control keys
+                                        #1 .. disable remote control polling, might fix bugs with weak USB stacks on embedded boards
 
+#
 #Enable listening on network
-#enablenetwork=[on|off]
-#default: off
+#enablenetwork=[on|off]			#default: off
 
 #Lowest adapter number to start with, e.g. /dev/dvb/adapter5/frontend0
 #first_adapter=5
 
+#Lowest videodevice number to start with, e.g. /dev/video5
+#first_videodev=5
+
+#Call attach script when new device appears
+#device_attach=[PATH_TO_SCRIPT] [PARAMETER|DEVID]	#"DEVID" will automatically be replaced with the device ID
+
+#Call detach script when device disappears
+#device_detach=[PATH_TO_SCRIPT] [PARAMETER|DEVID]	#"DEVID" will automatically be replaced with the device ID
+
+#Dreambox especially for DM800HD (not SE!)
+#vtuner_acceleration=[on|off]                           #default off, accelerate Dreambox 800HD datatransfer between USB Stick and
+                                                        #DM800HD
 
 # ----- Section for adapter with [SERIALNUMBER] -----
 #Get adapter serial number with /opt/bin/mediaclient -e
 #[SERIALNUMBER]
 
 #Description register as dreambox tuner
-#dreambox_support_fe1=[on|off]
-#default: off
+#dreambox_support_fe1=[on|off]		#default: off
 
 #Infrared protocol to use
-#ir_protocol=[RC5|NEC|RC6]
-#default: NEC
+#ir_protocol=[RC5|NEC|RC6]			#default: NEC
 
 #Keymap to use, e.g. "/lib/udev/rc_keymaps/vp702x"
-#rcmap=[PATH_TO_KEYMAP]
-#default: keymap which comes with the device
+#rcmap=[PATH_TO_KEYMAP]			#default: keymap which comes with the device
 
 #Choose initial DVB mode for hybrid DVB-T/DVB-C devices only
 #initial_dvb_mode=[DVBC|DVBT]
 
 #Call attach script when new device appears
-#device_attach=[PATH_TO_SCRIPT] [PARAMETER|DEVID]
-#"DEVID" will automatically be replaced with the device ID
+#device_attach=[PATH_TO_SCRIPT] [PARAMETER|DEVID]	#"DEVID" will automatically be replaced with the device ID
 
 #Call detach script when device disappears
-#device_detach=[PATH_TO_SCRIPT] [PARAMETER|DEVID]
-#"DEVID" will automatically be replaced with the device ID
+#device_detach=[PATH_TO_SCRIPT] [PARAMETER|DEVID]	#"DEVID" will automatically be replaced with the device ID
 
-#Volume level
-#volume=[0-127] #default: 118
+#disable_atv=[0|1]                                      #disable initialization of analogTV Frontend
+#Initial Audio Volume level for DVB-C/T Hybrid devices
+#volume=[0-127]				#default: 118
 
 
 # WSS callback (see http://en.wikipedia.org/wiki/Widescreen_signaling)
 # trigger script when the videoformat changes between 16:9 or 4:3
 #wss_callback=[scriptname]
-# WSS_4_3_FULL
-# WSS_14_9_LETTERBOX_CENTRE
-# WSS_14_9_LETTERBOX_TOP
-# WSS_16_9_LETTERBOX_CENTRE
-# WSS_16_9_LETTERBOX_TOP
-# WSS_16_9_LETTERBOX_DEEPER
-# WSS_14_9_FULL_HEIGHT_4_3
-# WSS_16_9_FULL_HEIGHT_16_9
-# WSS_UNABLE_TO_DEMODULATE
+#	WSS_4_3_FULL
+#	WSS_14_9_LETTERBOX_CENTRE
+#	WSS_14_9_LETTERBOX_TOP
+#	WSS_16_9_LETTERBOX_CENTRE
+#	WSS_16_9_LETTERBOX_TOP
+#	WSS_16_9_LETTERBOX_DEEPER
+#	WSS_14_9_FULL_HEIGHT_4_3
+#	WSS_16_9_FULL_HEIGHT_16_9
+#	WSS_UNABLE_TO_DEMODULATE
 
 #Timeout in ms after that WSS_UNABLE_TO_DEMODULATE will be called
-#wss_demodulation_timeout=[MILLISECONDS]
+#wss_demodulation_timeout=[MILLISECONDS][/code]
+
+#vtuner_skip0=vtuner0                  # skip /dev/misc/vtuner0 can also be vtunerN
+#vtuner_skip1=vtuner1                  # skip /dev/misc/vtuner1 can also be vtunerN
+
+#fe_helper=/path/to/channellist        # override frequency setup and use parameters from channellist
+                                       # VDR channellists can be used here (eg. created by w_scan)
+                                       # this somewhat guarantees high speed channel switching
+                                       # when used with a lousy player
+                                       # Astra 19.2 Channellist: 1)

packages/addons/driver/sundtek-mediatv/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="2.0"
-PKG_REV="1"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh

@@ -25,6 +25,9 @@
 ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
 SUNDTEK_READY="/var/run/sundtek.ready"
+ADAPTER_WAIT_TIME=120
+
+NETWORK_TUNER_IP=$(awk '/^network_tuner_ip=/ {split($0,a,"="); printf("%s", a[2])}' "$ADDON_HOME/sundtek.conf")
 
 mkdir -p $ADDON_HOME
 
@@ -35,36 +38,48 @@ fi
 SUNDTEK_ARG="--pluginpath=$ADDON_DIR/bin --daemon"
 
 if [ -z "$(pidof mediasrv)" ]; then
+  rm -f /var/log/mediasrv.log
+  rm -f /var/log/mediaclient.log
   rm -f $SUNDTEK_READY
   rm -f /tmp/sundtek.conf
+
   ln -sf $ADDON_HOME/sundtek.conf /tmp/sundtek.conf
   mediasrv $SUNDTEK_ARG
 
-  # wait for device to attach
+  if [ -n "$NETWORK_TUNER_IP" ]; then
+    logger -t Sundtek "### Trying to connect Sundtek device $NETWORK_TUNER_IP ###"
+    mediaclient --mount=$NETWORK_TUNER_IP
+  else
+    logger -t Sundtek "### Trying to attach Sundtek device ###"
+  fi
+
+  # wait for device to get attached or connected
   cnt=0
   while [ 1 ]; do
+    if [ -n "$NETWORK_TUNER_IP" -a -e /dev/dvb/adapter*/frontend* ]; then
+      sh $ADDON_DIR/bin/device-attached.sh
+    fi
+
     if [ -f $SUNDTEK_READY ]; then
       rm -f $SUNDTEK_READY
       break
-    else if [ "$cnt" = "120" ]; then
-      logger -t Tvheadend "### No Sundtek device attached in 60 sec ###"
+    elif [ "$cnt" = "$ADAPTER_WAIT_TIME" ]; then
+      logger -t Sundtek "### No Sundtek device attached or connected ###"
       return
     fi
-    fi
     let cnt=cnt+1
     usleep 500000
   done
 
-  export LD_LIBRARY_PATH=$ADDON_DIR/lib:$LD_LIBRARY_PATH
-  export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so:$LD_PRELOAD
-
 (
   # save adapter serial number in background
   sleep 4
   serial_number_old=$(cat $ADDON_HOME/adapters.txt 2>/dev/null)
-  serial_number_new=$(mediaclient -e | awk '/ID:/ {print $2}')
+  serial_number_new=$(mediaclient -e | awk '/device / {print $0} /ID:/ {print $2}')
   if [ "$serial_number_old" != "$serial_number_new" ]; then
     echo "$serial_number_new" >$ADDON_HOME/adapters.txt
   fi
 )&
 fi
+
+export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so:$LD_PRELOAD

packages/addons/multimedia/libav/changelog.txt

@@ -1,31 +0,0 @@
-2.1.1
-- update to addon version 2.1
-- update to libav-0.8.1
-
-2.0.2
-- add 'x11grab' input support
-
-2.0.1
-- add 'ffplay' binary
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.1
-- depends on xbmc.python API 2.0
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- update to libav-0.7.2
-- prepare for OpenELEC-1.0 release
-
-0.99.3
-- update to libav-0.7 (final)
-
-0.99.2
-- change icon
-
-0.99.1
-- initial addon based on libav-0.7_beta2

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,3 +1,6 @@
+2.1.3
+- update to makemkv-1.7.6
+
 2.1.2
 - update to makemkv-1.7.4
 

packages/addons/multimedia/makemkv/meta

@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="1.7.4"
-PKG_REV="2"
+PKG_VERSION="1.7.6"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
-PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_oss.tar.gz"
-PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_bin.tar.gz"
+PKG_URL="http://www.makemkv.com/download/${PKG_NAME}-oss-${PKG_VERSION}.tar.gz"
+PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="openssl"
-PKG_BUILD_DEPENDS="toolchain openssl"
+PKG_BUILD_DEPENDS="toolchain openssl expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way."

packages/addons/multimedia/makemkv/unpack

@@ -27,8 +27,8 @@ require_eglibc $1
 [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
 
 mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION
-mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_oss $BUILD/$PKG_NAME-$PKG_VERSION/lib
-mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_bin $BUILD/$PKG_NAME-$PKG_VERSION/bin
+mv $BUILD/${PKG_NAME}-oss-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/lib
+mv $BUILD/${PKG_NAME}-bin-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/bin
 
 echo "### Applying upstream patches ###"
 

packages/addons/multimedia/w_scan/changelog.txt

@@ -1,3 +1,6 @@
+2.1.2
+- update to w_scan-20120605
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/multimedia/w_scan/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="w_scan"
-PKG_VERSION="20120128"
-PKG_REV="1"
+PKG_VERSION="20120605"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

packages/addons/networking/analyzer/tcpdump/changelog.txt

@@ -1,3 +1,7 @@
+2.1.3
+- updated to tcpdump-4.3.0
+- updated to libpcap-1.3.0
+
 2.1.2
 - rebuild
 

packages/addons/networking/analyzer/tcpdump/meta

@@ -1,8 +1,8 @@
 PKG_NAME="tcpdump"
-PKG_VERSION="4.1.1"
+PKG_VERSION="4.3.0"
+PKG_REV="3"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
-PKG_REV=2
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libpcap"
 PKG_PRIORITY=optional

packages/addons/service/downloadmanager/SABnzbd-Suite/addon

@@ -44,5 +44,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
   cp -PR $BUILD/CouchPotato-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
 
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer
+  cp -PR $BUILD/CouchPotatoServer-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer
+
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Headphones
   cp -PR $BUILD/Headphones-*/* $ADDON_BUILD/$PKG_ADDON_ID/Headphones

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,5 +1,27 @@
+2.1.8
+- update to SABnzbd-0.7.3
+- update to CouchPotato-806bed6
+- update to CouchPotatoServer-e1d7440
+- update to Headphones-d07dc39
+- update to SickBeard-b7cf06e
+
+2.1.7
+- update to SABnzbd-0.7.0
+- update to Headphones-89c2a8c
+- perform "Keep awake while downloading" and "Wake up periodically" only if sabnzbd is enabled
+- updated Turkish translation
+
+2.1.6
+- fixed another startup bug
+
+2.1.5
+- fixed bug in startup (caused by couchpotatoserver / configobj)
+- add possibilty to start / stop addon from addon manager with enable / disable
+
 2.1.4
 - fixes bug in sleep control
+- added couchpotato v2
+- added ability to enable or disable parts of the Suite from the addon settings page
 
 2.1.3
 - fix so python dont steal xbmc's webserver port (again)

packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml

@@ -5,4 +5,9 @@
     <setting id="SABNZBD_KEEP_AWAKE" value="false" />
     <setting id="SABNZBD_PERIODIC_WAKE" value="false" />
     <setting id="SABNZBD_WAKE_AT" value="1" />
+    <setting id="SABNZBD_LAUNCH" value="true" />
+    <setting id="SICKBEARD_LAUNCH" value="true" />
+    <setting id="COUCHPOTATO_LAUNCH" value="true" />
+    <setting id="COUCHPOTATO_VERSION" value="0" />
+    <setting id="HEADPHONES_LAUNCH" value="true" />
 </settings>

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -20,13 +20,13 @@
 
 PKG_NAME="SABnzbd-Suite"
 PKG_VERSION="2.1"
-PKG_REV="3"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS="Python"
-PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard CouchPotato Headphones"
+PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard CouchPotato Headphones CouchPotatoServer"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard, Couchpotato and Headphones in one Addon"

packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py

@@ -26,9 +26,11 @@ import xbmc
 import signal
 import subprocess
 import urllib2
+import hashlib
 from configobj import ConfigObj
 from xml.dom.minidom import parseString
 import logging
+import traceback
 
 logging.basicConfig(filename='/var/log/sabnzbd-suite.log',
                     filemode='w',
@@ -68,8 +70,9 @@ pDefaultSuiteSettings = os.path.join(pAddon, 'settings-default.xml')
 pSuiteSettings        = os.path.join(pAddonHome, 'settings.xml')
 pXbmcSettings         = '/storage/.xbmc/userdata/guisettings.xml'
 pSabNzbdSettings      = os.path.join(pAddonHome, 'sabnzbd.ini')
-pSickBeardSettings    = os.path.join(pAddonHome, 'config.ini')
+pSickBeardSettings    = os.path.join(pAddonHome, 'sickbeard.ini')
 pCouchPotatoSettings  = os.path.join(pAddonHome, 'couchpotato.ini')
+pCouchPotatoServerSettings  = os.path.join(pAddonHome, 'couchpotatoserver.ini')
 pHeadphonesSettings   = os.path.join(pAddonHome, 'headphones.ini')
 
 # directories
@@ -87,9 +90,11 @@ pPylib                = os.path.join(pAddon, 'pylib')
 sabnzbd               = ['python', os.path.join(pAddon, 'SABnzbd/SABnzbd.py'),
                          '-d', '-f',  pSabNzbdSettings, '-l 0']
 sickBeard             = ['python', os.path.join(pAddon, 'SickBeard/SickBeard.py'),
-                         '--daemon', '--datadir', pAddonHome]
+                         '--daemon', '--datadir', pAddonHome, '--config', pSickBeardSettings]
 couchPotato           = ['python', os.path.join(pAddon, 'CouchPotato/CouchPotato.py'),
                          '-d', '--datadir', pAddonHome, '--config', pCouchPotatoSettings]
+couchPotatoServer     = ['python', os.path.join(pAddon, 'CouchPotatoServer/CouchPotato.py'),
+                         '--daemon', '--pid_file', os.path.join(pAddonHome, 'couchpotato.pid'), '--config_file', pCouchPotatoServerSettings]
 headphones            = ['python', os.path.join(pAddon, 'Headphones/Headphones.py'),
                          '-d', '--datadir', pAddonHome, '--config', pHeadphonesSettings]
 
@@ -117,7 +122,10 @@ if firstLaunch:
         shutil.copy(pDefaultSuiteSettings, pSuiteSettings)
     # make utilities executable
     for utility in {'par2','unrar','unzip'}:
-        os.chmod(os.path.join(pAddon, 'bin', utility), 0755)
+        try:
+            os.chmod(os.path.join(pAddon, 'bin', utility), 0755)
+        except:
+            pass
 
 # read addon and xbmc settings
 # ----------------------------
@@ -127,10 +135,31 @@ fSuiteSettings = open(pSuiteSettings, 'r')
 data = fSuiteSettings.read()
 fSuiteSettings.close
 suiteSettings = parseString(data)
-user             = getAddonSetting(suiteSettings, 'SABNZBD_USER')
-pwd              = getAddonSetting(suiteSettings, 'SABNZBD_PWD')
-host             = getAddonSetting(suiteSettings, 'SABNZBD_IP')
-sabNzbdKeepAwake = getAddonSetting(suiteSettings, 'SABNZBD_KEEP_AWAKE')
+user                 = getAddonSetting(suiteSettings, 'SABNZBD_USER')
+pwd                  = getAddonSetting(suiteSettings, 'SABNZBD_PWD')
+host                 = getAddonSetting(suiteSettings, 'SABNZBD_IP')
+sabNzbdKeepAwake     = getAddonSetting(suiteSettings, 'SABNZBD_KEEP_AWAKE')
+sabnzbd_launch       = getAddonSetting(suiteSettings, 'SABNZBD_LAUNCH')
+sickbeard_launch     = getAddonSetting(suiteSettings, 'SICKBEARD_LAUNCH')
+couchpotato_launch   = getAddonSetting(suiteSettings, 'COUCHPOTATO_LAUNCH')
+couchpotato_version  = getAddonSetting(suiteSettings, 'COUCHPOTATO_VERSION')
+headphones_launch    = getAddonSetting(suiteSettings, 'HEADPHONES_LAUNCH')
+
+# merge defaults
+fDefaultSuiteSettings = open(pDefaultSuiteSettings, 'r')
+data = fDefaultSuiteSettings.read()
+fDefaultSuiteSettings.close
+DefaultSuiteSettings = parseString(data)
+if not sabnzbd_launch:
+    sabnzbd_launch       = getAddonSetting(DefaultSuiteSettings, 'SABNZBD_LAUNCH')
+if not sickbeard_launch:
+    sickbeard_launch     = getAddonSetting(DefaultSuiteSettings, 'SICKBEARD_LAUNCH')
+if not couchpotato_launch:
+    couchpotato_launch   = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_LAUNCH')
+if not couchpotato_version:
+    couchpotato_version  = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_VERSION')
+if not headphones_launch:
+    headphones_launch    = getAddonSetting(DefaultSuiteSettings, 'HEADPHONES_LAUNCH')
 
 # XBMC
 fXbmcSettings = open(pXbmcSettings, 'r')
@@ -154,208 +183,299 @@ except:
 signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 os.environ['PYTHONPATH'] = str(os.environ.get('PYTHONPATH')) + ':' + pPylib
 
-# write SABnzbd settings
-# ----------------------
+# SABnzbd start
+try:
+    # write SABnzbd settings
+    # ----------------------
+    sabNzbdConfig = ConfigObj(pSabNzbdSettings,create_empty=True)
+    defaultConfig = ConfigObj()
+    defaultConfig['misc'] = {}
+    defaultConfig['misc']['disable_api_key']   = '0'
+    defaultConfig['misc']['check_new_rel']     = '0'
+    defaultConfig['misc']['auto_browser']      = '0'
+    defaultConfig['misc']['username']          = user
+    defaultConfig['misc']['password']          = pwd
+    defaultConfig['misc']['port']              = '8081'
+    defaultConfig['misc']['https_port']        = '9081'
+    defaultConfig['misc']['https_cert']        = 'server.cert'
+    defaultConfig['misc']['https_key']         = 'server.key'
+    defaultConfig['misc']['host']              = host
+    defaultConfig['misc']['web_dir']           = 'Plush'
+    defaultConfig['misc']['web_dir2']          = 'Plush'
+    defaultConfig['misc']['web_color']         = 'gold'
+    defaultConfig['misc']['web_color2']        = 'gold'
+    defaultConfig['misc']['log_dir']           = 'logs'
+    defaultConfig['misc']['admin_dir']         = 'admin'
+    defaultConfig['misc']['nzb_backup_dir']    = 'backup'
+    defaultConfig['misc']['script_dir']        = 'scripts'
 
-sabNzbdConfig = ConfigObj(pSabNzbdSettings,create_empty=True)
-defaultConfig = ConfigObj()
-defaultConfig['misc'] = {}
-defaultConfig['misc']['disable_api_key']   = '0'
-defaultConfig['misc']['check_new_rel']     = '0'
-defaultConfig['misc']['auto_browser']      = '0'
-defaultConfig['misc']['username']          = user
-defaultConfig['misc']['password']          = pwd
-defaultConfig['misc']['port']              = '8081'
-defaultConfig['misc']['https_port']        = '9081'
-defaultConfig['misc']['https_cert']        = 'server.cert'
-defaultConfig['misc']['https_key']         = 'server.key'
-defaultConfig['misc']['host']              = host
-defaultConfig['misc']['web_dir']           = 'Plush'
-defaultConfig['misc']['web_dir2']          = 'Plush'
-defaultConfig['misc']['web_color']         = 'gold'
-defaultConfig['misc']['web_color2']        = 'gold'
-defaultConfig['misc']['log_dir']           = 'logs'
-defaultConfig['misc']['admin_dir']         = 'admin'
-defaultConfig['misc']['nzb_backup_dir']    = 'backup'
-defaultConfig['misc']['script_dir']        = 'scripts'
+    if firstLaunch:
+        defaultConfig['misc']['download_dir']  = pSabNzbdIncomplete
+        defaultConfig['misc']['complete_dir']  = pSabNzbdComplete
+        servers = {}
+        servers['localhost'] = {}
+        servers['localhost']['host']           = 'localhost'
+        servers['localhost']['port']           = '119'
+        servers['localhost']['enable']         = '0'
+        categories = {}
+        categories['tv'] = {}
+        categories['tv']['name']               = 'tv'
+        categories['tv']['script']             = 'sabToSickBeard.py'
+        categories['tv']['priority']           = '-100'
+        categories['movies'] = {}
+        categories['movies']['name']           = 'movies'
+        categories['movies']['dir']            = 'movies'
+        categories['movies']['priority']       = '-100'
+        categories['music'] = {}
+        categories['music']['name']            = 'music'
+        categories['music']['dir']             = 'music'
+        categories['music']['priority']        = '-100'
+        defaultConfig['servers'] = servers
+        defaultConfig['categories'] = categories
 
-if firstLaunch:
-    defaultConfig['misc']['download_dir']  = pSabNzbdIncomplete
-    defaultConfig['misc']['complete_dir']  = pSabNzbdComplete
-    servers = {}
-    servers['localhost'] = {}
-    servers['localhost']['host']           = 'localhost'
-    servers['localhost']['port']           = '119'
-    servers['localhost']['enable']         = '0'
-    categories = {}
-    categories['tv'] = {}
-    categories['tv']['name']               = 'tv'
-    categories['tv']['script']             = 'sabToSickBeard.py'
-    categories['tv']['priority']           = '-100'
-    categories['movies'] = {}
-    categories['movies']['name']           = 'movies'
-    categories['movies']['dir']            = 'movies'
-    categories['movies']['priority']       = '-100'
-    categories['music'] = {}
-    categories['music']['name']            = 'music'
-    categories['music']['dir']             = 'music'
-    categories['music']['priority']        = '-100'
-    defaultConfig['servers'] = servers
-    defaultConfig['categories'] = categories
+    sabNzbdConfig.merge(defaultConfig)
+    sabNzbdConfig.write()
 
-sabNzbdConfig.merge(defaultConfig)
-sabNzbdConfig.write()
+    # also keep the autoProcessTV config up to date
+    autoProcessConfig = ConfigObj(os.path.join(pSabNzbdScripts, 'autoProcessTV.cfg'), create_empty=True)
+    defaultConfig = ConfigObj()
+    defaultConfig['SickBeard'] = {}
+    defaultConfig['SickBeard']['host']         = 'localhost'
+    defaultConfig['SickBeard']['port']         = '8082'
+    defaultConfig['SickBeard']['username']     = user
+    defaultConfig['SickBeard']['password']     = pwd
+    autoProcessConfig.merge(defaultConfig)
+    autoProcessConfig.write()
 
-# also keep the autoProcessTV config up to date
-autoProcessConfig = ConfigObj(os.path.join(pSabNzbdScripts, 'autoProcessTV.cfg'), create_empty=True)
-defaultConfig = ConfigObj()
-defaultConfig['SickBeard'] = {}
-defaultConfig['SickBeard']['host']         = 'localhost'
-defaultConfig['SickBeard']['port']         = '8082'
-defaultConfig['SickBeard']['username']     = user
-defaultConfig['SickBeard']['password']     = pwd
-autoProcessConfig.merge(defaultConfig)
-autoProcessConfig.write()
+    # launch SABnzbd and get the API key
+    # ----------------------------------
+    if "true" in sabnzbd_launch:
+        logging.debug('Launching SABnzbd...')
+        subprocess.call(sabnzbd,close_fds=True)
+        logging.debug('...done')
 
-# launch SABnzbd and get the API key
-# ----------------------------------
+        # SABnzbd will only complete the .ini file when we first access the web interface
+        if firstLaunch:
+            loadWebInterface('http://' + sabNzbdHost,user,pwd)
+        sabNzbdConfig.reload()
+        sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
+        logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
+except Exception,e:
+    print 'SABnzbd: exception occurred:', e
+    print traceback.format_exc()
+# SABnzbd end
 
-logging.debug('Launching SABnzbd...')
-subprocess.call(sabnzbd,close_fds=True)
-logging.debug('...done')
+# SickBeard start
+try:
+    # write SickBeard settings
+    # ------------------------
+    sickBeardConfig = ConfigObj(pSickBeardSettings,create_empty=True)
+    defaultConfig = ConfigObj()
+    defaultConfig['General'] = {}
+    defaultConfig['General']['launch_browser'] = '0'
+    defaultConfig['General']['version_notify'] = '0'
+    defaultConfig['General']['log_dir']        = 'logs'
+    defaultConfig['General']['web_port']       = '8082'
+    defaultConfig['General']['web_host']       = host
+    defaultConfig['General']['web_username']   = user
+    defaultConfig['General']['web_password']   = pwd
+    if "true" in sabnzbd_launch:
+        defaultConfig['SABnzbd'] = {}
+        defaultConfig['SABnzbd']['sab_username']   = user
+        defaultConfig['SABnzbd']['sab_password']   = pwd
+        defaultConfig['SABnzbd']['sab_apikey']     = sabNzbdApiKey
+        defaultConfig['SABnzbd']['sab_host']       = 'http://' + sabNzbdHost + '/'
+    defaultConfig['XBMC'] = {}
+    defaultConfig['XBMC']['use_xbmc']          = '1'
+    defaultConfig['XBMC']['xbmc_host']         = '127.0.0.1:' + xbmcPort
+    defaultConfig['XBMC']['xbmc_username']     = xbmcUser
+    defaultConfig['XBMC']['xbmc_password']     = xbmcPwd
 
-# SABnzbd will only complete the .ini file when we first access the web interface
-if firstLaunch:
-    loadWebInterface('http://' + sabNzbdHost,user,pwd)
-sabNzbdConfig.reload()
-sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
-logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
+    if firstLaunch:
+        defaultConfig['General']['metadata_xbmc']         = '1|1|1|1|1|1'
+        defaultConfig['General']['nzb_method']            = 'sabnzbd'
+        defaultConfig['General']['keep_processed_dir']    = '0'
+        defaultConfig['General']['use_banner']            = '1'
+        defaultConfig['General']['rename_episodes']       = '1'
+        defaultConfig['General']['naming_ep_name']        = '0'
+        defaultConfig['General']['naming_use_periods']    = '1'
+        defaultConfig['General']['naming_sep_type']       = '1'
+        defaultConfig['General']['naming_ep_type']        = '1'
+        defaultConfig['General']['root_dirs']             = '0|/storage/tvshows'
+        defaultConfig['SABnzbd']['sab_category']          = 'tv'
+        # workaround: on first launch, sick beard will always add 
+        # 'http://' and trailing '/' on its own
+        defaultConfig['SABnzbd']['sab_host']              = sabNzbdHost
+        defaultConfig['XBMC']['xbmc_notify_ondownload']   = '1'
+        defaultConfig['XBMC']['xbmc_update_library']      = '1'
 
-# write SickBeard settings
-# ------------------------
+    sickBeardConfig.merge(defaultConfig)
+    sickBeardConfig.write()
 
-sickBeardConfig = ConfigObj(pSickBeardSettings,create_empty=True)
-defaultConfig = ConfigObj()
-defaultConfig['General'] = {}
-defaultConfig['General']['launch_browser'] = '0'
-defaultConfig['General']['version_notify'] = '0'
-defaultConfig['General']['log_dir']        = 'logs'
-defaultConfig['General']['web_port']       = '8082'
-defaultConfig['General']['web_host']       = host
-defaultConfig['General']['web_username']   = user
-defaultConfig['General']['web_password']   = pwd
-defaultConfig['SABnzbd'] = {}
-defaultConfig['SABnzbd']['sab_username']   = user
-defaultConfig['SABnzbd']['sab_password']   = pwd
-defaultConfig['SABnzbd']['sab_apikey']     = sabNzbdApiKey
-defaultConfig['SABnzbd']['sab_host']       = 'http://' + sabNzbdHost + '/'
-defaultConfig['XBMC'] = {}
-defaultConfig['XBMC']['use_xbmc']          = '1'
-defaultConfig['XBMC']['xbmc_host']         = '127.0.0.1:' + xbmcPort
-defaultConfig['XBMC']['xbmc_username']     = xbmcUser
-defaultConfig['XBMC']['xbmc_password']     = xbmcPwd
+    # launch SickBeard
+    # ----------------
+    if "true" in sickbeard_launch:
+        logging.debug('Launching SickBeard...')
+        subprocess.call(sickBeard,close_fds=True)
+        logging.debug('...done')
+except Exception,e:
+    print 'SickBeard: exception occurred:', e
+    print traceback.format_exc()
+# SickBeard end
 
-if firstLaunch:
-    defaultConfig['General']['metadata_xbmc']         = '1|1|1|1|1|1'
-    defaultConfig['General']['nzb_method']            = 'sabnzbd'
-    defaultConfig['General']['keep_processed_dir']    = '0'
-    defaultConfig['General']['use_banner']            = '1'
-    defaultConfig['General']['rename_episodes']       = '1'
-    defaultConfig['General']['naming_ep_name']        = '0'
-    defaultConfig['General']['naming_use_periods']    = '1'
-    defaultConfig['General']['naming_sep_type']       = '1'
-    defaultConfig['General']['naming_ep_type']        = '1'
-    defaultConfig['General']['root_dirs']             = '0|/storage/tvshows'
-    defaultConfig['SABnzbd']['sab_category']          = 'tv'
-    # workaround: on first launch, sick beard will always add 
-    # 'http://' and trailing '/' on its own
-    defaultConfig['SABnzbd']['sab_host']              = sabNzbdHost
-    defaultConfig['XBMC']['xbmc_notify_ondownload']   = '1'
-    defaultConfig['XBMC']['xbmc_update_library']      = '1'
+# CouchPotato start
+try:
+    # write CouchPotato settings
+    # --------------------------
+    couchPotatoConfig = ConfigObj(pCouchPotatoSettings,create_empty=True)
+    defaultConfig = ConfigObj()
+    defaultConfig['global'] = {}
+    defaultConfig['global']['launchbrowser'] = 'False'
+    defaultConfig['global']['updater']       = 'False'
+    defaultConfig['global']['password']      = pwd
+    defaultConfig['global']['username']      = user
+    defaultConfig['global']['port']          = '8083'
+    defaultConfig['global']['host']          = host
+    if "true" in sabnzbd_launch:
+        defaultConfig['Sabnzbd'] = {}
+        defaultConfig['Sabnzbd']['username']     = user
+        defaultConfig['Sabnzbd']['password']     = pwd
+        defaultConfig['Sabnzbd']['apikey']       = sabNzbdApiKey
+        defaultConfig['Sabnzbd']['host']         = sabNzbdHost
+    defaultConfig['XBMC'] = {}
+    defaultConfig['XBMC']['enabled']         = 'True'
+    defaultConfig['XBMC']['host']            = '127.0.0.1:' + xbmcPort
+    defaultConfig['XBMC']['username']        = xbmcUser
+    defaultConfig['XBMC']['password']        = xbmcPwd
 
-sickBeardConfig.merge(defaultConfig)
-sickBeardConfig.write()
+    if firstLaunch:
+        defaultConfig['Sabnzbd']['category']     = 'movies'
+        defaultConfig['Sabnzbd']['ppdir']        = pSabNzbdCompleteMov
+        defaultConfig['Renamer'] = {}
+        defaultConfig['Renamer']['enabled']      = 'True'
+        defaultConfig['Renamer']['download']     = pSabNzbdCompleteMov
+        defaultConfig['Renamer']['destination']  = '/storage/videos'
+        defaultConfig['Renamer']['separator']    = '.'
+        defaultConfig['Renamer']['cleanup']      = 'True'
 
-# launch SickBeard
-# ----------------
-logging.debug('Launching SickBeard...')
-subprocess.call(sickBeard,close_fds=True)
-logging.debug('...done')
+    couchPotatoConfig.merge(defaultConfig)
+    couchPotatoConfig.write()
 
-# write CouchPotato settings
-# --------------------------
+    # launch CouchPotato
+    # ------------------
+    if "true" in couchpotato_launch and "0" in couchpotato_version:
+        logging.debug('Launching CouchPotato...')
+        subprocess.call(couchPotato,close_fds=True)
+        logging.debug('...done')
+except Exception,e:
+    print 'CouchPotato: exception occurred:', e
+    print traceback.format_exc()
+# CouchPotato end
 
-couchPotatoConfig = ConfigObj(pCouchPotatoSettings,create_empty=True)
-defaultConfig = ConfigObj()
-defaultConfig['global'] = {}
-defaultConfig['global']['launchbrowser'] = 'False'
-defaultConfig['global']['updater']       = 'False'
-defaultConfig['global']['password']      = pwd
-defaultConfig['global']['username']      = user
-defaultConfig['global']['port']          = '8083'
-defaultConfig['global']['host']          = host
-defaultConfig['Sabnzbd'] = {}
-defaultConfig['Sabnzbd']['username']     = user
-defaultConfig['Sabnzbd']['password']     = pwd
-defaultConfig['Sabnzbd']['apikey']       = sabNzbdApiKey
-defaultConfig['Sabnzbd']['host']         = sabNzbdHost
-defaultConfig['XBMC'] = {}
-defaultConfig['XBMC']['enabled']         = 'True'
-defaultConfig['XBMC']['host']            = '127.0.0.1:' + xbmcPort
-defaultConfig['XBMC']['username']        = xbmcUser
-defaultConfig['XBMC']['password']        = xbmcPwd
+# CouchPotatoServer start
+try:
+    # empty password hack
+    if pwd == '':
+        md5pwd = ''
+    else:
+        #convert password to md5
+        md5pwd =  hashlib.md5(str(pwd)).hexdigest()
 
-if firstLaunch:
-    defaultConfig['Sabnzbd']['category']     = 'movies'
-    defaultConfig['Sabnzbd']['ppdir']        = pSabNzbdCompleteMov
-    defaultConfig['Renamer'] = {}
-    defaultConfig['Renamer']['enabled']      = 'True'
-    defaultConfig['Renamer']['download']     = pSabNzbdCompleteMov
-    defaultConfig['Renamer']['destination']  = '/storage/videos'
-    defaultConfig['Renamer']['separator']    = '.'
-    defaultConfig['Renamer']['cleanup']      = 'True'
+    # write CouchPotatoServer settings
+    # --------------------------
+    couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True)
+    defaultConfig = ConfigObj()
+    defaultConfig['newznab'] = {}
+    defaultConfig['newznab']['api_key']      = ''
+    defaultConfig['core'] = {}
+    defaultConfig['core']['username']            = user
+    defaultConfig['core']['password']            = md5pwd
+    defaultConfig['core']['port']                = '8083'
+    defaultConfig['core']['launchbrowser']       = '0'
+    defaultConfig['core']['host']                = host
+    defaultConfig['core']['data_dir']            = pAddonHome
+    defaultConfig['core']['permission_folder']   = '0644'
+    defaultConfig['core']['permission_file']     = '0644'
+    defaultConfig['core']['show_wizard']         = '0'
+    defaultConfig['core']['debug']               = '0'
+    defaultConfig['core']['development']         = '0'
+    defaultConfig['updater'] = {}
+    defaultConfig['updater']['enabled']          = '0'
+    defaultConfig['updater']['notification']     = '0'
+    defaultConfig['updater']['automatic']        = '0'
+    if "true" in sabnzbd_launch:
+        defaultConfig['Sabnzbd'] = {}
+        defaultConfig['Sabnzbd']['username']     = user
+        defaultConfig['Sabnzbd']['password']     = pwd
+        defaultConfig['Sabnzbd']['api_key']      = sabNzbdApiKey
+        defaultConfig['Sabnzbd']['host']         = sabNzbdHost
+    defaultConfig['xbmc'] = {}
+    defaultConfig['xbmc']['enabled']         = '1'
+    defaultConfig['xbmc']['host']            = '127.0.0.1:' + xbmcPort
+    defaultConfig['xbmc']['username']        = xbmcUser
+    defaultConfig['xbmc']['password']        = xbmcPwd
 
-couchPotatoConfig.merge(defaultConfig)
-couchPotatoConfig.write()
+    if firstLaunch:
+        defaultConfig['Sabnzbd']['category']     = 'movies'
+        defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov
+        defaultConfig['Renamer'] = {}
+        defaultConfig['Renamer']['enabled']      = 'True'
+        defaultConfig['Renamer']['download']     = pSabNzbdCompleteMov
+        defaultConfig['Renamer']['destination']  = '/storage/videos'
+        defaultConfig['Renamer']['separator']    = '.'
+        defaultConfig['Renamer']['cleanup']      = 'False'
 
-# launch CouchPotato
-# ------------------
+    couchPotatoServerConfig.merge(defaultConfig)
+    couchPotatoServerConfig.write()
 
-logging.debug('Launching CouchPotato...')
-subprocess.call(couchPotato,close_fds=True)
-logging.debug('...done')
+    # launch CouchPotatoServer
+    # ------------------
+    if "true" in couchpotato_launch and "1" in couchpotato_version:
+        logging.debug('Launching CouchPotatoServer...')
+        subprocess.call(couchPotatoServer,close_fds=True)
+        logging.debug('...done')
+except Exception,e:
+    print 'CouchPotatoServer: exception occurred:', e
+    print traceback.format_exc()
+# CouchPotatoServer end
 
-# write Headphones settings
-# -------------------------
+# Headphones start
+try:
+    # write Headphones settings
+    # -------------------------
+    headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
+    defaultConfig = ConfigObj()
+    defaultConfig['General'] = {}
+    defaultConfig['General']['launch_browser']   = '0'
+    defaultConfig['General']['http_port']        = '8084'
+    defaultConfig['General']['http_host']        = host
+    defaultConfig['General']['http_username']    = user
+    defaultConfig['General']['http_password']    = pwd
+    if "true" in sabnzbd_launch:
+        defaultConfig['SABnzbd'] = {}
+        defaultConfig['SABnzbd']['sab_apikey']       = sabNzbdApiKey
+        defaultConfig['SABnzbd']['sab_host']         = sabNzbdHost
+        defaultConfig['SABnzbd']['sab_username']     = user
+        defaultConfig['SABnzbd']['sab_password']     = pwd
 
-headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
-defaultConfig = ConfigObj()
-defaultConfig['General'] = {}
-defaultConfig['General']['launch_browser']   = '0'
-defaultConfig['General']['http_port']        = '8084'
-defaultConfig['General']['http_host']        = host
-defaultConfig['General']['http_username']    = user
-defaultConfig['General']['http_password']    = pwd
-defaultConfig['SABnzbd'] = {}
-defaultConfig['SABnzbd']['sab_apikey']       = sabNzbdApiKey
-defaultConfig['SABnzbd']['sab_host']         = sabNzbdHost
-defaultConfig['SABnzbd']['sab_username']     = user
-defaultConfig['SABnzbd']['sab_password']     = pwd
+    if firstLaunch:
+        defaultConfig['SABnzbd']['sab_category']     = 'music'
+        defaultConfig['General']['music_dir']        = '/storage/music'
+        defaultConfig['General']['destination_dir']  = '/storage/music'
+        defaultConfig['General']['download_dir']     = '/storage/downloads/music'
+        defaultConfig['General']['move_files']       = '1'
+        defaultConfig['General']['rename_files']     = '1'
 
-if firstLaunch:
-    defaultConfig['SABnzbd']['sab_category']     = 'music'
-    defaultConfig['General']['music_dir']        = '/storage/music'
-    defaultConfig['General']['destination_dir']  = '/storage/music'
-    defaultConfig['General']['download_dir']     = '/storage/downloads/music'
-    defaultConfig['General']['move_files']       = '1'
-    defaultConfig['General']['rename_files']     = '1'
+    headphonesConfig.merge(defaultConfig)
+    headphonesConfig.write()
 
-headphonesConfig.merge(defaultConfig)
-headphonesConfig.write()
-
-# launch Headphones
-# -----------------
-
-logging.debug('Launching Headphones...')
-subprocess.call(headphones,close_fds=True)
-logging.debug('...done')
+    # launch Headphones
+    # -----------------
+    if "true" in headphones_launch:
+        logging.debug('Launching Headphones...')
+        subprocess.call(headphones,close_fds=True)
+        logging.debug('...done')
+except Exception,e:
+    print 'Headphones: exception occurred:', e
+    print traceback.format_exc()
+# Headphones end

packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop

@@ -0,0 +1,6 @@
+#!/bin/sh
+kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | awk '{print $1}'` 2>/dev/null
+kill -9 `ps | grep -E 'python.*/SABnzbd.py' | awk '{print $1}'` 2>/dev/null
+kill -9 `ps | grep -E 'python.*/SickBeard.py' | awk '{print $1}'` 2>/dev/null
+kill -9 `ps | grep -E 'python.*/CouchPotato.py' | awk '{print $1}'` 2>/dev/null
+kill -9 `ps | grep -E 'python.*/Headphones.py' | awk '{print $1}'` 2>/dev/null

packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py

@@ -35,78 +35,88 @@ __author__     = "OpenELEC"
 __url__        = "http://www.openelec.tv"
 __settings__   = xbmcaddon.Addon(id='service.downloadmanager.SABnzbd-Suite')
 __cwd__        = __settings__.getAddonInfo('path')
-__path__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.py") )
+__start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.py") )
+__stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.stop") )
+
+#make binary files executable in adson bin folder
+subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
 
 checkInterval  = 120
 timeout        = 20
 wake_times     = ['01:00','03:00','05:00','07:00','09:00','11:00','13:00','15:00','17:00','19:00','21:00','23:00']
 
 # Launch Suite
-subprocess.call(['python',__path__])
+subprocess.call(['python',__start__])
 
+# check for launching sabnzbd
+sabNzbdLaunch = (__settings__.getSetting('SABNZBD_LAUNCH').lower() == 'true')
 
-# SABnzbd addresses and api key
-sabNzbdAddress    = '127.0.0.1:8081'
-sabNzbdConfigFile = '/storage/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite/sabnzbd.ini'
-sabConfiguration  = ConfigObj(sabNzbdConfigFile)
-sabNzbdApiKey     = sabConfiguration['misc']['api_key']
-sabNzbdUser       = sabConfiguration['misc']['username']
-sabNzbdPass       = sabConfiguration['misc']['password']
-sabNzbdQueue      = 'http://' + sabNzbdAddress + '/sabnzbd/api?mode=queue&output=xml&apikey=' + sabNzbdApiKey + '&ma_username=' + sabNzbdUser + '&ma_password=' + sabNzbdUser
+if sabNzbdLaunch:
+    # SABnzbd addresses and api key
+    sabNzbdAddress    = '127.0.0.1:8081'
+    sabNzbdConfigFile = '/storage/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite/sabnzbd.ini'
+    sabConfiguration  = ConfigObj(sabNzbdConfigFile)
+    sabNzbdApiKey     = sabConfiguration['misc']['api_key']
+    sabNzbdUser       = sabConfiguration['misc']['username']
+    sabNzbdPass       = sabConfiguration['misc']['password']
+    sabNzbdQueue      = 'http://' + sabNzbdAddress + '/sabnzbd/api?mode=queue&output=xml&apikey=' + sabNzbdApiKey + '&ma_username=' + sabNzbdUser + '&ma_password=' + sabNzbdUser
 
-# start checking SABnzbd for activity and prevent sleeping if necessary
-socket.setdefaulttimeout(timeout)
-
-# perform some initial checks and log essential settings
-shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
-wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
-wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
-if shouldKeepAwake:
-    xbmc.log('SABnzbd-Suite: will prevent idle sleep/shutdown while downloading')
-if wakePeriodically:
-    xbmc.log('SABnzbd-Suite: will try to wake system daily at ' + wake_times[wakeHourIdx])
+    # start checking SABnzbd for activity and prevent sleeping if necessary
+    socket.setdefaulttimeout(timeout)
+    
+    # perform some initial checks and log essential settings
+    shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
+    wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
+    wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
+    if shouldKeepAwake:
+        xbmc.log('SABnzbd-Suite: will prevent idle sleep/shutdown while downloading')
+    if wakePeriodically:
+        xbmc.log('SABnzbd-Suite: will try to wake system daily at ' + wake_times[wakeHourIdx])
 
 
 while (not xbmc.abortRequested):
 
-    # reread setting in case it has changed
-    shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
-    wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
-    wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
+    if sabNzbdLaunch:
+        # reread setting in case it has changed
+        shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
+        wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
+        wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
 
-    # check if SABnzbd is downloading
-    sabIsActive = False
-    req = urllib2.Request(sabNzbdQueue)
-    try: handle = urllib2.urlopen(req)
-    except IOError, e:
-        xbmc.log('SABnzbd-Suite: could not determine SABnzbds status', level=xbmc.LOGERROR)
-    else:
-        queue = handle.read()
-        handle.close()
-        sabIsActive = (queue.find('<status>Downloading</status>') >= 0)
+        # check if SABnzbd is downloading
+        sabIsActive = False
+        req = urllib2.Request(sabNzbdQueue)
+        try: handle = urllib2.urlopen(req)
+        except IOError, e:
+            xbmc.log('SABnzbd-Suite: could not determine SABnzbds status', level=xbmc.LOGERROR)
+        else:
+            queue = handle.read()
+            handle.close()
+            sabIsActive = (queue.find('<status>Downloading</status>') >= 0)
 
-    # reset idle timer when we're close to idle sleep/shutdown
-    if (shouldKeepAwake and sabIsActive):
-        response = xbmc.executehttpapi("GetGUISetting(0;powermanagement.shutdowntime)").replace('<li>','')
-        shutdownTime = int(response) * 60
-        idleTime = xbmc.getGlobalIdleTime()
-        timeToShutdown = shutdownTime - idleTime
+        # reset idle timer when we're close to idle sleep/shutdown
+        if (shouldKeepAwake and sabIsActive):
+            response = xbmc.executehttpapi("GetGUISetting(0;powermanagement.shutdowntime)").replace('<li>','')
+            shutdownTime = int(response) * 60
+            idleTime = xbmc.getGlobalIdleTime()
+            timeToShutdown = shutdownTime - idleTime
 
-        if (sabIsActive and timeToShutdown <= checkInterval - timeout):
-            xbmc.log('SABnzbd-Suite: still downloading. Resetting XBMC idle timer.')
-            xbmc.executehttpapi("SendKey(0xF000)")
-            
-    # calculate and set the time to wake up at (if any)
-    if (wakePeriodically):
-        wakeHour = wakeHourIdx * 2 + 1
-        timeOfDay = datetime.time(hour=wakeHour)
-        now = datetime.datetime.now()
-        wakeTime = now.combine(now.date(),timeOfDay)
-        if now.time() > timeOfDay:
-            wakeTime += datetime.timedelta(days=1)
-        secondsSinceEpoch = time.mktime(wakeTime.timetuple())
-        open("/sys/class/rtc/rtc0/wakealarm", "w").write("0")
-        open("/sys/class/rtc/rtc0/wakealarm", "w").write(str(secondsSinceEpoch))
-        
-    xbmc.sleep(checkInterval * 1000)
+            if (sabIsActive and timeToShutdown <= checkInterval - timeout):
+                xbmc.log('SABnzbd-Suite: still downloading. Resetting XBMC idle timer.')
+                xbmc.executehttpapi("SendKey(0xF000)")
+
+        # calculate and set the time to wake up at (if any)
+        if (wakePeriodically):
+            wakeHour = wakeHourIdx * 2 + 1
+            timeOfDay = datetime.time(hour=wakeHour)
+            now = datetime.datetime.now()
+            wakeTime = now.combine(now.date(),timeOfDay)
+            if now.time() > timeOfDay:
+                wakeTime += datetime.timedelta(days=1)
+            secondsSinceEpoch = time.mktime(wakeTime.timetuple())
+            open("/sys/class/rtc/rtc0/wakealarm", "w").write("0")
+            open("/sys/class/rtc/rtc0/wakealarm", "w").write(str(secondsSinceEpoch))
+
+    time.sleep(0.250)
+
+subprocess.Popen(__stop__, shell=True, close_fds=True)
 

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml

@@ -6,6 +6,11 @@
 	<string id="1010">User Settings</string>
 	<string id="1022">Username</string>
 	<string id="1023">Password</string>
+	<string id="1024">Enable SABnzbd</string>
+	<string id="1025">Enable Sickbeard</string>
+	<string id="1026">Enable Couchpotato</string>
+	<string id="1027">Couchpotato Version</string>
+	<string id="1028">Enable Headphones</string>
 	<string id="2010">Network Settings</string>
 	<string id="2021">Allowed IP addresses</string>
     <string id="3010">Sleep</string>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml

@@ -6,7 +6,16 @@
 	<string id="1010">Kullanıcı Ayarları</string>
 	<string id="1022">Kullanıcı adı</string>
 	<string id="1023">Parola</string>
+	<string id="1024">SABnzbd'yi Etkinleştir</string>
+	<string id="1025">Sickbeard'ı Etkinleştir</string>
+	<string id="1026">Couchpotato'yu Etkinleştir</string>
+	<string id="1027">Couchpotato Sürümü</string>
+	<string id="1028">Headphones'u Etkinleştir</string>
 	<string id="2010">Ağ Ayarları</string>
 	<string id="2021">İzin verilen IP adresleri</string>
+	<string id="3010">Uyku</string>
+	<string id="3021">İndirilirken uyanık tut</string>
+	<string id="3030">Düzenli olarak uyandır</string>
+	<string id="3031">Uyandırma zamanı</string>
 
 </strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml

@@ -7,6 +7,11 @@
 		<setting type="sep" />
 		<setting id="SABNZBD_USER" type="text" label="1022" default="openelec"/>
 		<setting id="SABNZBD_PWD" type="text" label="1023" default="openelec"/>
+		<setting id="SABNZBD_LAUNCH" type="bool" label="1024" default="true" />
+		<setting id="SICKBEARD_LAUNCH" type="bool" label="1025" default="true" />
+		<setting id="COUCHPOTATO_LAUNCH" type="bool" label="1026" default="true" />
+                <setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="0" values="Version 1|Version 2" enable="eq(-1,true)" />
+		<setting id="HEADPHONES_LAUNCH" type="bool" label="1028" default="true" />
 
 		<setting label="2010" type="lsep"/>
 		<setting type="sep" />
@@ -14,8 +19,8 @@
         
 		<setting label="3010" type="lsep"/>
 		<setting type="sep" />
-		<setting id="SABNZBD_KEEP_AWAKE" type="bool" label="3021" default="false"/>
-		<setting id="SABNZBD_PERIODIC_WAKE" type="bool" label="3030" default="false"/>
+		<setting id="SABNZBD_KEEP_AWAKE" type="bool" label="3021" default="false" enable="eq(-10,true)" />
+		<setting id="SABNZBD_PERIODIC_WAKE" type="bool" label="3030" default="false" enable="eq(-11,true)" />
 		<setting id="SABNZBD_WAKE_AT" type="enum" subsetting="true" enable="eq(-1,true)" 
 		         label="3031" default="01" 
 		         values="|01:00|03:00|05:00|07:00|09:00|11:00|13:00|15:00|17:00|19:00|21:00|23:00"/>

packages/addons/service/downloadmanager/transmission/build

@@ -34,7 +34,7 @@ cd $PKG_BUILD
             --localstatedir=/var \
             --disable-static \
             --enable-shared \
-            --disable-utp \
+            --enable-utp \
             --enable-largefile \
             --disable-nls \
             --disable-cli \

packages/addons/service/downloadmanager/transmission/changelog.txt

@@ -1,3 +1,10 @@
+2.1.5
+- update to transmission-2.61
+- update libevent to libevent-2.0.19-stable
+
+2.1.4
+- update to transmission-2.52
+
 2.1.3
 - update to transmission-2.51
 - added option to specify download directory

packages/addons/service/downloadmanager/transmission/meta

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

packages/addons/service/multimedia/hts-tvheadend/build

@@ -22,6 +22,9 @@
 
 . config/options $1
 
+# do not build with LTO support
+  strip_lto
+
 if [ "$ICONV" = "libiconv" ]; then
   export LDFLAGS="$LDFLAGS -liconv"
 fi

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,10 @@
+2.1.8
+- rebuild due to some static libs in latest git
+
+2.1.7
+- update to vdr-plugin-streamdev-6a47e20
+- update to vdr-sc-613
+
 2.1.6
 - update to vdr-plugin-dvbapi-e3200c8
 - added vdr-xmltv2vdr plugin

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.1"
-PKG_REV="6"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,3 +1,10 @@
+2.1.6
+- update to oscam-7168
+
+2.1.5
+- update to oscam-7038
+- start userspace DVB drivers before oscam
+
 2.1.4
 - update to oscam-6626
   * added bulcrypt cas support

packages/addons/service/softcam/oscam/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="6626"
-PKG_REV="4"
+PKG_VERSION="7168"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"

packages/addons/service/softcam/oscam/source/bin/oscam.start

@@ -79,6 +79,13 @@ if [ ! "$(pidof oscam)" ]; then
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       break
     fi
+    # start userspace DVB driver/addon
+    for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+      driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
+      logger -t OSCAM "### Loading userspace DVB driver: $driver_dvb_name ###"
+      # use ". " because of variable export
+      . $driver_dvb
+    done
     LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" oscam $OSCAM_ARG > /dev/null 2>&1
     sleep 1
   done &

packages/addons/service/system/pcscd-addon/changelog.txt

@@ -1,3 +1,7 @@
+2.1.2
+- update to pcsc-lite-1.8.3
+- update to libccid-1.4.7
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/service/system/pcscd-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="pcscd-addon"
 PKG_VERSION="2.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/web/maraschino/addon

@@ -24,8 +24,3 @@
 
 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

packages/addons/service/web/maraschino/changelog.txt

@@ -1,3 +1,7 @@
+2.1.2
+- update to maraschino-40e2ce0
+- add possibilty to start / stop addon from addon manager with enable / disable
+
 2.1.1
 - update to addon version 2.1
 - update to maraschino-707e82c

packages/addons/service/web/maraschino/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="maraschino"
-PKG_VERSION="707e82c"
-PKG_REV="1"
+PKG_VERSION="40e2ce0"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.maraschinoproject.com/"

packages/addons/service/web/maraschino/source/bin/maraschino.start

@@ -24,9 +24,8 @@
   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
+  python $ADDON_DIR/Maraschino.py --datadir=$ADDON_HOME

packages/addons/service/web/maraschino/source/bin/maraschino.stop

@@ -0,0 +1,2 @@
+#!/bin/sh
+kill -9 `ps | grep -E 'python.*/Maraschino.py' | awk '{print $1}'` 2>/dev/null

packages/addons/service/web/maraschino/source/default.py

@@ -18,6 +18,22 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import xbmc, time, os, subprocess
+import xbmc, time, os, subprocess, xbmcaddon
 
-subprocess.Popen("maraschino.service", shell=True, close_fds=True)
+__scriptname__ = "maraschino service"
+__author__ = "OpenELEC"
+__url__ = "http://www.openelec.tv"
+__settings__   = xbmcaddon.Addon(id='service.web.maraschino')
+__cwd__        = __settings__.getAddonInfo('path')
+__start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.start") )
+__stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.stop") )
+
+#make binary files executable in addon 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)

packages/audio/alsa-plugins/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="alsa-lib speex libsamplerate"
+PKG_DEPENDS="alsa-lib speex"
 PKG_BUILD_DEPENDS="toolchain alsa-lib speex libsamplerate"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"