Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next

config/path

@@ -59,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}`

packages/addons/debugging/tools/evtest/addon

@@ -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
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/debugging/tools/evtest/build

@@ -22,9 +22,12 @@
 
 . config/options $1
 
+LDFLAGS="$LDFLAGS -static"
+CFLAGS="$CFLAGS -pthread"
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
 
-make
+make LIBS="-lm -lz -liconv"

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

@@ -0,0 +1,2 @@
+0.99.1
+- initial addon based on evtest-1.27

packages/addons/debugging/tools/evtest/meta

@@ -28,9 +28,11 @@ PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.
 PKG_DEPENDS="libxml2"
 PKG_BUILD_DEPENDS="toolchain 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/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

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/htop $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin

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,5 @@
+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="2"
 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/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/downloadmanager/transmission/changelog.txt

@@ -1,5 +0,0 @@
-0.99.2
-- update to transmission-2.31
-
-0.99.1
-- initial version transmission-2.20

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

@@ -1,37 +0,0 @@
-################################################################################
-#      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
-
-dir = os.path.realpath(os.path.dirname(__file__))
-script = 'start.sh'
-
-launcher = os.path.join(dir, script)
-app = '/storage/.xbmc/addons/addon.downloadmanager.transmission/bin/transmission-daemon'
-
-os.chmod(launcher, 0755)
-os.chmod(app, 0755)
-
-args = [launcher, str(os.getpid()), app]
-
-p = subprocess.Popen(args)
-print p.pid
-p.wait()
-os.exit(1)

packages/addons/multimedia/libav/addon

@@ -0,0 +1,29 @@
+#!/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/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+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,2 @@
+0.99.1
+- initial addon based on libav-0.7_beta2

packages/addons/multimedia/libav/meta

@@ -18,19 +18,30 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="tools"
-PKG_VERSION=""
+PKG_NAME="libav"
+PKG_VERSION="0.7_beta2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv"
-PKG_URL=""
-PKG_DEPENDS="nano pastebinit evtest"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_SITE="http://www.libav.org"
+PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
 PKG_PRIORITY="optional"
-PKG_SECTION="debug"
-PKG_SHORTDESC="debug: Metapackage for installing some tools"
-PKG_LONGDESC="debug is a Metapackage for installing some tools"
-PKG_IS_ADDON="no"
+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/networking/backup/rsync/addon

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/src/nano $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/networking/backup/rsync/build

@@ -22,11 +22,13 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/build.Linux/tvheadend $INSTALL/usr/bin
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-acl-support \
+            --disable-xattr-support \
 
-mkdir -p $INSTALL/etc/pm/sleep.d
-  cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
-
-mkdir -p $INSTALL/lib/udev
-  cp $PKG_DIR/scripts/tvheadend_startup $INSTALL/lib/udev
+make

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

@@ -0,0 +1,5 @@
+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="2"
+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/transmission/changelog.txt

@@ -0,0 +1,14 @@
+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

@@ -20,7 +20,7 @@
 
 PKG_NAME="transmission"
 PKG_VERSION="2.31"
-PKG_REV="3"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
@@ -28,7 +28,7 @@ PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2
 PKG_DEPENDS="zlib libiconv openssl curl libevent"
 PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent"
 PKG_PRIORITY="optional"
-PKG_SECTION="downloadmanager"
+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"
 

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

@@ -20,44 +20,11 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-XBMC_PID=$1
-APP=$2
-SCRIPT_DIR=$(dirname `readlink -f $0`)
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.transmission"
-PATH="${PATH}:${SCRIPT_DIR}/bin"
-LOG_FILE="${ADDON_HOME}/service.log"
+ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission"
+LOG_FILE="$ADDON_HOME/service.log"
 
-cleanup() {
-  local EXIT_STATUS=$1
-  if [ -n "${EXIT_STATUS}" ];then
-    EXIT_STATUS=0
-  fi
-  kill -15 "${APP_PID}"
-  exit $EXIT_STATUS;
-}
-
-# trap signals for clean shutdown
-  trap cleanup 1 2 3 15
-
-launch_app() {
-  local PID
-  eval "${APP} ${TRANSMISSION_ARG} &>${LOG_FILE} &"
-  APP_PID=$!
-}
-
-pid_is_running() {
-  local PID=${1}
-  for IPID in `ps -o pid | sed 's/[A-Za-z]//g' | sed 's/\ //g'`;do
-    if [ ${IPID} -eq ${PID} ];then
-      return 0
-    fi
-  done
-  return 1
-}
-
-app_prep() {
-
-export TRANSMISSION_WEB_HOME="$SCRIPT_DIR/web"
+export TRANSMISSION_WEB_HOME="$ADDON_DIR/web"
 
 mkdir -p $ADDON_HOME
 OPENELEC_SETTINGS="$ADDON_HOME/settings.xml"
@@ -86,7 +53,6 @@ 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"
-TRANSMISSION_ARG="$TRANSMISSION_ARG -f"
 
 if [ "$TRANSMISSION_AUTH" = "true" ]; then
   TRANSMISSION_ARG="$TRANSMISSION_ARG -t"
@@ -96,24 +62,4 @@ else
   TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
 fi
 
-}
-
-main() {
-	app_prep
-	launch_app "${APP}"
-	pid_is_running "${XBMC_PID}"
-	XBMC_RUNNING=$?
-	pid_is_running "${APP_PID}"
-	APP_RUNNING=$?
-
-	while [ $XBMC_RUNNING -eq 0 -a ${APP_RUNNING} -eq 0 ]; do
-		sleep 1
-		pid_is_running "${XBMC_PID}"
-		XBMC_RUNNING=$?
-		pid_is_running "${APP_PID}"
-		APP_RUNNING=$?
-	done
-}
-
-main
-cleanup
+transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE

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

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@@ -20,6 +18,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-if [ ! $(pidof tvheadend) ];then
-  tvheadend -C -s -f -u root -g root
-fi
+import xbmc, time, os, subprocess
+
+os.system("transmission.service")

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

@@ -22,6 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/evtest $INSTALL/usr/bin
-  cp $PKG_BUILD/evtest-capture $INSTALL/usr/bin
+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,5 @@
+0.99.2
+- rework start scripts
+
+0.99.1
+- initial version hts-tvheadend-90e3570

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

@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="90e3570"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
@@ -29,9 +29,11 @@ PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS="libiconv avahi"
 PKG_BUILD_DEPENDS="toolchain libiconv avahi"
 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_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="no"

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

@@ -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
+################################################################################
+
+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"
+
+TVHEADEND_ARG="-f -C -s -u root -g root -c $ADDON_HOME"
+
+mkdir -p $ADDON_HOME
+  tvheadend $TVHEADEND_ARG &>$LOG_FILE

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/shell/texteditor/nano/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/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/shell/texteditor/nano/build

@@ -25,6 +25,8 @@
 # nano fails to build with GOLD linker
   strip_gold
 
+LDFLAGS="$LDFLAGS -static"
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \

packages/addons/shell/texteditor/nano/changelog.txt

@@ -0,0 +1,5 @@
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on nano-2.3.0

packages/addons/shell/texteditor/nano/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="nano"
 PKG_VERSION="2.3.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
@@ -28,9 +28,11 @@ PKG_URL="http://ftp.gnu.org/gnu/nano/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="shell/texteditor"
 PKG_SHORTDESC="nano: Pico editor clone with enhancements"
 PKG_LONGDESC="GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"

packages/addons/shell/texteditor/nano/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/debug/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop mrxvt"
+PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan mrxvt"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/devel/libiconv/build

@@ -27,7 +27,7 @@ cd $PKG_BUILD
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
+            --enable-static \
             --enable-shared \
             --disable-nls \
             --disable-extra-encodings \

packages/devel/ncurses/build

@@ -58,7 +58,7 @@ cd $PKG_BUILD
             --without-ada \
             --without-progs \
             --with-shared \
-            --without-normal \
+            --with-normal \
             --without-debug \
             --without-profile \
             --with-termlib \

packages/mediacenter/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="$MEDIACENTER $MEDIACENTER-theme-$SKIN_DEFAULT plugins"
+PKG_DEPENDS="$MEDIACENTER $MEDIACENTER-theme-$SKIN_DEFAULT"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"

packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend

@@ -1,48 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-LOCKDIR="/var/lock/"
-LOCKFILE="tvheadend"
-
-case "$1" in
-  hibernate|suspend)
-    if [ $(pidof tvheadend) ];then
-      progress "Shutting down HTS TVHeadend for suspending..."
-      mkdir -p "$LOCKDIR"
-      touch "$LOCKDIR/$LOCKFILE"
-      killall tvheadend
-    fi
-    ;;
-
-  thaw|resume)
-    if [ -f "$LOCKDIR/$LOCKFILE" ];then
-      progress "Restarting HTS TVHeadend for wakeup..."
-      tvheadend -C -s -f -u root -g root
-      rm -rf "$LOCKDIR/$LOCKFILE"
-    fi
-    ;;
-
-  *) exit $NA
-    ;;
-esac

packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules

@@ -1,30 +0,0 @@
-################################################################################
-#      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
-################################################################################
-
-# only does something with adding "dvb" subsystem devices.
-ACTION!="add|remove", GOTO="end"
-SUBSYSTEM!="dvb", GOTO="end"
-ENV{DVB_DEVICE_TYPE}!="frontend", GOTO="end"
-
-# Start TVHeadend if dvb frontend is starting
-ACTION=="add", RUN+="/lib/udev/tvheadend_startup"
-ACTION=="remove", RUN+="/usr/bin/killall tvheadend"
-
-LABEL="end"

packages/sysutils/busybox/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="grep hdparm speedcontrol"
+PKG_DEPENDS="grep hdparm speedcontrol pastebinit"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
 PKG_PRIORITY="required"
 PKG_SECTION="system"

packages/sysutils/udev/build

@@ -55,6 +55,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
             --without-systemdsystemunitdir \
             --with-firmware-path=/lib/firmware \
             --with-pci-ids-path=/usr/share/pci.ids \
+            --with-usb-ids-path=/usr/share/usb.ids \
             --with-gnu-ld \
 
 make

packages/sysutils/udev/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="udev"
-PKG_VERSION="170"
+PKG_VERSION="171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/textproc/libxml2/build

@@ -30,7 +30,7 @@ cd .build-target
              --build=$HOST_NAME \
              --prefix=/usr \
              --sysconfdir=/etc \
-             --disable-static \
+             --enable-static \
              --enable-shared \
              --with-iconv \
              --disable-ipv6 \

packages/x11/driver/xf86-video-ati/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-ati"
-PKG_VERSION="6.14.1"
+PKG_VERSION="6.14.2"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"

packages/x11/util/util-macros/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="util-macros"
-PKG_VERSION="1.13.0"
+PKG_VERSION="1.14.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/xserver/xorg-server/build

@@ -67,7 +67,7 @@ cd $PKG_BUILD
             $XORG_XINERAMA \
             --enable-mitshm \
             --disable-xres \
-            --disable-record \
+            --enable-record \
             --enable-xv \
             --disable-xvmc \
             --enable-dga \

packages/x11/xserver/xorg-server/install

@@ -46,6 +46,7 @@ mkdir -p $XORG_DST
 
 mkdir -p $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
+  cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions
   cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
   cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions

packages/x11/xserver/xorg-server/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="xorg-server"
-PKG_VERSION="1.10.1.902"
+PKG_VERSION="1.10.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libpciaccess freetype libX11 libXfont libdrm Mesa openssl pixman udev"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"

projects/ATV/options

@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Fusion/options

@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Generic/options

@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/ION/options

@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Intel/options

@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

scripts/create_addon

@@ -92,8 +92,8 @@ if [ -f $PKG_DIR/addon ]; then
     zip -rq $PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
   cd -
 
-  mkdir -p $ADDON_BUILD/target/$PKG_ADDON_ID
-    cp $ADDON_BUILD/$PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $ADDON_BUILD/target/$PKG_ADDON_ID
-    cp $PKG_DIR/changelog.txt $ADDON_BUILD/target/$PKG_ADDON_ID/changelog-$OS_VERSION.$PKG_REV.txt
-    cp $PKG_DIR/icon/icon.png $ADDON_BUILD/target/$PKG_ADDON_ID/icon.png
+  mkdir -p $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
+    cp $ADDON_BUILD/$PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
+    cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$OS_VERSION.$PKG_REV.txt
+    cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
 fi

scripts/image

@@ -100,7 +100,6 @@ mkdir -p $INSTALL
 
 # Multimedia support
   [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter
-  [ "$TVHEADEND" = "yes" ] && $SCRIPTS/install hts-tvheadend
 
 # Automounter support
   [ "$UDISKS" = "yes" ] && $SCRIPTS/install udisks
@@ -130,9 +129,6 @@ mkdir -p $INSTALL
 # Update support
   [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer
 
-# some system tools
-  [ "$TOOLS" = "yes" ] && $SCRIPTS/install tools
-
 # Devtools... (not for Release)
   [ "$TESTING" = "yes" ] && $SCRIPTS/install testing
   [ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install debug