VERSION: set version to 0.99.6 (RC-6)

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

.gitignore

@@ -1,17 +1,17 @@
 # build directorys
-build.*/
-.fakeroot.*
+/build.*/
+/.fakeroot.*
 
 # automatically downloaded source files
-sources/
-.stamps/
+/sources/
+/.stamps/
 
 # prebuild target binarys to provide
-target/
+/target/
 
 # scripts for getting and packing source packages
-tools/mkpkg/*
-!tools/mkpkg/mkpkg_*
+/tools/mkpkg/*
+!/tools/mkpkg/mkpkg_*
 
 # private working directory
-.work/
+/.work/

README

@@ -1,8 +1,8 @@
 http://www.OpenELEC.tv
 
-The Open Embedded Linux Enterainment Center – OpenELEC.tv
+OpenELEC - Open Embedded Linux Enterainment Center
 
-OpenELEC.tv runs XBMC, a complete media center solution (xbmc.org).
+OpenELEC runs XBMC, a complete media center solution (xbmc.org).
 The base system has been designed and built from the ground up to be as
 efficient as possible – consuming only a tiny footprint, cutting edge
 hardware support and a set-top box experience.
@@ -52,4 +52,4 @@ freenode.
 
 Happy XBMC'ing
 
-OpenELEC.tv Development Team
+OpenELEC Development Team

TODO

@@ -0,0 +1,5 @@
+openssl-1.0.0(d):
+  - problems using urllib2 in Python -> using openssl-0.9.8
+
+ncurses-5.8/5.9:
+  - segfaults in nano and dialog -> using ncurses-5.7

VERSION

@@ -1 +1 @@
-0.99.3
+0.99.6

config/addon/addon.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@PKG_SHORTDESC@"
+       name="@PKG_NAME@"
        version="@ADDON_VERSION@"
        provider-name="openelec.tv">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="1.0"/>
+@REQUIRES@
   </requires>
-  <extension point="xbmc.python.pluginsource"
-            library="default.py">
+  <extension point="@PKG_ADDON_TYPE@"
+             library="default.py">
         <provides>executable</provides>
   </extension>
   <extension point="xbmc.addon.metadata">

config/addon/default.py

@@ -1,26 +0,0 @@
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-import sys
-import xbmcaddon
-import os
-
-if ( __name__ == "__main__" ):
-    os.system("sh start.sh")

config/arch.arm

@@ -0,0 +1,42 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=cortex-a8
+  fi
+
+# TARGET_CPU:
+# arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+# arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+# arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+# arm720t arm740t strongarm strongarm110 strongarm1100
+# strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+# arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+# arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+# arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
+# arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
+# cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+
+# TARGET_FPU:
+# This specifies what floating point hardware (or hardware emulation) is
+# available on the target. Permissible names are:
+# fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
+# vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
+# neon-vfpv4.
+
+# determine architecture's family
+  case $TARGET_CPU in
+    cortex-a8)
+      TARGET_SUBARCH=armv7-a
+      TARGET_ABI=eabi
+      TARGET_FPU="neon"
+      ;;
+    cortex-a9)
+      TARGET_SUBARCH=armv7-a
+      TARGET_ABI=eabi
+      TARGET_FPU="neon"
+      ;;
+  esac
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU -mabi=aapcs-linux"
+  [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS -mfpu=$TARGET_FPU"
+  TARGET_LDFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU"

config/arch.i386

@@ -0,0 +1,11 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=i686
+  fi
+
+# determine architecture's family
+  TARGET_SUBARCH=i686
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
+  TARGET_LDFLAGS="-march=$TARGET_CPU -m32"

config/arch.x86_64

@@ -0,0 +1,11 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=core2
+  fi
+
+# determine architecture's family
+  TARGET_SUBARCH=x86_64
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64"
+  TARGET_LDFLAGS="-fPIC -march=$TARGET_CPU -m64"

config/functions

@@ -140,22 +140,19 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||"`
-  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||"`
-}
-
-strip_gold() {
-  # strip out usage from GOLD linker
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||" -e "s|-fuse-linker-plugin||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
 }
 
 strip_linker_plugin() {
   # strip out usage from linker plugin
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
-strip_kmod() {
-  [ -z $1 ] && echo "usage strip_kmod <dir>" && exit 1
-  find $1 -type f -name '*.ko' | xargs -r $STRIP --strip-debug
+strip_gold() {
+  # strip out usage from GOLD linker
+  strip_linker_plugin
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
 }
+

config/graphic

@@ -0,0 +1,79 @@
+get_graphicdrivers() {
+  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"
+  fi
+
+  for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "fglrx" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
+      XORG_DRIVERS="$XORG_DRIVERS fglrx"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "i915" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,i915"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "i965" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,i965"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "nouveau" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "nvidia" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
+      XORG_DRIVERS="$XORG_DRIVERS nvidia"
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "omapfb" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "r200" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,r200"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "r300" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,r300"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "r600" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,r600"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "vmware" ]; then
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
+
+  done
+}

config/optimize

@@ -1,28 +1,111 @@
+if [ "$OPTIMIZATIONS" = fast ];then
+  GCC_OPTIM="-Ofast"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  LD_OPTIM="-Wl,--as-needed"
+fi
+
 if [ "$OPTIMIZATIONS" = speed ];then
-  GCC_OPTIM="-O3"
-  LD_OPTIM=""
+  GCC_OPTIM="$GCC_OPTIM -O3"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$OPTIMIZATIONS" = normal ];then
-  GCC_OPTIM="-O2"
+  GCC_OPTIM="$GCC_OPTIM -O2"
   LD_OPTIM=""
 fi
 
 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="-Os"
+  GCC_OPTIM="$GCC_OPTIM -Os"
   LD_OPTIM=""
 fi
 
-GCC_OPTIM="$GCC_OPTIM -ffast-math"
-GCC_OPTIM="$GCC_OPTIM -ftree-loop-distribution"
-GCC_OPTIM="$GCC_OPTIM -floop-interchange"
-GCC_OPTIM="$GCC_OPTIM -floop-strip-mine"
-GCC_OPTIM="$GCC_OPTIM -floop-block"
-GCC_OPTIM="$GCC_OPTIM -fgraphite-identity"
-GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-GCC_OPTIM="$GCC_OPTIM -flto"
+if [ "$LOOP_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -ftree-loop-distribution"
+  GCC_OPTIM="$GCC_OPTIM -floop-interchange"
+  GCC_OPTIM="$GCC_OPTIM -floop-strip-mine"
+  GCC_OPTIM="$GCC_OPTIM -floop-block"
+fi
 
-LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
-LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
-LD_OPTIM="$LD_OPTIM -Wl,--as-needed"
+if [ "$GRAPHITE_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -fgraphite-identity"
+fi
 
+if [ "$LTO_SUPPORT" = yes -o "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+fi
+
+if [ "$LTO_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -flto"
+fi
+
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+fi
+
+if [ "$DEBUG" = yes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
+else
+  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
+fi
+
+TARGET_CPPFLAGS=
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
+TARGET_CXXFLAGS="$TARGET_CFLAGS"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
+TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
+TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
+
+HOST_CPPFLAGS=""
+HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
+HOST_CXXFLAGS="$HOST_CFLAGS"
+HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
+HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
+
+# add distro specific library dirs
+  # ubuntu/debian specific "multiarch support"
+    FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")
+    if [ -d /lib/$FAMILY_TRIPLET ]; then
+      HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
+    fi
+    if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
+      HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
+    fi
+
+  # default multiarch support
+    case "`uname -m`" in
+      i*86)
+        if [ -d /lib32 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /lib32"
+        fi
+        if [ -d /usr/lib32 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /usr/lib32"
+        fi
+      ;;
+      x86_64)
+        if [ -d /lib64 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /lib64"
+        fi
+        if [ -d /usr/lib64 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /usr/lib64"
+        fi
+      ;;
+    esac
+
+  # default dirs
+    HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib"
+    HOST_INCDIR="$ROOT/$TOOLCHAIN/include /usr/include"
+
+# use -fPIC when necessary
+  case "`uname -m`" in
+    x86_64|ppc64|arm|armeb|armel)
+      HOST_CFLAGS="$HOST_CFLAGS -fPIC"
+      HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
+      HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
+    ;;
+  esac

config/options

@@ -6,7 +6,7 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / powerpc)
+# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
 # default is i386
 if [ -z "$ARCH" ]; then
   TARGET_ARCH="i386"
@@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects"
 OPENELEC_VERSION=`cat VERSION`
 
 if [ "$OPENELEC_VERSION" = "devel" ]; then
-  OS_VERSION="0.90"
+  OS_VERSION="0.99"
 else
   OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
   OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`
@@ -57,13 +57,19 @@ fi
 #  multi-processor computer (like hyperthreading SMP CPU)
   CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
 
+# cache size for ccache
+# Set the maximum size of the files stored in the cache. You can specify a
+# value in gigabytes, megabytes or kilobytes by appending a G, M or K to the
+# value. The default is gigabytes. The actual value stored is rounded down to
+# the nearest multiple of 16 kilobytes.
+  CCACHE_CACHE_SIZE="10G"
+
 # forcing install of all packages (yes/no)
   FORCE_INSTALL="no"
 
 # set jpeg library depending on ARCH
   if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
     LIBJPEG="libjpeg-turbo"
-#    LIBJPEG="jpeg"
   else
     LIBJPEG="jpeg"
   fi
@@ -76,41 +82,5 @@ fi
     . $HOME/.openelec/$PROJECT/options
   fi
 
-get_graphicdrivers() {
-  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
-  fi
-
-  for drv in $GRAPHIC_DRIVERS; do
-    [ "$drv" = "i915" ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
-    [ "$drv" = "i965" ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
-    [ "$drv" = "r200" ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
-    [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
-    [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
-
-    if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS intel"
-    fi
-
-    if [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeon" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-    fi
-
-    if [ "$drv" = "nouveau" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS nouveau"
-    fi
-
-    if [ "$drv" = "nvidia" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      XINERAMA_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "vmware" ]; then
-      XINERAMA_SUPPORT="yes"
-    fi
-  done
-}
-
+. config/graphic
 . config/path $1

config/path

@@ -1,30 +1,6 @@
 set -e
 
-# determine architecture's family
-case $TARGET_ARCH in
-  i386)
-    TARGET_FAMILY=i686
-    ;;
-
-  x86_64)
-    TARGET_FAMILY=x86_64
-    ;;
-esac
-
-# determines TARGET_CPU, if not forced by user
-if [ -z "$TARGET_CPU" ]; then
-  case $TARGET_ARCH in
-    i386)
-      TARGET_CPU=i686
-      ;;
-
-    x86_64)
-      TARGET_CPU=i686
-      ;;
-  esac
-fi
-
-# setup initial directorys
+# setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
   PACKAGES=packages
@@ -33,8 +9,11 @@ fi
   TARGET=target
   ADDONS=addons
 
-HOST_NAME=`$SCRIPTS/configtools/config.guess`
-TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
+# include ARCH specific options
+  . config/arch.$TARGET_ARCH
+
+HOST_NAME=`$LOCAL_CC -dumpmachine`
+TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
 TARGET_IMG=$ROOT/$TARGET
@@ -80,7 +59,7 @@ SED="sed -i"
   [ -n "$1" ] && PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
 
   [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
-  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="addon.$PKG_SECTION.$PKG_NAME"
+  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
 
   [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
   [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
@@ -95,8 +74,6 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-. config/optimize
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -107,38 +84,12 @@ TARGET_RANLIB=${TARGET_PREFIX}ranlib
 TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
 TARGET_STRIP=${TARGET_PREFIX}strip
 
-TARGET_CPPFLAGS=
-TARGET_CFLAGS="-Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
-TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$GCC_OPTIM $LD_OPTIM"
-
-case $TARGET_ARCH in
-    i386)
-     TARGET_CFLAGS="$TARGET_CFLAGS -march=$TARGET_CPU -m32"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -march=$TARGET_CPU -m32"
-     TARGET_LDFLAGS="$TARGET_LDFLAGS -march=$TARGET_CPU -m32"
-     ;;
-    x86_64)
-     TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -march=$TARGET_CPU -m64"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fPIC -march=$TARGET_CPU -m64"
-     TARGET_LDFLAGS="$TARGET_LDFLAGS -fPIC -march=$TARGET_CPU -m64"
-     ;;
-esac
+. config/optimize
 
 TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
 
-if [ "$DEBUG" = yes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
-else
-  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
-fi
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
@@ -150,20 +101,6 @@ HOST_RANLIB=ranlib
 HOST_OBJCOPY=objcopy
 HOST_STRIP=strip
 
-HOST_CPPFLAGS=""
-HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
-HOST_CXXFLAGS="$HOST_CFLAGS"
-HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
-
-# use -fPIC when necessary
-  case "`uname -m`" in
-    x86_64|ppc64|arm|armeb|armel)
-    HOST_CFLAGS="$HOST_CFLAGS -fPIC"
-    HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
-    HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
-    ;;
-  esac
-
 HOST_PKG_CONFIG_PATH=""
 HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
 HOST_PKG_CONFIG_SYSROOT_DIR=""
@@ -192,4 +129,3 @@ else
   exec 4>/dev/null
 fi
 INDENT_SIZE=4
-

config/release/create_installstick

@@ -56,24 +56,85 @@ echo "# Please read the instructions and use very carefully.. #"
 echo "#                                                       #"
 echo "#########################################################"
 
+# check for some required tools
+
+  # this is needed to create a bootloader
+  which syslinux > /dev/null
+  if [ "$?" = "1" ]; then
+    clear
+    echo "#########################################################"
+    echo "#                                                       #"
+    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "#                                                       #"
+    echo "#      We can't find the required tool \"syslinux\"     #"
+    echo "#      on your system.                                  #"
+    echo "#      Please install it via your package manager.      #"
+    echo "#                                                       #"
+    echo "#########################################################"
+    exit 1
+  fi
+
+  # this is needed by syslinux
+  which mcopy > /dev/null
+    if [ "$?" = "1" ]; then
+    clear
+    echo "#########################################################"
+    echo "#                                                       #"
+    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "#                                                       #"
+    echo "#      We can't find the required tool \"mcopy\"        #"
+    echo "#      on your system.                                  #"
+    echo "#      Please install it via your package manager.      #"
+    echo "#      NOTE: Some distributions call this package       #"
+    echo "#      \"mtools\".                                      #"
+    echo "#                                                       #"
+    echo "#########################################################"
+    exit 1
+  fi
+
+  # this is needed to partion the stick
+  which parted > /dev/null
+  if [ "$?" = "1" ]; then
+    clear
+    echo "#########################################################"
+    echo "#                                                       #"
+    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "#                                                       #"
+    echo "#      We can't find the required tool \"parted\"       #"
+    echo "#      on your system.                                  #"
+    echo "#      Please install it via your package manager.      #"
+    echo "#                                                       #"
+    echo "#########################################################"
+    exit 1
+  fi
+
+
 # check MD5 sums
   echo "checking MD5 sum..."
-  md5sum -c target/KERNEL.md5
-  MD5_ERROR="$?"
-  md5sum -c target/SYSTEM.md5
-  MD5_ERROR="$?"
 
-if [ "$MD5_ERROR" = "1" ]; then
-  echo "#########################################################"
-  echo "#                                                       #"
-  echo "# OpenELEC.tv failed md5 check - Installation will quit #"
-  echo "#                                                       #"
-  echo "#      Your original download was probably corrupt.     #"
-  echo "#   Please visit www.openelec.tv and get another copy   #"
-  echo "#                                                       #"
-  echo "#########################################################"
-  exit 1
-fi
+  md5sumFailed()
+  {
+    clear
+    echo "#########################################################"
+    echo "#                                                       #"
+    echo "# OpenELEC.tv failed md5 check - Installation will quit #"
+    echo "#                                                       #"
+    echo "#      Your original download was probably corrupt.     #"
+    echo "#   Please visit www.openelec.tv and get another copy   #"
+    echo "#                                                       #"
+    echo "#########################################################"
+    exit 1
+  }
+
+  md5sum -c target/KERNEL.md5
+  if [ "$?" = "1" ]; then
+    md5sumFailed
+  fi
+
+  md5sum -c target/SYSTEM.md5
+  if [ "$?" = "1" ]; then
+    md5sumFailed
+  fi
 
 # (TODO) umount anything
   umount "$PART"
@@ -136,6 +197,10 @@ fi
   cp README /tmp/usb_install
   cp RELEASE /tmp/usb_install
 
+# syncing disk
+  echo "syncing disk..."
+  sync
+
 # unmount partition
   echo "unmounting partition $PART..."
   umount "$PART"
@@ -143,11 +208,11 @@ fi
 # write mbr
   echo "writing mbr..."
   if [ -f /usr/lib/syslinux/mbr.bin ]; then
-    MBR="/usr/lib/syslinux/mbr.bin"       # example: ubuntu
+    MBR="/usr/lib/syslinux/mbr.bin"       # example: debian, ubuntu
   elif [ -f /usr/share/syslinux/mbr.bin ]; then
     MBR="/usr/share/syslinux/mbr.bin"     # example: fedora
   else
-    echo "Dont find mbr.bin on Host OS"
+    echo "Can't find mbr.bin on Host OS"
   fi
 
   if [ -n "$MBR" ]; then
@@ -162,4 +227,4 @@ fi
   echo "cleaning tempdir..."
   rmdir /tmp/usb_install
 
-echo "...ready"
+echo "...finished installation"

create_tar.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2

licenses/APSL.txt

@@ -0,0 +1,339 @@
+PPLE PUBLIC SOURCE LICENSE
+Version 2.0 -  August 6, 2003
+
+Please read this License carefully before downloading this software.  By
+downloading or using this software, you are agreeing to be bound by the terms
+of this License.  If you do not or cannot agree to the terms of this License,
+please do not download or use the software.
+
+Apple Note:  In January 2007, Apple changed its corporate name from "Apple
+Computer, Inc." to "Apple Inc."  This change has been reflected below and
+copyright years updated, but no other changes have been made to the APSL 2.0.
+
+1.	General; Definitions.  This License applies to any program or other
+work which Apple Inc. ("Apple") makes publicly available and which contains a
+notice placed by Apple identifying such program or work as "Original Code" and
+stating that it is subject to the terms of this Apple Public Source License
+version 2.0 ("License").  As used in this License:
+
+1.1	 "Applicable Patent Rights" mean:  (a) in the case where Apple is the
+grantor of rights, (i) claims of patents that are now or hereafter acquired,
+owned by or assigned to Apple and (ii) that cover subject matter contained in
+the Original Code, but only to the extent necessary to use, reproduce and/or
+distribute the Original Code without infringement; and (b) in the case where
+You are the grantor of rights, (i) claims of patents that are now or hereafter
+acquired, owned by or assigned to You and (ii) that cover subject matter in
+Your Modifications, taken alone or in combination with Original Code.
+
+1.2	"Contributor" means any person or entity that creates or contributes
+to the creation of Modifications.
+
+1.3	 "Covered Code" means the Original Code, Modifications, the
+combination of Original Code and any Modifications, and/or any respective
+portions thereof.
+
+1.4	"Externally Deploy" means: (a) to sublicense, distribute or otherwise
+make Covered Code available, directly or indirectly, to anyone other than You;
+and/or (b) to use Covered Code, alone or as part of a Larger Work, in any way
+to provide a service, including but not limited to delivery of content,
+through electronic communication with a client other than You.
+
+1.5	"Larger Work" means a work which combines Covered Code or portions
+thereof with code not governed by the terms of this License.
+
+1.6	"Modifications" mean any addition to, deletion from, and/or change to,
+the substance and/or structure of the Original Code, any previous
+Modifications, the combination of Original Code and any previous
+Modifications, and/or any respective portions thereof.  When code is released
+as a series of files, a Modification is:  (a) any addition to or deletion from
+the contents of a file containing Covered Code; and/or (b) any new file or
+other representation of computer program statements that contains any part of
+Covered Code. 
+
+1.7	"Original Code" means (a) the Source Code of a program or other work
+as originally made available by Apple under this License, including the Source
+Code of any updates or upgrades to such programs or works made available by
+Apple under this License, and that has been expressly identified by Apple as
+such in the header file(s) of such work; and (b) the object code compiled from
+such Source Code and originally made available by Apple under this License
+
+1.8	"Source Code" means the human readable form of a program or other work
+that is suitable for making modifications to it, including all modules it
+contains, plus any associated interface definition files, scripts used to
+control compilation and installation of an executable (object code).
+
+1.9	"You" or "Your" means an individual or a legal entity exercising
+rights under this License.  For legal entities, "You" or "Your" includes any
+entity which controls, is controlled by, or is under common control with, You,
+where "control" means (a) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or otherwise, or
+(b) ownership of fifty percent (50%) or more of the outstanding shares or
+beneficial ownership of such entity.
+
+2.	Permitted Uses; Conditions & Restrictions.   Subject to the terms and
+conditions of this License, Apple hereby grants You, effective on the date You
+accept this License and download the Original Code, a world-wide,
+royalty-free, non-exclusive license, to the extent of Apple's Applicable
+Patent Rights and copyrights covering the Original Code, to do the following:
+
+2.1	Unmodified Code.  You may use, reproduce, display, perform, internally
+distribute within Your organization, and Externally Deploy verbatim,
+unmodified copies of the Original Code, for commercial or non-commercial
+purposes, provided that in each instance:
+
+(a)	You must retain and reproduce in all copies of Original Code the
+copyright and other proprietary notices and disclaimers of Apple as they
+appear in the Original Code, and keep intact all notices in the Original Code
+that refer to this License; and
+
+(b) 	You must include a copy of this License with every copy of Source Code
+of Covered Code and documentation You distribute or Externally Deploy, and You
+may not offer or impose any terms on such Source Code that alter or restrict
+this License or the recipients' rights hereunder, except as permitted under
+Section 6.
+
+2.2	Modified Code.  You may modify Covered Code and use, reproduce,
+display, perform, internally distribute within Your organization, and
+Externally Deploy Your Modifications and Covered Code, for commercial or
+non-commercial purposes, provided that in each instance You also meet all of
+these conditions:
+
+(a)	You must satisfy all the conditions of Section 2.1 with respect to the
+Source Code of the Covered Code; 
+
+(b)	You must duplicate, to the extent it does not already exist, the
+notice in Exhibit A in each file of the Source Code of all Your Modifications,
+and cause the modified files to carry prominent notices stating that You
+changed the files and the date of any change; and
+
+(c)	If You Externally Deploy Your Modifications, You must make Source Code
+of all Your Externally Deployed Modifications either available to those to
+whom You have Externally Deployed Your Modifications, or publicly available.
+Source Code of Your Externally Deployed Modifications must be released under
+the terms set forth in this License, including the license grants set forth in
+Section 3 below, for as long as you Externally Deploy the Covered Code or
+twelve (12) months from the date of initial External Deployment, whichever is
+longer. You should preferably distribute the Source Code of Your Externally
+Deployed Modifications electronically (e.g. download from a web site).
+
+2.3	Distribution of Executable Versions.  In addition, if You Externally
+Deploy Covered Code (Original Code and/or Modifications) in object code,
+executable form only, You must include a prominent notice, in the code itself
+as well as in related documentation, stating that Source Code of the Covered
+Code is available under the terms of this License with information on how and
+where to obtain such Source Code.  
+
+2.4	Third Party Rights.  You expressly acknowledge and agree that although
+Apple and each Contributor grants the licenses to their respective portions of
+the Covered Code set forth herein, no assurances are provided by Apple or any
+Contributor that the Covered Code does not infringe the patent or other
+intellectual property rights of any other entity. Apple and each Contributor
+disclaim any liability to You for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, You hereby assume sole
+responsibility to secure any other intellectual property rights needed, if
+any. For example, if a third party patent license is required to allow You to
+distribute the Covered Code, it is Your responsibility to acquire that license
+before distributing the Covered Code.
+
+3.	Your Grants.  In consideration of, and as a condition to, the licenses
+granted to You under this License, You hereby grant to any person or entity
+receiving or distributing Covered Code under this License a non-exclusive,
+royalty-free, perpetual, irrevocable license, under Your Applicable Patent
+Rights and other intellectual property rights (other than patent) owned or
+controlled by You, to use, reproduce, display, perform, modify, sublicense,
+distribute and Externally Deploy Your Modifications of the same scope and
+extent as Apple's licenses under Sections 2.1 and 2.2 above.  
+
+4.	Larger Works.  You may create a Larger Work by combining Covered Code
+with other code not governed by the terms of this License and distribute the
+Larger Work as a single product.  In each such instance, You must make sure
+the requirements of this License are fulfilled for the Covered Code or any
+portion thereof. 
+
+5.	Limitations on Patent License.   Except as expressly stated in Section
+2, no other patent rights, express or implied, are granted by Apple herein.
+Modifications and/or Larger Works may require additional patent licenses from
+Apple which Apple may grant in its sole discretion.  
+
+6.	Additional Terms.  You may choose to offer, and to charge a fee for,
+warranty, support, indemnity or liability obligations and/or other rights
+consistent with the scope of the license granted herein ("Additional Terms")
+to one or more recipients of Covered Code. However, You may do so only on Your
+own behalf and as Your sole responsibility, and not on behalf of Apple or any
+Contributor. You must obtain the recipient's agreement that any such
+Additional Terms are offered by You alone, and You hereby agree to indemnify,
+defend and hold Apple and every Contributor harmless for any liability
+incurred by or claims asserted against Apple or such Contributor by reason of
+any such Additional Terms. 
+
+7.	Versions of the License.  Apple may publish revised and/or new
+versions of this License from time to time.  Each version will be given a
+distinguishing version number.  Once Original Code has been published under a
+particular version of this License, You may continue to use it under the terms
+of that version. You may also choose to use such Original Code under the terms
+of any subsequent version of this License published by Apple.  No one other
+than Apple has the right to modify the terms applicable to Covered Code
+created under this License.  
+
+8.	NO WARRANTY OR SUPPORT.  The Covered Code may contain in whole or in
+part pre-release, untested, or not fully tested works.  The Covered Code may
+contain errors that could cause failures or loss of data, and may be
+incomplete or contain inaccuracies.  You expressly acknowledge and agree that
+use of the Covered Code, or any portion thereof, is at Your sole and entire
+risk.  THE COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR
+SUPPORT OF ANY KIND AND APPLE AND APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED
+TO AS "APPLE" FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS
+EXPRESSLY DISCLAIM ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF
+MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE,
+OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+APPLE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR
+ENJOYMENT OF THE COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED
+CODE WILL MEET YOUR REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL
+BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE
+CORRECTED.  NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE
+AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.  You
+acknowledge that the Covered Code is not intended for use in the operation of
+nuclear facilities, aircraft navigation, communication systems, or air traffic
+control machines in which case the failure of the Covered Code could lead to
+death, personal injury, or severe physical or environmental damage.
+
+9.	LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
+EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO THIS LICENSE
+OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ANY PORTION THEREOF,
+WHETHER UNDER A THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE),
+PRODUCTS LIABILITY OR OTHERWISE, EVEN IF APPLE OR SUCH CONTRIBUTOR HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND NOTWITHSTANDING THE FAILURE OF
+ESSENTIAL PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE
+LIMITATION OF LIABILITY OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
+LIMITATION MAY NOT APPLY TO YOU. In no event shall Apple's total liability to
+You for all damages (other than as may be required by applicable law) under
+this License exceed the amount of fifty dollars ($50.00).
+
+10.	Trademarks.  This License does not grant any rights to use the
+trademarks or trade names  "Apple", "Mac", "Mac OS", "QuickTime", "QuickTime
+Streaming Server" or any other trademarks, service marks, logos or trade names
+belonging to Apple (collectively "Apple Marks") or to any trademark, service
+mark, logo or trade name belonging to any Contributor.  You agree not to use
+any Apple Marks in or as part of the name of products derived from the
+Original Code or to endorse or promote products derived from the Original Code
+other than as expressly permitted by and in strict compliance at all times
+with Apple's third party trademark usage guidelines which are posted at
+http://www.apple.com/legal/guidelinesfor3rdparties.html.  
+
+11.	Ownership. Subject to the licenses granted under this License, each
+Contributor retains all rights, title and interest in and to any Modifications
+made by such Contributor.  Apple retains all rights, title and interest in and
+to the Original Code and any Modifications made by or on behalf of Apple
+("Apple Modifications"), and such Apple Modifications will not be
+automatically subject to this License.  Apple may, at its sole discretion,
+choose to license such Apple Modifications under this License, or on different
+terms from those contained in this License or may choose not to license them
+at all.  
+
+12.	Termination.  
+
+12.1	Termination.  This License and the rights granted hereunder will
+terminate:
+
+(a)	automatically without notice from Apple if You fail to comply with any
+term(s) of this License and fail to cure such breach within 30 days of
+becoming aware of such breach;
+(b)	immediately in the event of the circumstances described in Section
+13.5(b); or
+(c)	automatically without notice from Apple if You, at any time during the
+term of this License, commence an action for patent infringement against
+Apple; provided that Apple did not first commence an action for patent
+infringement against You in that instance.
+
+12.2	Effect of Termination.  Upon termination, You agree to immediately
+stop any further use, reproduction, modification, sublicensing and
+distribution of the Covered Code.  All sublicenses to the Covered Code which
+have been properly granted prior to termination shall survive any termination
+of this License.  Provisions which, by their nature, should remain in effect
+beyond the termination of this License shall survive, including but not
+limited to Sections 3, 5, 8, 9, 10, 11, 12.2 and 13.  No party will be liable
+to any other for compensation, indemnity or damages of any sort solely as a
+result of terminating this License in accordance with its terms, and
+termination of this License will be without prejudice to any other right or
+remedy of any party.
+
+13. 	Miscellaneous.
+
+13.1	Government End Users.   The Covered Code is a "commercial item" as
+defined in FAR 2.101.  Government software and technical data rights in the
+Covered Code include only those rights customarily provided to the public as
+defined in this License. This customary commercial license in technical data
+and software is provided in accordance with FAR 12.211 (Technical Data) and
+12.212 (Computer Software) and, for Department of Defense purchases, DFAR
+252.227-7015 (Technical Data -- Commercial Items) and 227.7202-3 (Rights in
+Commercial Computer Software or Computer Software Documentation).
+Accordingly, all U.S. Government End Users acquire Covered Code with only
+those rights set forth herein.
+
+13.2	Relationship of Parties.  This License will not be construed as
+creating an agency, partnership, joint venture or any other form of legal
+association between or among You, Apple or any Contributor, and You will not
+represent to the contrary, whether expressly, by implication, appearance or
+otherwise.
+
+13.3	Independent Development.   Nothing in this License will impair Apple's
+right to acquire, license, develop, have others develop for it, market and/or
+distribute technology or products that perform the same or similar functions
+as, or otherwise compete with, Modifications, Larger Works, technology or
+products that You may develop, produce, market or distribute.
+
+13.4	Waiver; Construction.  Failure by Apple or any Contributor to enforce
+any provision of this License will not be deemed a waiver of future
+enforcement of that or any other provision.  Any law or regulation which
+provides that the language of a contract shall be construed against the
+drafter will not apply to this License.
+
+13.5	Severability.  (a) If for any reason a court of competent jurisdiction
+finds any provision of this License, or portion thereof, to be unenforceable,
+that provision of the License will be enforced to the maximum extent
+permissible so as to effect the economic benefits and intent of the parties,
+and the remainder of this License will continue in full force and effect.  (b)
+Notwithstanding the foregoing, if applicable law prohibits or restricts You
+from fully and/or specifically complying with Sections 2 and/or 3 or prevents
+the enforceability of either of those Sections, this License will immediately
+terminate and You must immediately discontinue any use of the Covered Code and
+destroy all copies of it that are in your possession or control.
+
+13.6	Dispute Resolution.  Any litigation or other dispute resolution
+between You and Apple relating to this License shall take place in the
+Northern District of California, and You and Apple hereby consent to the
+personal jurisdiction of, and venue in, the state and federal courts within
+that District with respect to this License. The application of the United
+Nations Convention on Contracts for the International Sale of Goods is
+expressly excluded.
+
+13.7	Entire Agreement; Governing Law.  This License constitutes the entire
+agreement between the parties with respect to the subject matter hereof.  This
+License shall be governed by the laws of the United States and the State of
+California, except that body of California law concerning conflicts of law. 
+
+Where You are located in the province of Quebec, Canada, the following clause
+applies:  The parties hereby confirm that they have requested that this
+License and all related documents be drafted in English.  Les parties ont
+exigé que le présent contrat et tous les documents connexes soient rédigés
+en anglais.
+
+EXHIBIT A. 
+
+"Portions Copyright (c) 1999-2007 Apple Inc.  All Rights Reserved.
+
+This file contains Original Code and/or Modifications of Original Code as
+defined in and that are subject to the Apple Public Source License Version 2.0
+(the 'License').  You may not use this file except in compliance with the
+License.  Please obtain a copy of the License at
+http://www.opensource.apple.com/apsl/ and read it before using this file.
+
+The Original Code and all software distributed under the License are
+distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS
+OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT
+LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  Please see the License for the
+specific language governing rights and limitations under the License."

licenses/ATI.txt

@@ -0,0 +1,188 @@
+
+AMD Software End User License Agreement
+
+PLEASE  READ  THIS  LICENSE  CAREFULLY  BEFORE  USING   THE   SOFTWARE.   BY
+DOWNLOADING, INSTALLING, COPYING OR USING THE SOFTWARE, YOU ARE AGREEING  TO
+BE BOUND BY THE TERMS OF THIS LICENSE.  IF YOU ARE  ACCESSING  THE  SOFTWARE
+ELECTRONICALLY,  SIGNIFY  YOUR  AGREEMENT  BY  CLICKING  THE  "AGREE/ACCEPT"
+BUTTON.  IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE,  PROMPTLY  RETURN
+THE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT  AND  (IF  APPLICABLE)  YOUR
+MONEY WILL BE REFUNDED OR IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY  CLICK
+"DISAGREE/DECLINE".
+
+1. License.  Advanced  Micro   Devices,  Inc.,  on  behalf  of  itself,  its  
+subsidiaries  and  licensors (referred  collectively as "AMD") grants to you  
+the  following  non-exclusive,  right  to  use  the  software   accompanying   
+this   License  (hereinafter  "Software") subject to the following terms and 
+limitations:
+
+
+(a)   Regardless of the media upon which it is distributed, the Software  is
+licensed to you for use solely in conjunction with AMD hardware products  to
+which the Software relates ("AMD Hardware").
+
+(b)   You own the medium on which the Software is recorded, but AMD and,  if
+applicable,  its  licensors  retain  title  to  the  Software  and   related
+documentation.
+
+(c)   You may:
+
+  i) use the Software solely in  connection  with  the  AMD  Hardware  on  a
+   single computer;
+
+  ii) make one copy of the Software  in  machine-readable  form  for  backup
+   purposes only. You must reproduce on such copy AMD's copyright notice and
+   any other proprietary legends that were  on  the  original  copy  of  the
+   Software;
+
+  iii) transfer all your license rights in the Software  provided  you  must
+   also transfer a copy of this License, the backup copy  of  the  Software,
+   the AMD Hardware and the related documentation  and  provided  the  other
+   party reads and agrees  to  accept  the  terms  and  conditions  of  this
+   License.  Upon such transfer your license rights are then terminated.
+
+(d)   In addition to the license terms above, with respect  to  portions  of
+the Software in source code or binary  form  designed  exclusively  for  use
+with the Linux operating system ("AMD Linux Code"), you  may  use,  display,
+modify, copy, distribute, allow others to  re-distribute,  package  and  re-
+package such AMD Linux Code  for  commercial  and  non-commercial  purposes,
+provided that:
+
+   i) all binary components of the AMD Linux Code are not  modified  in  any
+   way;
+
+   ii) the AMD Linux Code is only used  as  part  of  the  Software  and  in
+   connection with AMD Hardware;
+
+   iii) all copyright notices of AMD are reproduced and you refer  to  these
+   license terms;
+
+   iv) you  may  not  offer  or  impose any terms on the use  of  AMD  Linux
+   Code that alter or restrict this License; and
+
+   v) if you have modified the AMD Linux Code, such  modifications  will  be
+   made publicly available and are licensed under the  same  terms  provided
+   herein to AMD or any  other  third  party  without  further  restriction,
+   royalty or any other license requirement;
+
+   vi) to  the  extent  there  is  any AMD sample or  control  panel  source
+   code included in the AMD Linux Code, no rights are granted to modify such
+   code except for portions thereof that  may  be  subject  to  third  party
+   license terms that grant such rights; 
+   
+   vii) no rights are granted to distribute the binary form of the AMD Linux
+   Kernel Module made by linking the AMD Proprietary  Kernel Library and the 
+   AMD  Kernel  Compatibility  Layer  binary  compiled  using  Linux  kernel 
+   headers;
+
+   viii) AMD is not  obligated  to  provide  any  maintenance  or  technical 
+   support for any code resulting from AMD Linux Code.
+
+2.  Restrictions.  The Software contains copyrighted and patented  material,
+trade secrets and other proprietary material.  In  order  to  protect  them,
+and except as permitted by this license or applicable legislation,  you  may
+not:
+
+  a) decompile,  reverse  engineer,  disassemble  or  otherwise  reduce  the
+   Software to a human-perceivable form;
+
+  b) modify, network, rent, lend,  loan,  distribute  or  create  derivative
+   works based upon the Software in whole or in part; or
+
+  c) electronically transmit the Software from one computer  to  another  or
+   over a network or otherwise transfer the Software except as permitted  by
+   this License.
+
+3.  Termination.  This License  is  effective  until  terminated.   You  may
+terminate this License at any  time  by  destroying  the  Software,  related
+documentation  and  all  copies  thereof.   This  License   will   terminate
+immediately without  notice  from  AMD  if  you  fail  to  comply  with  any
+provision of this License.  Upon termination you must destroy the  Software,
+related documentation and all copies thereof.
+
+4.  Government End Users. If you are acquiring the  Software  on  behalf  of
+any  unit  or  agency  of  the  United  States  Government,  the   following
+provisions apply.  The Government  agrees  the  Software  and  documentation
+were  developed  at  private  expense  and  are  provided  with  "RESTRICTED
+RIGHTS".  Use, duplication, or disclosure by the Government  is  subject  to
+restrictions as set forth in DFARS 227.7202-1(a) and  227.7202-3(a)  (1995),
+DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR  12.212(a)(1995),  FAR  52.227-
+19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended  from  time
+to time.  In the event that this License, or any  part  thereof,  is  deemed
+inconsistent with the minimum rights identified  in  the  Restricted  Rights
+provisions, the minimum rights shall prevail.
+
+5.  No Other License.  No rights or licenses are granted by AMD  under  this
+License, expressly or  by  implication,  with  respect  to  any  proprietary
+information  or  patent,  copyright,  trade  secret  or  other  intellectual
+property right owned or controlled by AMD, except as expressly  provided  in
+this License.
+
+6.  Additional Licenses.  DISTRIBUTION  OR  USE  OF  THE  SOFTWARE  WITH  AN
+OPERATING SYSTEM MAY REQUIRE ADDITIONAL LICENSES FROM THE  OPERATING  SYSTEM
+VENDOR.
+
+7.  Disclaimer of Warranty  on  Software.   You  expressly  acknowledge  and
+agree that use of the Software is at  your  sole  risk.   The  Software  and
+related documentation are provided "AS IS" and without warranty of any  kind
+and AMD EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED,  INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF  MERCHANTABILITY  AND  FITNESS
+FORA PARTICULAR  PURPOSE,  OF  QUALITY,  OF  QUIET  ENJOYMENT  AND  OF  NON-
+INFRINGEMENT  OF  THIRD  PARTY  RIGHTS.   AMD  DOES  NOT  WARRANT  THAT  THE
+FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET  YOUR  REQUIREMENTS,  OR  THAT
+THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE,  OR  THAT
+DEFECTS IN THE SOFTWARE WILL BE  CORRECTED.   THE  ENTIRE  RISK  AS  TO  THE
+RESULTS AND PERFORMANCE OF THE SOFTWARE IS  ASSUMED  BY  YOU.   FURTHERMORE,
+AMD DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS  REGARDING  THE  USE  ORTHE
+RESULTS OF THE USE OF THE SOFTWARE OR  RELATED  DOCUMENTATION  IN  TERMS  OF
+THEIR CORRECTNESS, ACCURACY,  RELIABILITY,  CURRENTNESS,  OR  OTHERWISE.  NO
+ORAL OR WRITTEN INFORMATION OR ADVICE  GIVEN  BY  AMD  OR  AMD'S  AUTHORIZED
+REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE THE  SCOPE  OF
+THIS WARRANTY.  SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU  (AND  NOT  AMD  OR
+AMD'S AUTHORIZED REPRESENTATIVE) ASSUME THE ENTIRE  COST  OF  ALL  NECESSARY
+SERVICING, REPAIR OR CORRECTION.  THE SOFTWARE IS NOT INTENDED  FOR  USE  IN
+MEDICAL, LIFE SAVING OR LIFE SUSTAINING  APPLICATIONS.   SOME  JURISDICTIONS
+DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES,  SO  THE  ABOVE  EXCLUSION
+MAY NOT APPLY TO YOU.
+
+8.  Limitation of Liability. TO THE MAXIMUM EXTENT PERMITTED BY  LAW,  UNDER
+NO  CIRCUMSTANCES  INCLUDING  NEGLIGENCE,  SHALL  AMD,  OR  ITS   DIRECTORS,
+OFFICERS, EMPLOYEES  OR  AGENTS,  BE  LIABLE  TO  YOU  FOR  ANY  INCIDENTAL,
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES  FOR  LOSS  OF
+BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS  OF  BUSINESS INFORMATION, AND
+THE LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO  USE  THE  SOFTWARE
+OR RELATED DOCUMENTATION, BREACH OR DEFAULT, INCLUDING  THOSE  ARISING  FROM
+INFRINGEMENT OR ALLEGED INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT  OR
+OTHER INTELLECTUAL PROPERTY RIGHT, BY AMD, EVEN IF AMD OR  AMD'S  AUTHORIZED
+REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF  SUCH  DAMAGES.   SOME
+JURISDICTIONS DO NOT ALLOW THE LIMITATION  OR  EXCLUSION  OF  LIABILITY  FOR
+INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE  LIMITATION  OR  EXCLUSION
+MAY NOT APPLY TO YOU.  AMD will not be liable for 1) loss of, or damage  to,
+your records or data or 2) any damages claimed by you  based  on  any  third
+party claim.   In no event shall  AMD's  total  liability  to  you  for  all
+damages, losses, and causes of action (whether in contract, tort  (including
+negligence) or otherwise) exceed the amount paid by you  for  the  Software.
+The foregoing limitations will apply even if  the  above  stated  limitation
+fails of its essential purpose.
+
+9.  Controlling Law and Severability.  This License  shall  be  governed  by
+and construed under the laws of the  Province  of  Ontario,  Canada  without
+reference to its conflict of law principles.   Any  dispute  related  hereto
+will be brought only in the courts in  Toronto,  Ontario,  Canada  and  such
+courts are agreed  to  be  the  convenient  forum.   In  the  event  of  any
+conflicts between foreign law, rules, and  regulations,  and  Canadian  law,
+rules, and regulations, Canadian law, rules and  regulations  shall  prevail
+and  govern.   The  United  Nations  Convention   on   Contracts   for   the
+International Sale of Goods shall not apply to this  License.   If  for  any
+reason a court  of  competent  jurisdiction  finds  any  provision  of  this
+License or portion thereof, to  be  unenforceable,  that  provision  of  the
+License shall be enforced to the maximum extent permissible so as to  effect
+the intent of the parties, and the remainder of this License shall  continue
+in full force and effect.
+
+10.  Complete Agreement.  This  License  constitutes  the  entire  agreement
+between the parties with respect to the use of the Software and the  related
+documentation, and supersedes all prior  or  contemporaneous  understandings
+or  agreements,  written  or  oral,  regarding  such  subject  matter.    No
+amendment to or modification of this  License  will  be  binding  unless  in
+writing and signed by a duly authorized representative of AMD.

packages/3rdparty/download/CouchPotato/meta

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="CouchPotato"
+PKG_VERSION="2504efc"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/RuudBurger/CouchPotato"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="Python SABnzbd"
+PKG_BUILD_DEPENDS="toolchain Python"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="CouchPotato: automated movie downloading."
+PKG_LONGDESC="CouchPotato: automated movie downloading."
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/download/SABnzbd/meta

@@ -19,18 +19,19 @@
 ################################################################################
 
 PKG_NAME="SABnzbd"
-PKG_VERSION="0.5.6"
+PKG_VERSION="0.6.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
-PKG_DEPENDS="Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/sabnzbd-${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"
-PKG_SECTION="plugins"
-PKG_SHORTDESC="SABnzbd: makes Usenet as simple and streamlined as possible by automating everything we can."
-PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
+PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
+
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

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

@@ -0,0 +1,231 @@
+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
+@@ -76,16 +76,6 @@
+           <span class="component-desc">$T('explain-dirscan_speed')</span>
+         </label>
+       </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="script_dir">
+-          <span class="component-title">$T('opt-script_dir')</span>
+-          <input type="text" size="50" name="script_dir" id="script_dir" value="$script_dir">
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-script_dir')</span>
+-        </label>
+-      </div>
+       <div class="field-pair alt">
+         <label class="nocheck clearfix" for="email_dir">
+           <span class="component-title">$T('opt-email_dir')</span>
+@@ -109,49 +99,6 @@
+     </fieldset>
+   </div><!-- /component-group1 -->
+ 
+-  <div id="core-component-group2" class="component-group clearfix">
+-    <div class="component-group-desc">
+-      <h3>$T('systemFolders')</h3>
+-      <p><small>$T('base-folder'):<br/>$my_lcldata</small></p>
+-    </div>
+-    <fieldset class="component-group-list">
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="admin_dir">
+-          <span class="component-title">$T('opt-admin_dir')</span>
+-          <input type="text" size="50" name="admin_dir" id="admin_dir" value="$admin_dir">
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-admin_dir1')</span>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-admin_dir2')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair alt">
+-        <label class="nocheck clearfix" for="log_dir">
+-          <span class="component-title">$T('opt-log_dir')</span>
+-          <input type="text" size="50" name="log_dir" id="log_dir" value="$log_dir">
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-log_dir')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="nzb_backup_dir">
+-          <span class="component-title">$T('opt-nzb_backup_dir')</span>
+-          <input type="text" size="50" name="nzb_backup_dir" id="nzb_backup_dir" value="$nzb_backup_dir">
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-nzb_backup_dir')</span>
+-        </label>
+-      </div>
+-    </fieldset>
+-  </div><!-- /component-group2 -->
+-
+   <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
+@@ -14,82 +14,6 @@
+     </div>
+     <fieldset class="component-group-list">
+       <div class="field-pair">
+-        <label class="nocheck clearfix" for="host">
+-          <span class="component-title">$T('opt-host')</span>
+-          <input type="text" name="host" id="host" value="$host"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-host')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair alt">
+-        <label class="nocheck clearfix" for="port">
+-          <span class="component-title">$T('opt-port')</span>
+-          <input type="text" name="port" id="port" size=8 value="$port"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-port')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="username">
+-          <span class="component-title">$T('opt-web_username')</span>
+-          <input type="text" name="username" id="username" value="$username"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-web_username')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair alt">
+-        <label class="nocheck clearfix" for="password">
+-          <span class="component-title">$T('opt-web_password')</span>
+-          <input type="password" name="password" id="password" value="$password"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-web_password')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="web_dir">
+-          <span class="component-title">$T('opt-web_dir')</span>
+-          <select name="web_dir" id="web_dir">
+-          <!--#for $webline in $web_list#-->
+-          <!--#if $webline.lower() == $web_dir.lower()#-->
+-            <option value="$webline" selected>$webline</option>
+-          <!--#else#-->
+-            <option value="$webline">$webline</option>
+-          <!--#end if#-->
+-          <!--#end for#-->
+-          </select>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-web_dir')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair alt">
+-        <label class="nocheck clearfix" for="web_dir2">
+-          <span class="component-title">$T('opt-web_dir2')</span>
+-          <select name="web_dir2" id="web_dir2">
+-          <!--#for $webline in $web_list2#-->
+-          <!--#if $webline.lower() == $web_dir2.lower()#-->
+-            <option value="$webline" selected>$webline</option>
+-          <!--#else#-->
+-            <option value="$webline">$webline</option>
+-          <!--#end if#-->
+-          <!--#end for#-->
+-          </select>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-web_dir2')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair">
+         <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 @@
+           <span class="component-desc">$T('explain-nzbkey')</span>
+         </label>
+       </div>
+-      <div class="field-pair alt">
+-        <label class="clearfix" for="disable_api_key">
+-          <input type="checkbox" name="disable_api_key" id="disable_api_key" value="1" <!--#if $disable_api_key > 0 then 'checked="1"' else ""#--> />
+-          <span class="component-title">$T('opt-disableApikey')</span>
+-          <span class="component-desc">$T('explain-disableApikey')</span>
+-        </label>
+-      </div>
+     </fieldset>
+   </div><!-- /component-group1 -->
+ 
+@@ -152,36 +69,6 @@
+           <span class="component-desc">$T('explain-enable_https')</span>
+         </label>
+       </div>
+-      <div class="field-pair alt">
+-        <label class="nocheck clearfix" for="https_port">
+-          <span class="component-title">$T('opt-https_port')</span>
+-          <input type="text" name="https_port" id="https_port" size="8" value="$https_port"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-https_port')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="https_cert">
+-          <span class="component-title">$T('opt-https_cert')</span>
+-          <input type="text" name="https_cert" id="https_cert" value="$https_cert"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-https_cert')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair alt">
+-        <label class="nocheck clearfix" for="https_key">
+-          <span class="component-title">$T('opt-https_key')</span>
+-          <input type="text" name="https_key" id="https_key" value="$https_key"/>
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-https_key')</span>
+-        </label>
+-      </div>
+     </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
+@@ -12,20 +12,6 @@
+       <h3>$T('swtag-general')</h3>
+     </div>
+     <fieldset class="component-group-list">
+-      <div class="field-pair">
+-        <input type="checkbox" name="check_new_rel" id="check_new_rel" value="1" <!--#if $check_new_rel > 0 then "checked=1" else ""#--> />
+-        <label class="clearfix" for="check_new_rel">
+-          <span class="component-title">$T('opt-check_new_rel')</span>
+-          <span class="component-desc">$T('explain-check_new_rel')</span>
+-        </label>
+-      </div>
+-      <div class="field-pair alt">
+-        <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if $auto_browser > 0 then "checked=1" else ""#--> />
+-        <label class="clearfix" for="auto_browser">
+-          <span class="component-title">$T('opt-auto_browser')</span>
+-          <span class="component-desc">$T('explain-auto_browser')</span>
+-        </label>
+-      </div>
+       <!--#if $have_ampm#-->
+       <div class="field-pair">
+         <input type="checkbox" name="ampm" id="ampm" value="1" <!--#if $ampm > 0 then "checked=1" else ""#--> />

packages/3rdparty/download/SickBeard/meta

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="SickBeard"
+PKG_VERSION="cb76543"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/midgetspy/Sick-Beard"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS="Python SABnzbd Cheetah"
+PKG_BUILD_DEPENDS="toolchain Python Cheetah"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="SickBeard: automated TV show downloading."
+PKG_LONGDESC="SickBeard: automated TV show downloading."
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-001-remove_logo_update-header_and_donate_button-0.1.patch

@@ -0,0 +1,44 @@
+diff -Naur SickBeard-48caf04/data/interfaces/default/config.tmpl SickBeard-48caf04.patch/data/interfaces/default/config.tmpl
+--- SickBeard-48caf04/data/interfaces/default/config.tmpl	2011-04-22 19:15:10.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/config.tmpl	2011-04-23 03:57:14.515808144 +0200
+@@ -24,9 +24,4 @@
+ </table>
+ </div>
+ 
+-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
+-    <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
+-    <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
+-</tr></table>
+-
+ #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
+--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl	2011-04-22 19:15:10.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl	2011-04-23 03:59:09.088665913 +0200
+@@ -147,19 +147,6 @@
+ </head>
+ 
+ <body>
+-#if $sickbeard.NEWEST_VERSION_STRING:
+-<div id="upgrade-notification">
+-    <div>
+-        <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
+-    </div>
+-</div>
+-<div id="header-fix"></div>
+-#end if
+-<div id="header">
+-    <a name="top"></a>
+-    <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
+-    <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
+-</div>
+ <ul id="MainMenu" class="sf-menu">
+             <li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
+                 <ul>
+@@ -197,7 +184,6 @@
+                         <li><a href="$sbRoot/errorlogs/viewlog"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
+                 </ul>
+             </li>
+-            <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
+ </ul>
+ #if $varExists('submenu'):
+ <div id="SubMenu">

packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-002-remove_default_settings-0.3.patch

@@ -0,0 +1,74 @@
+diff -Naur SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl
+--- SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl	2011-04-23 03:55:23.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl	2011-04-23 18:01:29.330455515 +0200
+@@ -484,48 +484,6 @@
+ 
+                 </div>
+ 
+-
+-                <div id="core-component-group7" class="component-group clearfix">
+-                    <div class="component-group-desc">
+-                        <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="Libnotify" title="Libnotify" width="16" height="16" /> Libnotify</a></h3>
+-                        <p>The standard desktop notification API for Linux/*nix systems.  This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
+-                    </div>
+-
+-                    <fieldset class="component-group-list">
+-                        <div class="field-pair">
+-                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# /> 
+-                            <label class="clearfix" for="use_libnotify">
+-                                <span class="component-title">Enable</span>
+-                                <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div id="content_use_libnotify">
+-                        <div class="field-pair">
+-                            <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# /> 
+-                            <label class="clearfix" for="libnotify_notify_onsnatch">
+-                                <span class="component-title">Notify on Snatch</span>
+-                                <span class="component-desc">Send notification when we start a download?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="field-pair">
+-                            <input type="checkbox" name="libnotify_notify_ondownload" id="libnotify_notify_ondownload" #if $sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
+-                            <label class="clearfix" for="libnotify_notify_ondownload">
+-                                <span class="component-title">Notify on Download</span>
+-                                <span class="component-desc">Send notification when we finish a download?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
+-                        <input type="button" value="Test Libnotify" id="testLibnotify" />
+-                        <input type="submit" class="config_submitter" value="Save Changes" />
+-
+-                        </div><!-- /content_use_libnotify //-->
+-
+-                    </fieldset>
+-                </div><!-- /component-group //-->
+-
+                 <div id="core-component-group8" class="component-group clearfix">
+ 
+                     <div class="component-group-desc">
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
+--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl	2011-04-23 03:59:09.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl	2011-04-23 14:24:01.035048035 +0200
+@@ -172,7 +172,6 @@
+             </li>
+             <li id="NAVconfig"><a href="$sbRoot/config">Config</a>
+                 <ul>
+-                        <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
+                         <li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
+                         <li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
+                         <li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
+diff -Naur SickBeard-48caf04/sickbeard/webserve.py SickBeard-48caf04.patch/sickbeard/webserve.py
+--- SickBeard-48caf04/sickbeard/webserve.py	2011-04-23 03:55:23.000000000 +0200
++++ SickBeard-48caf04.patch/sickbeard/webserve.py	2011-04-23 17:55:09.270813146 +0200
+@@ -583,7 +583,6 @@
+ 
+ 
+ ConfigMenu = [
+-    { 'title': 'General',           'path': 'config/general/'          },
+     { 'title': 'Search Settings',   'path': 'config/search/'           },
+     { 'title': 'Search Providers',  'path': 'config/providers/'        },
+     { 'title': 'Post Processing',   'path': 'config/postProcessing/'   },

packages/accessibility/atk/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="atk"
-PKG_VERSION="1.33.6"
+PKG_VERSION="2.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/1.33/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/2.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib"
 PKG_BUILD_DEPENDS="toolchain glib"
 PKG_PRIORITY="optional"

packages/addons/debugging/tools/evtest/addon

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. 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
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/zlib-[0-9]*/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib

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

@@ -0,0 +1,11 @@
+0.99.3
+- change icon
+
+0.99.2
+- build as shared lib
+- include libiconv libs
+- include libxml2 libs
+- include zlib libs
+
+0.99.1
+- initial addon based on evtest-1.27

packages/addons/debugging/tools/evtest/meta

@@ -19,18 +19,20 @@
 ################################################################################
 
 PKG_NAME="evtest"
-PKG_VERSION="20110214"
-PKG_REV="1"
+PKG_VERSION="1.27"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://cgit.freedesktop.org/~whot/evtest/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libxml2"
-PKG_BUILD_DEPENDS="toolchain libxml2"
+PKG_SITE="http://cgit.freedesktop.org/evtest/"
+PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libiconv libxml2"
+PKG_BUILD_DEPENDS="toolchain libiconv libxml2"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="debug/tools"
 PKG_SHORTDESC="evtest: Simple tool for input event debugging."
 PKG_LONGDESC="evtest is a simple tool for input event debugging."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"

packages/addons/debugging/tools/evtest/source/bin/evtest

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest"
+
+chmod +x $ADDON_DIR/lib/*
+
+LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest.bin $@

packages/addons/debugging/tools/evtest/source/bin/evtest-capture

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest"
+
+chmod +x $ADDON_DIR/lib/*
+
+LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest-capture.bin $@

packages/addons/debugging/tools/evtest/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

packages/addons/debugging/tools/htop/addon

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin/htop.bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/ncurses-[0-9]*/lib/libtinfo.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/ncurses-[0-9]*/lib/libncurses.so* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/debugging/tools/htop/build

@@ -33,7 +33,6 @@ ac_cv_func_realloc_0_nonnull=yes \
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
+            --with-gnu-ld
 
 make

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

@@ -0,0 +1,12 @@
+0.99.4
+- change icon
+
+0.99.3
+- build as shared lib
+- include ncurses libs
+
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on htop-0.9

packages/addons/debugging/tools/htop/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="0.9"
-PKG_REV="1"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
@@ -28,9 +28,11 @@ PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSIO
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="debug/tools"
 PKG_SHORTDESC="htop: Htop is an ncurses based interactive process viewer for Linux."
 PKG_LONGDESC="Htop is an ncurses based interactive process viewer for Linux."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"

packages/addons/debugging/tools/htop/source/bin/htop

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="$HOME/.xbmc/addons/debug.tools.htop"
+
+chmod +x $ADDON_DIR/lib/*
+
+LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" htop.bin $@

packages/addons/debugging/tools/htop/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

packages/addons/multimedia/libav/addon

@@ -22,8 +22,8 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/build.Linux/tvheadend $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-mkdir -p $INSTALL/etc/pm/sleep.d
-  cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
+  cp $PKG_BUILD/ffpresets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg

packages/addons/multimedia/libav/build

@@ -0,0 +1,165 @@
+#!/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
+
+# libav fails building with LTO support
+  strip_lto
+
+if [ "$VDPAU" = yes ]; then
+  FFMPEG_VDPAU="--enable-vdpau"
+else
+  FFMPEG_VDPAU="--disable-vdpau"
+fi
+
+if [ "$VAAPI" = yes ]; then
+  FFMPEG_VAAPI="--enable-vaapi"
+else
+  FFMPEG_VAAPI="--disable-vaapi"
+fi
+
+cd $PKG_BUILD/
+./configure --prefix=/storage/.xbmc/addons/lib.multimedia.$1 \
+            --datadir=/storage/.xbmc/addons/lib.multimedia.$1/ffmpeg \
+            --cpu=$TARGET_CPU \
+            --arch=$TARGET_ARCH \
+            --enable-cross-compile \
+            --cross-prefix=$TARGET_PREFIX \
+            --sysroot=$SYSROOT_PREFIX \
+            --sysinclude="$SYSROOT_PREFIX/usr/include" \
+            --target-os="linux" \
+            --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" \
+            --extra-libs="" \
+            --extra-version="" \
+            --build-suffix="" \
+            --enable-static \
+            --disable-shared \
+            --enable-gpl \
+            --disable-version3 \
+            --disable-nonfree \
+            --enable-logging \
+            --enable-doc \
+            --enable-ffmpeg \
+            --disable-ffplay \
+            --disable-ffprobe \
+            --disable-ffserver \
+            --enable-avdevice \
+            --enable-avcodec \
+            --enable-avformat \
+            --enable-swscale \
+            --enable-postproc \
+            --enable-avfilter \
+            --enable-pthreads \
+            --disable-w32threads \
+            --disable-x11grab \
+            --enable-network \
+            --disable-gray \
+            --enable-swscale-alpha \
+            --enable-fastdiv \
+            --enable-small \
+            --enable-aandct \
+            --enable-dct \
+            --enable-fft \
+            --enable-golomb \
+            --enable-huffman \
+            --enable-lpc \
+            --enable-mdct \
+            --enable-rdft \
+            $FFMPEG_VAAPI \
+            $FFMPEG_VDPAU \
+            --disable-dxva2 \
+            --enable-runtime-cpudetect \
+            --disable-hardcoded-tables \
+            --disable-memalign-hack \
+            --enable-encoders \
+            --enable-decoders \
+            --enable-hwaccels \
+            --enable-muxers \
+            --enable-demuxers \
+            --enable-parsers \
+            --enable-bsfs \
+            --enable-protocols \
+            --enable-indevs \
+            --enable-outdevs \
+            --enable-filters \
+            --disable-avisynth \
+            --enable-bzlib \
+            --disable-frei0r \
+            --disable-libopencore-amrnb \
+            --disable-libopencore-amrwb \
+            --disable-libopencv \
+            --disable-libdc1394 \
+            --disable-libdirac \
+            --disable-libfaac \
+            --disable-libfreetype \
+            --disable-libgsm \
+            --disable-libmp3lame \
+            --disable-libnut \
+            --disable-libopenjpeg \
+              --disable-librtmp \
+            --disable-libschroedinger \
+            --disable-libspeex \
+            --disable-libtheora \
+            --disable-libvo-aacenc \
+            --disable-libvo-amrwbenc \
+            --disable-libvorbis \
+            --disable-libvpx \
+            --disable-libx264 \
+            --disable-libxavs \
+            --disable-libxvid \
+            --disable-mlib \
+            --enable-zlib \
+            --enable-asm \
+            --disable-altivec \
+            --enable-amd3dnow \
+            --enable-amd3dnowext \
+            --enable-mmx \
+            --enable-mmx2 \
+            --enable-sse \
+            --enable-ssse3 \
+            --disable-avx \
+            --disable-armv5te \
+            --disable-armv6 \
+            --disable-armv6t2 \
+            --disable-armvfp \
+            --disable-iwmmxt \
+            --disable-mmi \
+            --disable-neon \
+            --disable-vis \
+            --enable-yasm \
+            --disable-sram \
+            --disable-symver \
+            --disable-debug \
+            --enable-optimizations \
+            --disable-extra-warnings \
+
+make

packages/addons/multimedia/libav/changelog.txt

@@ -0,0 +1,8 @@
+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/libav/meta

@@ -0,0 +1,47 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libav"
+PKG_VERSION="0.7"
+PKG_REV="3"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.libav.org"
+PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
+PKG_PRIORITY="optional"
+PKG_SECTION="lib/multimedia"
+PKG_SHORTDESC="libav: A complete audio and video stream library"
+PKG_LONGDESC="libav is a complete solution to record, convert and stream audio and video forked from FFMPEG. It includes libavcodec, the leading audio/video codec library."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_AUTORECONF="no"
+
+if [ "$VDPAU" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
+fi
+
+if [ "$VAAPI" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva"
+fi
+

packages/addons/multimedia/libav/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

packages/addons/multimedia/makemkv/addon

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+MAKEMKV_ARCH=i386
+[ "$TARGET_ARCH" = x86_64 ] && MAKEMKV_ARCH=amd64
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/bin/bin/$MAKEMKV_ARCH/makemkvcon $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/lib/out/libmakemkv.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/lib/out/libdriveio.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/multimedia/makemkv/build

@@ -22,5 +22,6 @@
 
 . config/options $1
 
-cd $PKG_BUILD/HAL/rtl8192
-  make V=1 CC=$CC KSRC=$(kernel_path) modules
+cd $PKG_BUILD/lib
+
+make GCC=$CC -f makefile.linux

packages/addons/multimedia/makemkv/changelog.txt

@@ -0,0 +1,5 @@
+0.99.2
+- change icon
+
+0.99.1
+- initial addon based on makemkv-1.6.10

packages/addons/multimedia/makemkv/meta

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="makemkv"
+PKG_VERSION="1.6.10"
+PKG_REV="2"
+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_DEPENDS="openssl"
+PKG_BUILD_DEPENDS="toolchain openssl"
+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."
+PKG_LONGDESC="MakeMKV can instantly stream decrypted video without intermediate conversion to wide range of players, so you may watch Blu-ray and DVD discs with your favorite player on your favorite OS or on your favorite device."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_AUTORECONF="no"

packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch

@@ -0,0 +1,27 @@
+diff -Naur makemkv-1.6.10/lib/makefile.linux makemkv-1.6.10.patch/lib/makefile.linux
+--- makemkv-1.6.10/lib/makefile.linux	2011-05-29 23:17:48.000000000 +0200
++++ makemkv-1.6.10.patch/lib/makefile.linux	2011-05-30 15:29:15.510417904 +0200
+@@ -1,11 +1,11 @@
+ 
+ include makefile.common
+ 
+-GCC=gcc
+-RCC=rcc
++GCC:=gcc
++RCC:=rcc
+ MOC=$(strip $(shell which moc-qt4))
+ ifeq ($(MOC),)
+-MOC=moc
++MOC:=moc
+ endif
+ 
+ CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
+@@ -14,7 +14,7 @@
+ BUILDINFO_BUILD_DATE=$(shell date)
+ 
+ 
+-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
++all: out/libdriveio.so.0 out/libmakemkv.so.1
+ 	@echo "type \"sudo make -f makefile.linux install\" to install"
+ 
+ clean:

packages/addons/multimedia/makemkv/source/bin/makemkvcon

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv"
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
+
+chmod 755 $ADDON_DIR/lib/*
+makemkvcon.bin $@

packages/addons/multimedia/makemkv/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

packages/addons/multimedia/makemkv/unpack

@@ -0,0 +1,38 @@
+#!/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
+
+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
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
+done

packages/addons/networking/backup/rsync/addon

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/networking/backup/rsync/build

@@ -0,0 +1,34 @@
+#!/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 --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-acl-support \
+            --disable-xattr-support \
+
+make

packages/addons/networking/backup/rsync/changelog.txt

@@ -0,0 +1,8 @@
+0.99.3
+- change icon
+
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on rsync-3.0.8

packages/addons/networking/backup/rsync/meta

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="rsync"
+PKG_VERSION="3.0.8"
+PKG_REV="3"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
+PKG_URL="ftp://rsync.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain libiconv"
+PKG_PRIORITY="optional"
+PKG_SECTION="network/backup"
+PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"
+PKG_LONGDESC="Rsync uses an own 'rsync' algorithm which provides a very fast method for bringing remote files into sync. It does this by sending just the differences in the files across the link, without requiring that both sets of files are present at one of the ends of the link beforehand. At first glance this may seem impossible because the calculation of diffs between two files normally requires local access to both files."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_AUTORECONF="yes"

packages/addons/networking/backup/rsync/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

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

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/par2cmdline-*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd
+  cp -PR $BUILD/SABnzbd-*/* $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
+  cp -PR $BUILD/SickBeard-*/* $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
+  cp -PR $BUILD/CouchPotato-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato

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

@@ -0,0 +1,2 @@
+0.99.1
+- initial version SABnzbd-Suite

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

@@ -0,0 +1,5 @@
+<settings>
+    <setting id="SABNZBD_IP" value="0.0.0.0" />
+    <setting id="SABNZBD_PWD" value="" />
+    <setting id="SABNZBD_USER" value="" />
+</settings>

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

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="SABnzbd-Suite"
+PKG_VERSION="0.99"
+PKG_REV="1"
+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"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard and Couchpotato in one Addon"
+PKG_LONGDESC="SABnzbd-Suite makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"

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

@@ -0,0 +1,299 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.SABnzbd-Suite"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite"
+
+  SABNZBDSUITE_SETTINGS="$ADDON_HOME/settings.xml"
+  SABNZBD_SETTINGS="$ADDON_HOME/sabnzbd.ini"
+  SICKBEARD_SETTINGS="$ADDON_HOME/config.ini"
+  COUCHPOTATO_SETTINGS="$ADDON_HOME/couchpotato.ini"
+  XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
+
+  export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
+
+################################################################################
+# default sabnzbd values
+################################################################################
+  SABNZBD_HOST="127.0.0.1"
+  SABNZBD_PORT="8081"
+  SABNZBD_DISABLEAPIKEY="0"
+  SABNZBD_CHECKRELEASE="0"
+  SABNZBD_LAUNCHBROWSER="0"
+
+  SABNZBD_HTTPPORT="8081"
+  SABNZBD_HTTPSPORT="9081"
+  SABNZBD_HTTPSCERT="server.cert"
+  SABNZBD_HTTPSKEY="server.key"
+
+  SABNZBD_SKIN="Plush"
+  SABNZBD_SKIN2="Plush"
+  SABNZBD_WEBCOLOR="gold"
+  SABNZBD_WEBCOLOR2="gold"
+
+  SABNZBD_LOGDIR="logs"
+  SABNZBD_ADMINDIR="admin"
+  SABNZBD_BACKUPDIR="backup"
+  SABNZBD_SCRIPTDIR="scripts"
+
+  SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete"
+  SABNZBD_COMPLETEDIR="/storage/downloads"
+  SABNZBD_WATCHDIR="/storage/downloads/watch"
+
+################################################################################
+# default sickbeard values
+################################################################################
+  SICKBEARD_LOGDIR="log"
+  SICKBEARD_CACHEDIR="cache"
+  SICKBEARD_PORT="8082"
+  SICKBEARD_LAUNCHBROWSER="0"
+  SICKBEARD_VERSIONCHECK="0"
+  SICKBEARD_USEIPV6="0"
+  SICKBEARD_WEBLOG="0"
+
+  SICKBEARD_USEXBMC="1"
+  SICKBEARD_METADATAXBMC="1|1|1|1|1|1"
+
+################################################################################
+# default couchpotato values
+################################################################################
+  COUCHPOTATO_LAUNCHBROWSER="False"
+  COUCHPOTATO_VERSIONCHECK="False"
+  COUCHPOTATO_PORT="8083"
+  COUCHPOTATO_USEXBMC="True"
+  COUCHPOTATO_UPDATEXBMC="True"
+
+################################################################################
+# setup functions
+################################################################################
+
+write_sabnzbd_ini() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$SABNZBD_SETTINGS \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+write_sickbeard_ini() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$SICKBEARD_SETTINGS \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+write_couchpotato_ini() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$COUCHPOTATO_SETTINGS \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+read_sabconfig() {
+python $ADDON_DIR/bin/ini_tool --action=read \
+                               --file=$SABNZBD_SETTINGS \
+                               --option="$1:$2"
+}
+
+
+read_xbmcconfig() {
+grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,</$1>,,"
+}
+
+write_ini_postprocess() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$ADDON_HOME/$SABNZBD_SCRIPTDIR/autoProcessTV.cfg \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+################################################################################
+# read xbmc settings
+################################################################################
+  XBMC_HOST="127.0.0.1"
+  XBMC_PORT=`read_xbmcconfig webserverport`
+  XBMC_USER=`read_xbmcconfig webserverusername`
+  XBMC_PWD=`read_xbmcconfig webserverpassword`
+
+################################################################################
+# create default config
+################################################################################
+
+  mkdir -p $ADDON_HOME
+
+  if [ ! -f "$SABNZBDSUITE_SETTINGS" ]; then
+    cp $ADDON_DIR/settings-default.xml $SABNZBDSUITE_SETTINGS
+  fi
+
+################################################################################
+# read settings from xbmc setup dialog
+################################################################################
+  SABNZBD_USER=`grep SABNZBD_USER $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  SABNZBD_PWD=`grep SABNZBD_PWD $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  SICKBEARD_IP="$SABNZBD_IP"
+  COUCHPOTATO_IP="$SABNZBD_IP"
+
+################################################################################
+# setup sabnzbd ini file
+################################################################################
+  if [ -z "$SABNZBD_IP" ]; then
+    SABNZBD_IP="0.0.0.0"
+  fi
+
+  if [ ! -f "$ADDON_HOME/sabnzbd.ini" ]; then
+    SABNZBD_FIRSTRUN="yes"
+  fi
+
+  write_sabnzbd_ini misc disable_api_key $SABNZBD_DISABLEAPIKEY
+  write_sabnzbd_ini misc check_new_rel $SABNZBD_CHECKRELEASE
+  write_sabnzbd_ini misc auto_browser $SABNZBD_LAUNCHBROWSER
+  write_sabnzbd_ini misc username $SABNZBD_USER
+  write_sabnzbd_ini misc password $SABNZBD_PWD
+  write_sabnzbd_ini misc port $SABNZBD_HTTPPORT
+  write_sabnzbd_ini misc https_port $SABNZBD_HTTPSPORT
+  write_sabnzbd_ini misc https_cert $SABNZBD_HTTPSCERT
+  write_sabnzbd_ini misc https_key $SABNZBD_HTTPSKEY
+  write_sabnzbd_ini misc host $SABNZBD_IP
+  write_sabnzbd_ini misc web_dir $SABNZBD_SKIN
+  write_sabnzbd_ini misc web_dir2 $SABNZBD_SKIN2
+  write_sabnzbd_ini misc web_color $SABNZBD_WEBCOLOR
+  write_sabnzbd_ini misc web_color2 $SABNZBD_WEBCOLOR2
+  write_sabnzbd_ini misc log_dir $SABNZBD_LOGDIR
+  write_sabnzbd_ini misc admin_dir $SABNZBD_ADMINDIR
+  write_sabnzbd_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR
+  write_sabnzbd_ini misc script_dir $SABNZBD_SCRIPTDIR
+
+
+  if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then
+    mkdir -p "$SABNZBD_INCOMPLETEDIR"
+    mkdir -p "$SABNZBD_COMPLETEDIR"
+    mkdir -p "$SABNZBD_WATCHDIR"
+    write_sabnzbd_ini misc download_dir $SABNZBD_INCOMPLETEDIR
+    write_sabnzbd_ini misc complete_dir $SABNZBD_COMPLETEDIR
+    write_sabnzbd_ini misc dirscan_dir $SABNZBD_WATCHDIR
+
+    write_sabnzbd_ini servers:localhost name "localhost"
+    write_sabnzbd_ini servers:localhost host "localhost"
+    write_sabnzbd_ini servers:localhost port "119"
+    write_sabnzbd_ini servers:localhost enable "0"
+  fi
+
+################################################################################
+# setup postprocessing scripts file
+################################################################################
+  mkdir -p $ADDON_HOME/$SABNZBD_SCRIPTDIR
+    cp -P $ADDON_DIR/SickBeard/autoProcessTV/*.py $ADDON_HOME/$SABNZBD_SCRIPTDIR
+    chmod +x $ADDON_HOME/$SABNZBD_SCRIPTDIR/*.py
+
+  write_ini_postprocess SickBeard host localhost
+  write_ini_postprocess SickBeard port $SICKBEARD_PORT
+  write_ini_postprocess SickBeard username $SABNZBD_USER
+  write_ini_postprocess SickBeard password $SABNZBD_PWD
+
+################################################################################
+# start sabnzbd
+################################################################################
+  python $ADDON_DIR/SABnzbd/SABnzbd.py -d -f $ADDON_HOME/sabnzbd.ini -l 0
+
+################################################################################
+# read sabnzbd settings
+################################################################################
+  SABNZBD_APIKEY=`read_sabconfig misc api_key`
+
+################################################################################
+# setup sickbeard ini file
+################################################################################
+  if [ -z "$SICKBEARD_IP" ]; then
+    SICKBEARD_IP="0.0.0.0"
+  fi
+
+  if [ ! -f "$ADDON_HOME/config.ini" ]; then
+    SICKBEARD_FIRSTRUN="yes"
+  fi
+
+  write_sickbeard_ini General launch_browser $SICKBEARD_LAUNCHBROWSER
+  write_sickbeard_ini General version_notify $SICKBEARD_VERSIONCHECK
+  write_sickbeard_ini General log_dir $SICKBEARD_LOGDIR
+  write_sickbeard_ini General cache_dir $SICKBEARD_CACHEDIR
+  write_sickbeard_ini General web_port $SICKBEARD_PORT
+  write_sickbeard_ini General web_host $SICKBEARD_IP
+  write_sickbeard_ini General web_ipv6 $SICKBEARD_USEIPV6
+  write_sickbeard_ini General web_log $SICKBEARD_WEBLOG
+  write_sickbeard_ini General web_username $SABNZBD_USER
+  write_sickbeard_ini General web_password $SABNZBD_PWD
+
+  write_sickbeard_ini SABnzbd sab_username $SABNZBD_USER
+  write_sickbeard_ini SABnzbd sab_password $SABNZBD_PWD
+  write_sickbeard_ini SABnzbd sab_apikey $SABNZBD_APIKEY
+  write_sickbeard_ini SABnzbd sab_host "http://$SABNZBD_HOST:$SABNZBD_PORT/"
+
+  write_sickbeard_ini XBMC use_xbmc $SICKBEARD_USEXBMC
+  write_sickbeard_ini XBMC xbmc_host "$XBMC_HOST:$XBMC_PORT"
+  write_sickbeard_ini XBMC xbmc_username $XBMC_USER
+  write_sickbeard_ini XBMC xbmc_password $XBMC_PWD
+
+  if [ "$SICKBEARD_FIRSTRUN" = "yes" ]; then
+    write_sickbeard_ini General metadata_xbmc $SICKBEARD_METADATAXBMC
+  fi
+
+################################################################################
+# start sickbeard
+################################################################################
+  python $ADDON_DIR/SickBeard/SickBeard.py --daemon --datadir $ADDON_HOME
+
+################################################################################
+# setup couchpotato ini file
+################################################################################
+  if [ -z "$COUCHPOTATO_IP" ]; then
+    COUCHPOTATO_IP="0.0.0.0"
+  fi
+
+  if [ ! -f "$ADDON_HOME/couchpotato.ini" ]; then
+    COUCHPOTATO_FIRSTRUN="yes"
+  fi
+
+  write_couchpotato_ini global host $COUCHPOTATO_IP
+  write_couchpotato_ini global port $COUCHPOTATO_PORT
+  write_couchpotato_ini global username $SABNZBD_USER
+  write_couchpotato_ini global password $SABNZBD_PWD
+  write_couchpotato_ini global launchbrowser $COUCHPOTATO_LAUNCHBROWSER
+  write_couchpotato_ini global updater $COUCHPOTATO_VERSIONCHECK
+
+  write_couchpotato_ini Sabnzbd username $SABNZBD_USER
+  write_couchpotato_ini Sabnzbd password $SABNZBD_PWD
+  write_couchpotato_ini Sabnzbd apikey $SABNZBD_APIKEY
+  write_couchpotato_ini Sabnzbd host "$SABNZBD_HOST:$SABNZBD_PORT"
+
+  write_couchpotato_ini XBMC enabled $COUCHPOTATO_USEXBMC
+  write_couchpotato_ini XBMC host "$XBMC_HOST:$XBMC_PORT"
+  write_couchpotato_ini XBMC username $XBMC_USER
+  write_couchpotato_ini XBMC password $XBMC_PWD
+
+  if [ "$COUCHPOTATO_FIRSTRUN" = "yes" ]; then
+    write_couchpotato_ini XBMC updateoneonly $COUCHPOTATO_UPDATEXBMC
+  fi
+
+################################################################################
+# start couchpotato
+################################################################################
+  python $ADDON_DIR/CouchPotato/CouchPotato.py -d --datadir $ADDON_HOME --config $ADDON_HOME/couchpotato.ini

packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/ini_tool

@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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
+################################################################################
+
+from configobj import ConfigObj
+import sys
+import os
+import string
+
+python_major = sys.version_info[0]
+python_minor = sys.version_info[1]
+
+prog="ini_tool"
+description="""Read/Write config files.
+
+Examples:
+	%(prog)s --file config.ini --action read --option [section:]username
+	%(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog}
+
+def option_required_error(option):
+	parser.print_usage()
+	print prog + ": error: " + option + " is required"
+	exit(2)
+
+if python_major > 2 or (python_major == 2 and python_minor >= 7):
+	import argparse
+	
+	parser = argparse.ArgumentParser(
+		prog=prog,
+		description=description,
+		formatter_class=argparse.RawDescriptionHelpFormatter,
+		)
+
+	parser.add_argument('--file', help='file to read/write to/from', required=True)
+	parser.add_argument('--action', help='read|write', required=True)
+	parser.add_argument('--option', help='the option key', required=True)
+	parser.add_argument('--value', help='value to store in the given option (only for write action)')
+
+	options = parser.parse_args()
+
+else:
+	import optparse
+	
+	parser = optparse.OptionParser(
+		prog=prog,
+		description=description,
+		)
+
+	parser.add_option('--file', help='file to read/write to/from')
+	parser.add_option('--action', help='read|write')
+	parser.add_option('--option', help='the option key')
+	parser.add_option('--value', help='value to store in the given option (only for write action)')
+
+	(options, args) = parser.parse_args()
+
+	if not options.file:
+		option_required_error("--file")
+	if not options.action:
+		option_required_error("--action")
+	if not options.option:
+		option_required_error("--option")
+
+
+if options.action != "read" and options.action != "write":
+	print "'" + options.action + "' is not a valid action"
+	parser.print_help()
+	exit(2)
+
+if options.action == "read" and not os.path.isfile(options.file):
+	print "'" + options.file + "' is not a file"
+	exit(2)
+
+config = ConfigObj(options.file)
+keys = string.split(options.option, ":")
+key_len = len(keys)
+current_section = config
+
+if options.action == 'read':
+    i = 1
+    for key in keys:
+        if i == key_len:
+            print current_section[key]
+            exit(0)
+        else:
+            current_section = current_section[key]
+            i += 1
+elif options.action == 'write':
+    i = 1
+    for key in keys:
+        if i == key_len:
+            current_section[key] = options.value
+        elif key not in current_section:
+            current_section[key] = {}
+        current_section = current_section[key]
+        i += 1
+    
+    config.write()
+else:
+	exit(1)

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

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import xbmc, time, os, subprocess
+
+os.system("SABnzbd-Suite.service")

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
+	<string id="1010">Gebruikers instellingen</string>
+	<string id="1022">Gebruikersnaam</string>
+	<string id="1023">Wachtwoord</string>
+	<string id="2010">Netwerk instellingen</string>
+	<string id="2021">Toegestane IP adressen</string>
+
+</strings>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
+	<string id="1010">User Settings</string>
+	<string id="1022">Username</string>
+	<string id="1023">Password</string>
+	<string id="2010">Network Settings</string>
+	<string id="2021">Allowed IP addresses</string>
+
+</strings>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
+	<string id="1010">Préférences utilisateur</string>
+	<string id="1022">Nom d'utilisateur</string>
+	<string id="1023">Mot de passe</string>
+	<string id="2010">Préférences réseau</string>
+	<string id="2021">Adresses IP autorisées</string>
+
+</strings>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
+	<string id="1010">Benutzer Einstellungen</string>
+	<string id="1022">Benutzername</string>
+	<string id="1023">Passwort</string>
+	<string id="2010">Netzwerk Einstellungen</string>
+	<string id="2021">Erlaubte IP Adressen</string>
+
+</strings>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
+	<string id="1010">Bruker Instillinger</string>
+	<string id="1022">Brukernavn</string>
+	<string id="1023">Passord</string>
+	<string id="2010">Nettverksinstillinger</string>
+	<string id="2021">Tilatte IP addresser</string>
+
+</strings>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+
+   <!-- SABnzbd-Suite -->
+    <category label="1000">
+		<setting label="1010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="SABNZBD_USER" type="text" label="1022" default="openelec"/>
+		<setting id="SABNZBD_PWD" type="text" label="1023" default="openelec"/>
+
+		<setting label="2010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="SABNZBD_IP" type="text" label="2021" default="0.0.0.0"/>
+    </category>
+</settings>

packages/addons/service/downloadmanager/transmission/addon

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/daemon/transmission-daemon $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
+  cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
+  find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
+  rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE

packages/addons/service/downloadmanager/transmission/build

@@ -48,4 +48,4 @@ cd $PKG_BUILD
             --enable-daemon \
             --with-gnu-ld \
 
-make
+make V=1

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

@@ -0,0 +1,20 @@
+0.99.7
+- change icon
+
+0.99.6
+- rebuild for openssl downgrade
+
+0.99.5
+- simplyfing start scripts
+
+0.99.4
+- fix paths
+
+0.99.3
+- prepare for release
+
+0.99.2
+- update to transmission-2.31
+
+0.99.1
+- initial version transmission-2.20

packages/addons/service/downloadmanager/transmission/meta

@@ -19,18 +19,20 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.20"
-PKG_REV="1"
+PKG_VERSION="2.31"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
 PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="zlib libiconv openssl curl libevent connman"
+PKG_DEPENDS="zlib libiconv openssl curl libevent"
 PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent"
 PKG_PRIORITY="optional"
-PKG_SECTION="system"
+PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client"
 PKG_LONGDESC="transmission is a fast, easy and free BitTorrent client"
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="yes"

packages/addons/service/downloadmanager/transmission/source/bin/transmission.service

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission"
+LOG_FILE="$ADDON_HOME/service.log"
+
+export TRANSMISSION_WEB_HOME="$ADDON_DIR/web"
+
+mkdir -p $ADDON_HOME
+OPENELEC_SETTINGS="$ADDON_HOME/settings.xml"
+
+if [ ! -f "$OPENELEC_SETTINGS" ]; then
+  cp $ADDON_DIR/settings.xml $OPENELEC_SETTINGS
+fi
+
+TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+
+mkdir -p /storage/downloads
+mkdir -p /storage/downloads/incoming
+mkdir -p /storage/downloads/watch
+
+if [ -z "$TRANSMISSION_IP" ]; then
+  TRANSMISSION_IP="*.*.*.*"
+fi
+
+TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads"
+TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming"
+TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
+TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
+TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"
+TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP"
+
+if [ "$TRANSMISSION_AUTH" = "true" ]; then
+  TRANSMISSION_ARG="$TRANSMISSION_ARG -t"
+  TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER"
+  TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD"
+else
+  TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
+fi
+
+if [ ! $(pidof transmission-daemon) ];then
+  transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
+fi

packages/addons/service/downloadmanager/transmission/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import xbmc, time, os, subprocess
+
+os.system("transmission.service")

packages/addons/service/downloadmanager/transmission/source/resources/language/Dutch/strings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</string>
+	<string id="1010">Gebruikers instellingen</string>
+	<string id="1021">Gebruik verificatie</string>
+	<string id="1022">Gebruikersnaam</string>
+	<string id="1023">Wachtwoord</string>
+	<string id="2010">Netwerk instellingen</string>
+	<string id="2021">Toegestane IP adressen (gescheiden met een ',')</string>
+
+</strings>

packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</string>
+	<string id="1010">User Settings</string>
+	<string id="1021">Use authentification</string>
+	<string id="1022">Username</string>
+	<string id="1023">Password</string>
+	<string id="2010">Network Settings</string>
+	<string id="2021">Allowed IP addresses (comma-delimited)</string>
+
+</strings>

packages/addons/service/downloadmanager/transmission/source/resources/language/French/strings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</string>
+	<string id="1010">Préférences utilisateur</string>
+	<string id="1021">Utiliser une authentification</string>
+	<string id="1022">Nom d'utilisateur</string>
+	<string id="1023">Mot de passe</string>
+	<string id="2010">Préférences réseau</string>
+	<string id="2021">Adresses IP autorisées (séparées par des virgules)</string>
+
+</strings>

packages/addons/service/downloadmanager/transmission/source/resources/language/German/strings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</string>
+	<string id="1010">Benutzer Einstellungen</string>
+	<string id="1021">Authentifizierung verwenden</string>
+	<string id="1022">Benutzername</string>
+	<string id="1023">Passwort</string>
+	<string id="2010">Netzwerk Einstellungen</string>
+	<string id="2021">Erlaubte IP Adressen (durch Komma getrennt)</string>
+
+</strings>

packages/addons/service/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</string>
+	<string id="1010">Bruker Instillinger</string>
+	<string id="1021">Bruk inlogging</string>
+	<string id="1022">Brukernavn</string>
+	<string id="1023">Passord</string>
+	<string id="2010">Nettverksinstillinger</string>
+	<string id="2021">Tilatte IP addresser (komma-avgrenser)</string>
+
+</strings>

packages/addons/service/downloadmanager/transmission/source/resources/settings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+
+   <!-- Transmission -->
+    <category label="1000">
+		<setting label="1010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="TRANSMISSION_AUTH" type="bool" label="1021" default="false" />
+		<setting id="TRANSMISSION_USER" type="text" label="1022" default="openelec" enable="eq(-1,true)"/>
+		<setting id="TRANSMISSION_PWD" type="text" label="1023" default="openelec" enable="eq(-2,true)"/>
+
+		<setting label="2010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="TRANSMISSION_IP" type="text" label="2021" default="*.*.*.*"/>
+    </category>
+</settings>

packages/addons/service/downloadmanager/transmission/source/settings.xml

@@ -0,0 +1,6 @@
+<settings>
+    <setting id="TRANSMISSION_AUTH" value="false" />
+    <setting id="TRANSMISSION_IP" value="*.*.*.*" />
+    <setting id="TRANSMISSION_PWD" value="openelec" />
+    <setting id="TRANSMISSION_USER" value="openelec" />
+</settings>

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

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/build.Linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/service/multimedia/hts-tvheadend/changelog.txt

@@ -0,0 +1,14 @@
+0.99.5
+- update to hts-tvheadend-ca68ed4
+
+0.99.4
+- change icon
+
+0.99.3
+- rebuild for openssl downgrade
+
+0.99.2
+- rework start scripts
+
+0.99.1
+- initial version hts-tvheadend-90e3570

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

@@ -19,18 +19,21 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="2.12"
-PKG_REV="1"
+PKG_VERSION="ca68ed4"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="libiconv avahi"
-PKG_BUILD_DEPENDS="toolchain libiconv avahi"
+# PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS="libiconv avahi openssl"
+PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
 PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
+PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
-PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes"
-PKG_IS_ADDON="no"
+PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="no"

packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service

@@ -20,11 +20,13 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options
+ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+LOG_FILE="$ADDON_HOME/service.log"
 
-for drivers in "$ADDITIONAL_DRIVERS"; do
-  [ $drivers = bcm_sta ] && $SCRIPTS/install bcm_sta
-  [ $drivers = rtl8192se ] && $SCRIPTS/install rtl8192se
-done
+TVHEADEND_ARG="-f -C -s -u root -g root -c $ADDON_HOME"
 
-exit 0
+mkdir -p $ADDON_HOME
+  if [ ! $(pidof tvheadend) ];then
+    tvheadend $TVHEADEND_ARG &>$LOG_FILE
+  fi

packages/addons/service/multimedia/hts-tvheadend/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import xbmc, time, os, subprocess
+
+os.system("tvheadend.service")

packages/addons/service/softcam/oscam/addon

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
+
+

packages/addons/service/softcam/oscam/build

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011-2011 Gregor Fuis (gujs@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
+mkdir -p build && cd build
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWEBIF=1 \
+      ..
+
+make

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

@@ -0,0 +1,5 @@
+0.99.2
+- update to oscam-5386
+
+0.99.1
+- initial version oscam-5377