Merge remote-tracking branch 'upstream/master' into framebuffer-rework

services that depend on Xorg (such as ratpoison/xbmc)
should wait with starting until Xorg is ready for X11 connections

xorg-launch-helper is a simple solution. it starts and forks the
Xorg server and listens for a signal from Xorg. At this point, the
utility signals systemd READY through sd_notify(). At this point
systemd will start units that have an explicit ordering configured
to be after the xorg.service

...
Oct 10 12:03:36 openelec systemd[1]: Reached target Multi-User System.
Oct 10 12:03:36 openelec systemd[1]: Starting Xorg Server...
Oct 10 12:03:39 openelec systemd[1]: Started Xorg Server.
Oct 10 12:03:39 openelec systemd[1]: Starting Ratpoison Window Manager...
Oct 10 12:03:39 openelec systemd[1]: Started Ratpoison Window Manager.
Oct 10 12:03:39 openelec systemd[1]: Starting Graphical Interface.
Oct 10 12:03:39 openelec systemd[1]: Reached target Graphical Interface.
Oct 10 12:03:39 openelec systemd[1]: Starting XBMC user autostart script...
Oct 10 12:03:39 openelec systemd[1]: Started XBMC user autostart script.
Oct 10 12:03:39 openelec systemd[1]: Starting XBMC Media Center...
Oct 10 12:03:39 openelec systemd[1]: Started XBMC Media Center.
Oct 10 12:03:39 openelec systemd[1]: Starting XBMC Mediacenter Interface.
Oct 10 12:03:39 openelec systemd[1]: Reached target XBMC Mediacenter Interface.
Oct 10 12:03:39 openelec systemd[1]: Startup finished in 2.556s (kernel) + 5.194s (userspace) = 7.750s.
...

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/unofficial"]
+	path = packages/unofficial
+	url = https://github.com/OpenELEC/unofficial-addons.git

CONTRIBUTING.md

@@ -1,14 +1,18 @@
-## Questions about OpenELEC?
+### Questions about OpenELEC?
 
-To get your questions answered, please ask in the OpenELEC [Forum] or on IRC: #openelec on freenode.net or [webchat] 
+To get your questions answered, please ask in the OpenELEC [Forum], on IRC: 
+\#openelec on freenode.net, or [webchat]. 
 
 Do not open an issue.
 
-## Issue Reports
+### Issue Reports
 
-If you are at all unsure whether it's a bug in OpenELEC or a problem with something
-else, post in the OpenELEC [Forum] instead. If it turns out that it is a bug, an issue
-can always bee opend later.
+**BEFORE you report a bug make sure you got the latest testing version of 
+OpenELEC. Your bug might be already fixed.**
+
+If you are at all unsure whether it's a bug in OpenELEC or a problem with 
+something else, post in the OpenELEC [Forum] instead. If it turns out that it is
+a bug, an issue can always be opened later.
 
 If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
 and try to answer the following questions:
@@ -16,21 +20,22 @@ and try to answer the following questions:
 - What did you expect to happen?
 - What happened instead?
 
-It is also importent to provide logs for debugging.
-A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.
+**It is also importent to provide logs for debugging.
+A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.**
 
 Make sure to specify which version of OpenELEC you are using.
 - OpenELEC version
 - OpenELEC build
 - OpenELEC arch
 
-Please don't paste log messages in the issue reports or issue comments use [sprunge.us](http://sprunge.us) instead
+Please don't paste log messages in the issue reports or issue comments - use 
+[sprunge.us](http://sprunge.us) instead.
 
 Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
 particular feature into OpenELEC.
 
-## Pull Requests
+### Pull Requests
 
 - **Create topic branches**. Don't ask us to pull from your master branch.
 

Makefile

@@ -8,6 +8,12 @@ system:
 release:
 	./scripts/image release
 
+image:
+	BUILD_IMAGE=yes ./scripts/image release
+
+noobs:
+	./scripts/image noobs
+
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

TODO

@@ -1,2 +1,21 @@
 ncurses-5.8/5.9:
   - segfaults in nano and dialog -> using ncurses-5.7
+
+intel-gpu-tools:
+  - remove this package after gotham.
+    not needed anymore as xbmc has "use limited
+    color space" option
+
+timezone-data:
+  - fix tzdata-setup for gotham. now there is no 
+    <timezone> in guisettings.xml or ping Montellese
+
+systemd:
+  - fix graphical.target/xorg deps mess
+
+irserver:
+  - rework irserver/init.d for systemd
+
+RTL8192CU:
+  - add CONFIG_RTL8192CU to all kernel configs
+    and test removing this package 

config/addon/addon.xml

@@ -2,7 +2,7 @@
 <addon id="@PKG_ADDON_ID@"
        name="@PKG_NAME@"
        version="@ADDON_VERSION@"
-       provider-name="openelec.tv">
+       provider-name="@PROVIDER_NAME@">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="2.0"/>

config/functions

@@ -191,6 +191,22 @@ fix_module_depends() {
   rm new.modinfo*
 }
 
+# Usage: enable_service <unit> [target]
+enable_service () {
+  local unit="$1"
+  local unit_dir="/lib/systemd/system"
+  local target="$2"
+  local target_dir=$INSTALL
+
+  [ -f "$target_dir/$unit_dir/$unit" ] || exit 1
+  [ -z "$target" ] && target=`grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=`
+
+  if [ -n "$target" ]; then
+    mkdir -p ${target_dir}/$unit_dir/${target}.wants
+    ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
+  fi
+}
+
 check_path() {
 dashes="==========================="
   if [ "${PWD##/usr}" != "${PWD}" ]; then
@@ -281,7 +297,6 @@ show_config() {
   config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
-  config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
 
   # Input device configuration
 
@@ -322,14 +337,13 @@ show_config() {
   config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
-  config_message="$config_message\n - SSH Guard support:\t\t\t $SSHGUARD_SUPPORT"
   config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
   config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
   config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
   config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
   config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_CLIENT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
@@ -345,8 +359,8 @@ if [ "$BOOTLOADER" = "u-boot" ]; then
   config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
   config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
 fi
-  config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
-  config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
+  config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
+  config_message="$config_message\n - Parted support:\t\t\t $PARTED"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems

config/graphic

@@ -28,7 +28,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -36,28 +36,18 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS dove"
     fi
 
-    if [ "$drv" = "fglrx" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS fglrx"
-      COMPOSITE_SUPPORT="yes"
-      XINERAMA_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "fglrx-legacy" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
-      COMPOSITE_SUPPORT="yes"
-      XINERAMA_SUPPORT="yes"
-    fi
-
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
 #      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
 #      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
@@ -93,18 +83,21 @@ get_graphicdrivers() {
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then

config/noobs/os.json

@@ -0,0 +1,7 @@
+{
+  "name": "@DISTRONAME@",
+  "version": "@OPENELEC_VERSION@",
+  "release_date": "@RELEASE_DATE@",
+  "kernel": "@KERNEL_VERSION@",
+  "description": "@DESCRIPTION@"
+}

config/noobs/partition_setup.sh

@@ -0,0 +1,69 @@
+#!/bin/sh -x
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 Stephan Raue ([email protected])
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+MOUNTPOINT="/tmp/OpenELEC-System"
+
+md5sumCheck() {
+  ( cd $MOUNTPOINT
+    echo "checking MD5: $1"
+    md5sum -c $1.md5
+    if [ "$?" = "1" ]; then
+      echo "######################################################"
+      echo "#                                                    #"
+      echo "# OpenELEC 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
+    rm -rf $1.md5
+  )
+}
+
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
+  echo "error: part1, part2, id1 or id2 not specified"
+  echo "actual values:"
+  echo "part1:" $part1
+  echo "part2:" $part2
+  echo "id1  :" $id1
+  echo "id2  :" $id2
+  exit 1
+fi
+
+# create mountpoint
+  mkdir -p $MOUNTPOINT
+
+# mount needed partition
+  mount $part1 $MOUNTPOINT
+
+# check md5sum
+  md5sumCheck kernel.img
+  md5sumCheck SYSTEM
+
+# create bootloader configuration
+  echo "creating bootloader configuration..."
+  echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt
+
+# cleanup mountpoint
+  umount $MOUNTPOINT
+  rmdir $MOUNTPOINT

config/noobs/partitions.json

@@ -0,0 +1,20 @@
+{
+  "partitions": [
+    {
+      "label":                     "System",
+      "filesystem_type":           "FAT",
+      "partition_size_nominal":    128,
+      "want_maximised":            false,
+      "uncompressed_tarball_size": 110,
+      "mkfs_options":              ""
+    },
+    {
+      "label":                     "Storage",
+      "filesystem_type":           "ext4",
+      "partition_size_nominal":    864,
+      "want_maximised":            true,
+      "uncompressed_tarball_size": 10,
+      "mkfs_options":              ""
+    }
+  ]
+}

config/options

@@ -31,10 +31,6 @@ PROJECT_DIR="$ROOT/projects"
 # Target system library C (eglibc)
   TARGET_LIBC="eglibc"
 
-# Target iconv implementation (libiconv)
-# leave empty if we are using glibc's gconv
-  ICONV=""
-
 # Library strip
   LIBSTRIP="yes"
 

config/path

@@ -32,6 +32,10 @@ TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 
 FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 
+if [ -z "$INSTALL" ]; then
+  INSTALL=$BUILD/image/system
+fi
+
 . config/sources
 
 MAKE="$ROOT/$TOOLCHAIN/bin/make"
@@ -55,21 +59,49 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    PKG_DIR=`find $PACKAGES -type d -name $1 ! -wholename \*\/source\/\* 2>/dev/null`
-    if [ "${PKG_DIR}" != "$(echo $PKG_DIR | tr -d '\n')" ]; then
-      echo "Error - multiple package folders:"
-      echo "$PKG_DIR"
-      exit 1
-    fi
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" -o -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
+        PKG_DIR="$DIR"
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
+          echo "Error - multiple package folders:"
+          echo -e "$ALL_DIRS"
+          exit 1
+        fi
+      fi
+    done
+  fi
+
+  if [ -r $PKG_DIR/package.mk ]; then
+    . $PKG_DIR/package.mk
+  elif [ -r $PKG_DIR/meta ]; then
+    . $PKG_DIR/meta
   fi
 
-  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
-  [ -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}`
+  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}"
+  fi
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -122,7 +154,7 @@ export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
 
 if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
-  export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
+  export PATH="$ROOT/$TOOLCHAIN/bin:$ROOT/$TOOLCHAIN/sbin:$PATH"
 fi
 
 if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
@@ -147,3 +179,6 @@ else
   exec 4>/dev/null
 fi
 BUILD_INDENT_SIZE=4
+
+# multilib? nah
+unset CONFIG_SITE

packages/3rdparty/download/CouchPotatoServer/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#      Copyright (C) 2011 Anthony Nash ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="CouchPotatoServer"
-PKG_VERSION="5c0d8a7"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/RuudBurger/CouchPotatoServer"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="Python SABnzbd"
-PKG_BUILD_DEPENDS="toolchain Python"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="CouchPotatoServer: automated movie downloading."
-PKG_LONGDESC="CouchPotatoServer: automated movie downloading."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch

@@ -1,13 +0,0 @@
-diff --git a/couchpotato/runner.py b/couchpotato/runner.py
-index c0b7eb8..3a550f9 100644
---- a/couchpotato/runner.py
-+++ b/couchpotato/runner.py
-@@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
-     Env.set('data_dir', data_dir)
-     Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log'))
-     Env.set('db_path', 'sqlite:///' + db_path)
--    Env.set('cache_dir', os.path.join(data_dir, 'cache'))
-+    Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2'))
-     Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python')))
-     Env.set('console_log', options.console_log)
-     Env.set('quiet', options.quiet)

packages/3rdparty/download/Headphones/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#      Copyright (C) 2011 Anthony Nash ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="Headphones"
-PKG_VERSION="452cf15"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://github.com/rembo10/headphones"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="Python SABnzbd"
-PKG_BUILD_DEPENDS="toolchain Python"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="Headphones: Automatic music downloader for SABnzbd."
-PKG_LONGDESC="Headphones: This a pretty early release of a third-party add-on for SABnzbd."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/download/SABnzbd/meta

@@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="SABnzbd"
-PKG_VERSION="0.7.11"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://sabnzbd.org/"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
-PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
-PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline configobj"
-PKG_PRIORITY="optional"
-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.7.11-001_remove_default_settings-0.3.patch

@@ -1,234 +0,0 @@
-diff --git a/interfaces/Plush/templates/config_folders.tmpl b/interfaces/Plush/templates/config_folders.tmpl
-index 92bb5d1..94c1502 100644
---- a/interfaces/Plush/templates/config_folders.tmpl
-+++ b/interfaces/Plush/templates/config_folders.tmpl
-@@ -76,16 +76,6 @@
-           <span class="component-desc">$T('explain-dirscan_speed')</span>
-         </label>
-       </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 --git a/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl
-index 0c293ec..56f9488 100644
---- a/interfaces/Plush/templates/config_general.tmpl
-+++ b/interfaces/Plush/templates/config_general.tmpl
-@@ -14,82 +14,6 @@
-     </div>
-     <fieldset class="component-group-list">
-       <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">
-@@ -131,13 +55,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 -->
- 
-@@ -154,36 +71,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 --git a/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl
-index a8f1069..6f50b49 100644
---- a/interfaces/Plush/templates/config_switches.tmpl
-+++ b/interfaces/Plush/templates/config_switches.tmpl
-@@ -12,20 +12,6 @@
-       <h3>$T('swtag-general')</h3>
-     </div>
-     <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

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#      Copyright (C) 2011 Anthony Nash ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="SickBeard"
-PKG_VERSION="fb37d33"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/midgetspy/Sick-Beard"
-PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-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-001-remove_logo_update-header_and_donate_button-0.1.patch

@@ -1,55 +0,0 @@
-diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
-index ec28766..fdf3e30 100644
---- a/data/interfaces/default/config.tmpl
-+++ b/data/interfaces/default/config.tmpl
-@@ -36,13 +36,4 @@
-     </table>
- </div>
- 
--<div class="container padding" style="width: 600px;">
--    <table class="infoTable">
--        <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>Sick Beard 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>
--</div>
--
- #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
-diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
-index f791be8..fb38f17 100644
---- a/data/interfaces/default/inc_top.tmpl
-+++ b/data/interfaces/default/inc_top.tmpl
-@@ -108,20 +108,6 @@
- 
- <body>
-     <header>
--#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.png" width="150" height="72" /></a></span>
--    <span id="versiontext">alpha <a href="https://github.com/midgetspy/Sick-Beard/wiki/ChangeLog" onclick="window.open(this.href, '_blank'); return false;">$sickbeard.version.SICKBEARD_VERSION</a></span>
--</div>
--
-     <div class="navbar">
-         <div class="navbar-inner">
-             <div class="container">
-@@ -208,11 +194,6 @@
-                         </li>
-                         <li class="divider-vertical"></li>
-                     </ul>
--                    <ul class="nav pull-right">
--                        <li>
--                            <a id="navDonate" 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]" height="26" width="92" /></a>
--                        </li>
--                    </ul>
-                 </div><!-- /nav-collapse -->
- 
-             </div><!-- /container -->

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

@@ -1,75 +0,0 @@
-diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
-index 2144a0f..703c99e 100755
---- a/data/interfaces/default/config_notifications.tmpl
-+++ b/data/interfaces/default/config_notifications.tmpl
-@@ -639,45 +639,6 @@
- 
-                 <div class="component-group clearfix">
-                     <div class="component-group-desc">
--                        <img class="notifier-icon" src="$sbRoot/images/notifiers/libnotify.png" alt="" title="Libnotify" />
--                        <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;">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" class="btn" value="Test Libnotify" id="testLibnotify" />
--                            <input type="submit" class="btn config_submitter" value="Save Changes" />
--                        </div><!-- /content_use_libnotify //-->
--
--                    </fieldset>
--                </div><!-- /libnotify component-group //-->
--
--
--                <div class="component-group clearfix">
--                    <div class="component-group-desc">
-                         <img class="notifier-icon" src="$sbRoot/images/notifiers/pushover.png" alt="" title="Pushover" />
-                         <h3><a href="http://pushover.net/" onclick="window.open(this.href, '_blank'); return false;">Pushover</a></h3>
-                         <p>Pushover makes it easy to send real-time notifications to your Android and iOS devices.</p>
-diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
-index fb38f17..4ead36f 100644
---- a/data/interfaces/default/inc_top.tmpl
-+++ b/data/interfaces/default/inc_top.tmpl
-@@ -172,8 +172,6 @@
-                             <ul class="dropdown-menu">
-                                 <li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help &amp; Info</a></li>
-                                 <li class="divider"></li>
--                                <li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
--                                <li class="divider"></li>
-                                 <li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
-                                 <li class="divider"></li>
-                                 <li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
-diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
-index da9ff7f..36b608e 100644
---- a/sickbeard/webserve.py
-+++ b/sickbeard/webserve.py
-@@ -613,7 +613,6 @@ class History:
- 
- 
- 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/3rdparty/graphics/imlib2/build

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  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
-
-VDR_ADDON_DIR="/storage/.xbmc/addons/service.multimedia.vdr-addon"
-
-cd $PKG_BUILD
-
-case "$TARGET_ARCH" in
-  i386)
-    MMX_ARG="--enable-mmx --disable-amd64"
-    ;;
-  x86_64)
-    MMX_ARG="--enable-mmx --enable-amd64"
-    ;;
-  *)
-    MMX_ARG="--disable-mmx --disable-amd64"
-    ;;
-esac
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            $MMX_ARG
-
-sed -i "s|#define SYS_LOADERS_PATH .*|#define SYS_LOADERS_PATH \"$VDR_ADDON_DIR/lib/imlib2\"|" src/lib/loaderpath.h
-
-make
-$MAKEINSTALL

packages/3rdparty/graphics/imlib2/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue ([email protected])
-#
-#  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="imlib2"
-PKG_VERSION="1.4.5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://web.enlightenment.org/"
-PKG_URL="$SOURCEFORGE_SRC/enlightenment/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libjpeg-turbo libpng tiff zlib bzip2 libX11 libXext"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="Imlib2 is a graphics library."
-PKG_LONGDESC="Imlib2 is a graphics library for file loading, saving, rendering, manipulation."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/lib/ccid/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ccid"
-PKG_VERSION="1.4.10"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain pcsc-lite"
-PKG_PRIORITY="optional"
-PKG_SECTION="driver"
-PKG_SHORTDESC="CCID free software driver"
-PKG_LONGDESC="CCID free software driver"
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"

packages/3rdparty/lib/cxxtools/build

@@ -34,6 +34,7 @@ mkdir -p .build-host && cd .build-host
             --disable-static \
             --enable-shared \
             --disable-demos \
+            --with-atomictype=pthread \
             --disable-unittest
 
 make
@@ -55,6 +56,7 @@ mkdir -p .build-target && cd .build-target
             --enable-static \
             --disable-shared \
             --disable-demos \
+            --with-atomictype=pthread \
             --disable-unittest
 
 $MAKEINSTALL

packages/3rdparty/lib/cxxtools/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.1.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
 PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.1.1-arm.patch

@@ -1,278 +0,0 @@
-diff --git a/src/bin/formatter.cpp b/src/bin/formatter.cpp
-index 020475e..516d145 100644
---- a/src/bin/formatter.cpp
-+++ b/src/bin/formatter.cpp
-@@ -218,7 +218,7 @@ void Formatter::addValueString(const std::string& name, const std::string& type,
- 
-     if (type == "int")
-     {
--        if (value.size() > 0 && (value[0] == L'-' || value[0] == L'+'))
-+        if (value.size() > 0 && ( (int) value[0] == (int) L'-' || (int) value[0] == (int) L'+'))
-         {
-             int64_t v = convert<int64_t>(value);
-             printInt(*_out, v, name);
-diff --git a/src/csvparser.cpp b/src/csvparser.cpp
-index f9ee8dd..9d57dc8 100644
---- a/src/csvparser.cpp
-+++ b/src/csvparser.cpp
-@@ -76,23 +76,23 @@ void CsvParser::begin(DeserializerBase& handler)
- 
- void CsvParser::advance(Char ch)
- {
--    if (ch == L'\n')
-+    if ( (int) ch == (int) L'\n')
-         ++_lineNo;
- 
-     switch (_state)
-     {
-         case state_detectDelim:
--            if (isalnum(ch) || ch == L'_' || ch == ' ')
-+            if (isalnum(ch) || (int) ch == (int) L'_' || (int) ch == (int) ' ')
-             {
-                 _titles.back() += ch.narrow();
-             }
--            else if (ch == L'\n' || ch == L'\r')
-+            else if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 log_debug("title=\"" << _titles.back() << '"');
-                 _noColumns = 1;
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-             }
--            else if (ch == L'\'' || ch == L'"')
-+            else if ( (int) ch == (int) L'\'' || (int) ch == (int) L'"')
-             {
-                 _quote = ch;
-                 _state = state_detectDelim_q;
-@@ -119,17 +119,17 @@ void CsvParser::advance(Char ch)
-             break;
- 
-         case state_detectDelim_postq:
--            if (isalnum(ch) || ch == L'_' || ch == L'\'' || ch == L'"' || ch == L' ')
-+            if (isalnum(ch) || (int) ch == (int) L'_' || (int) ch == (int) L'\'' || (int) ch == (int) L'"' || (int) ch == (int) L' ')
-             {
-                 std::ostringstream msg;
-                 msg << "invalid character '" << ch.narrow() << "' within csv title of column " << _titles.size();
-                 SerializationError::doThrow(msg.str());
-             }
--            else if (ch == L'\n' || ch == L'\r')
-+            else if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 log_debug("title=\"" << _titles.back() << '"');
-                 _noColumns = 1;
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-             }
-             else
-             {
-@@ -142,10 +142,10 @@ void CsvParser::advance(Char ch)
-             break;
- 
-         case state_title:
--            if (ch == L'\n' || ch == L'\r')
-+            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 log_debug("title=\"" << _titles.back() << '"');
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-                 _noColumns = _titles.size();
-             }
-             else if (ch == _delimiter)
-@@ -153,7 +153,7 @@ void CsvParser::advance(Char ch)
-                 log_debug("title=\"" << _titles.back() << '"');
-                 _titles.push_back(std::string());
-             }
--            else if (ch == '\'' || ch == '\"')
-+            else if ( (int) ch == (int) '\'' || (int) ch == (int) '\"')
-             {
-                 if (_titles.back().empty())
-                 {
-@@ -185,10 +185,10 @@ void CsvParser::advance(Char ch)
-             break;
- 
-         case state_qtitlep:
--            if (ch == L'\n' || ch == L'\r')
-+            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 log_debug("title=\"" << _titles.back() << '"');
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-                 _noColumns = _titles.size();
-             }
-             else if (ch == _delimiter)
-@@ -207,7 +207,7 @@ void CsvParser::advance(Char ch)
- 
-         case state_cr:
-             _state = state_rowstart;
--            if (ch == L'\n')
-+            if ( (int) ch == (int) L'\n')
-             {
-                 break;
-             }
-@@ -228,14 +228,14 @@ void CsvParser::advance(Char ch)
-                 _column < _titles.size() ? _titles[_column] : std::string(),
-                 std::string(), SerializationInfo::Value);
- 
--            if (ch == L'\n' || ch == L'\r')
-+            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 _deserializer->leaveMember();
-                 checkNoColumns(_column, _noColumns, _lineNo);
-                 _deserializer->leaveMember();
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-             }
--            else if (ch == L'"' || ch == L'\'')
-+            else if ((int) ch == L'"' || (int) ch == L'\'')
-             {
-                 _quote = ch;
-                 _state = state_qdata;
-@@ -253,7 +253,7 @@ void CsvParser::advance(Char ch)
-             break;
- 
-         case state_data0:
--            if (ch == L'"' || ch == L'\'')
-+            if ( (int) ch == (int) L'"' || (int) ch == (int) L'\'')
-             {
-                 _quote = ch;
-                 _state = state_qdata;
-@@ -261,7 +261,7 @@ void CsvParser::advance(Char ch)
-             }
- 
-         case state_data:
--            if (ch == L'\n' || ch == L'\r')
-+            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 log_debug("value \"" << _value << '"');
-                 _deserializer->setValue(_value);
-@@ -269,7 +269,7 @@ void CsvParser::advance(Char ch)
-                 checkNoColumns(_column, _noColumns, _lineNo);
-                 _deserializer->leaveMember();  // leave data item
-                 _deserializer->leaveMember();  // leave row
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-             }
-             else if (ch == _delimiter)
-             {
-@@ -307,11 +307,11 @@ void CsvParser::advance(Char ch)
-             break;
- 
-         case state_qdata_end:
--            if (ch == L'\n' || ch == L'\r')
-+            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
-             {
-                 checkNoColumns(_column, _noColumns, _lineNo);
-                 _deserializer->leaveMember();  // leave row
--                _state = (ch == L'\r' ? state_cr : state_rowstart);
-+                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
-             }
-             else if (ch == _delimiter)
-             {
-diff --git a/src/jsonformatter.cpp b/src/jsonformatter.cpp
-index 1604d3e..07ada52 100644
---- a/src/jsonformatter.cpp
-+++ b/src/jsonformatter.cpp
-@@ -323,25 +323,25 @@ void JsonFormatter::stringOut(const std::string& str)
- {
-     for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
-     {
--        if (*it == '"')
-+        if ( (int) *it == (int) '"')
-             *_ts << L'\\'
-                 << L'\"';
--        else if (*it == '\\')
-+        else if ( (int) *it == (int) '\\')
-             *_ts << L'\\'
-                 << L'\\';
--        else if (*it == '\b')
-+        else if ( (int) *it == (int) '\b')
-             *_ts << L'\\'
-                 << L'b';
--        else if (*it == '\f')
-+        else if ( (int) *it == (int) '\f')
-             *_ts << L'\\'
-                 << L'f';
--        else if (*it == '\n')
-+        else if ( (int) *it == (int) '\n')
-             *_ts << L'\\'
-                 << L'n';
--        else if (*it == '\r')
-+        else if ( (int) *it == (int) '\r')
-             *_ts << L'\\'
-                 << L'r';
--        else if (*it == '\t')
-+        else if ( (int) *it == (int) '\t')
-             *_ts << L'\\'
-                 << L't';
-         else if (static_cast<unsigned char>(*it) >= 0x80 || static_cast<unsigned char>(*it) < 0x20)
-@@ -364,25 +364,25 @@ void JsonFormatter::stringOut(const cxxtools::String& str)
- {
-     for (cxxtools::String::const_iterator it = str.begin(); it != str.end(); ++it)
-     {
--        if (*it == L'"')
-+        if ( (int) *it == (int) L'"')
-             *_ts << L'\\'
-                 << L'\"';
--        else if (*it == L'\\')
-+        else if ( (int) *it == (int) L'\\')
-             *_ts << L'\\'
-                 << L'\\';
--        else if (*it == L'\b')
-+        else if ( (int) *it == (int) L'\b')
-             *_ts << L'\\'
-                 << L'b';
--        else if (*it == L'\f')
-+        else if ( (int) *it == (int) L'\f')
-             *_ts << L'\\'
-                 << L'f';
--        else if (*it == L'\n')
-+        else if ( (int) *it == (int) L'\n')
-             *_ts << L'\\'
-                 << L'n';
--        else if (*it == L'\r')
-+        else if ( (int) *it == (int) L'\r')
-             *_ts << L'\\'
-                 << L'r';
--        else if (*it == L'\t')
-+        else if ( (int) *it == (int) L'\t')
-             *_ts << L'\\'
-                 << L't';
-         else if (it->value() >= 0x80 || it->value() < 0x20)
-diff --git a/src/xml/entityresolver.cpp b/src/xml/entityresolver.cpp
-index fb55f08..58ea86a 100644
---- a/src/xml/entityresolver.cpp
-+++ b/src/xml/entityresolver.cpp
-@@ -563,19 +563,19 @@ namespace
- 
- String EntityResolver::resolveEntity(const String& entity) const
- {
--    if (!entity.empty() && entity[0] == L'#')
-+    if (!entity.empty() && (int) entity[0] == (int) L'#')
-     {
-         int code = 0;
--        if (entity.size() > 2 && entity[1] == L'x')
-+        if (entity.size() > 2 && (int) entity[1] == (int) L'x')
-         {
-             // hex notation: &#xABCD;
-             for (String::const_iterator it = entity.begin() + 2; it != entity.end(); ++it)
-             {
--                if (*it >= L'0' && *it <= L'9')
-+                if ( (int) *it >= (int) L'0' && (int) *it <= (int) L'9')
-                     code = code * 16 + (it->value() - L'0');
--                else if (*it >= L'A' && *it <= L'F')
-+                else if ( (int) *it >= (int) L'A' && (int) *it <= (int) L'F')
-                     code = code * 16 + (it->value() - L'A' + 10);
--                else if (*it >= L'a' && *it <= L'f')
-+                else if ( (int) *it >= (int) L'a' && (int) *it <= (int) L'f')
-                     code = code * 16 + (it->value() - L'a' + 10);
-                 else
-                     throw std::runtime_error(std::string("invalid entity ") + entity.narrow());
-@@ -586,7 +586,7 @@ String EntityResolver::resolveEntity(const String& entity) const
-             // dec notation: &#9999;
-             for (String::const_iterator it = entity.begin() + 1; it != entity.end(); ++it)
-             {
--                if (*it >= L'0' && *it <= L'9')
-+                if ( (int) *it >= (int) L'0' && (int) *it <= (int) L'9')
-                     code = code * 10 + (it->value() - '0');
-                 else
-                     throw std::runtime_error(std::string("invalid entity ") + entity.narrow());

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch

@@ -0,0 +1,17 @@
+Index: cxxtools-2.2/include/cxxtools/char.h
+===================================================================
+--- cxxtools-2.2.orig/include/cxxtools/char.h	2013-05-05 14:18:00.180572107 +0300
++++ cxxtools-2.2/include/cxxtools/char.h	2013-05-05 14:18:00.176571966 +0300
+@@ -148,6 +148,12 @@
+             friend bool operator==(char a, const Char& b)
+             { return a == b.value(); }
+ 
++            //! @brief Returns $true$ if the a and b are the same character; $false$ otherwise.
++            //! @return $true$ if the a and b are the same character; $false$ otherwise.
++            friend bool operator==(const Char& a, unsigned int b)
++            { return a.value() == b; }
++
++
+             //! @brief Returns $true$ if the a and b are not the same character; $false$ otherwise.
+             //! @return $true$ if the a and b are not the same character; $false$ otherwise.
+             friend bool operator!=(const Char& a, const Char& b)

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch

@@ -0,0 +1,12 @@
+Index: cxxtools-2.0/src/hdstream.cpp
+===================================================================
+--- cxxtools-2.0.orig/src/hdstream.cpp	2011-08-08 13:07:59.567275994 +0300
++++ cxxtools-2.0/src/hdstream.cpp	2011-08-08 13:08:11.447275959 +0300
+@@ -30,6 +30,7 @@
+ #include <ios>
+ #include <iomanip>
+ #include <cctype>
++#include <cstdio>
+ 
+ namespace cxxtools
+ {

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch

@@ -0,0 +1,10 @@
+Index: cxxtools-2.2/src/Makefile.am
+===================================================================
+--- cxxtools-2.2.orig/src/Makefile.am	2013-05-05 13:56:03.225204926 +0300
++++ cxxtools-2.2/src/Makefile.am	2013-05-05 13:56:14.017219885 +0300
+@@ -215,4 +215,4 @@
+ endif
+ 
+ libcxxtools_la_LIBADD = $(LIBICONV)
+-libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
++libcxxtools_la_LDFLAGS = -version-info @sonumber@

packages/3rdparty/lib/libdvbcsa/build

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-shared \
+            --enable-static \
+            --with-sysroot=$SYSROOT_PREFIX \
+
+$MAKEINSTALL

packages/3rdparty/lib/libdvbcsa/meta

@@ -18,19 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="json-c"
-PKG_VERSION="0.9"
+PKG_NAME="libdvbcsa"
+PKG_VERSION="1.1.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="MIT"
-PKG_SITE="http://oss.metaparadigm.com/json-c/"
-PKG_URL="http://oss.metaparadigm.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
+PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="json-c: A JSON implementation in C"
-PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
+PKG_SECTION="lib"
+PKG_SHORTDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+PKG_LONGDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"

packages/3rdparty/lib/libxslt/build

@@ -24,17 +24,12 @@
 
 cd $PKG_BUILD
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_LIBXML="--with-iconv"
-fi
-
 ./configure --host=$TARGET_NAME \
              --build=$HOST_NAME \
              --prefix=/usr \
              --sysconfdir=/etc \
              --enable-static \
              --disable-shared \
-             $CONFIG_LIBXML \
              --disable-ipv6 \
              --without-python \
              --without-crypto

packages/3rdparty/lib/libxslt/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://xmlsoft.org/xslt/"
 PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="libxslt"

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-04_tntnet-2.0.patch

@@ -1,12 +0,0 @@
-Index: vdr-plugin-live-0.2.0/thread.cpp
-===================================================================
---- vdr-plugin-live-0.2.0.orig/thread.cpp	2011-08-25 21:58:33.000000000 +0200
-+++ vdr-plugin-live-0.2.0/thread.cpp	2011-08-25 21:58:37.000000000 +0200
-@@ -3,6 +3,7 @@
- #include <stdexcept>
- #include <vdr/tools.h>
- #include <tnt/tntnet.h>
-+#include <tnt/tntconfig.h>
- #include "thread.h"
- #include "tntconfig.h"
- 

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-1.patch

@@ -0,0 +1,290 @@
+commit 042724e30d5690ab67a6c04aea48a16b9a3b085b
+Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
+Date:   Fri May 3 01:37:41 2013 +0200
+
+    Make LIVE compile and work with Tntnet and cxxtools version 2.2.
+    Thanks to Tommi Mäkitalo for his help on resolving the issues.
+    This problem was reported by Martin Gansser and by the user 'varas' in
+    the bugtracker as bug #1351. This commit fixes that bug.
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index 51018bb..80f145b 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -205,7 +205,11 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
+ 		<& rec_item_dir name=(recItem->Name()) level=(level) &>
+ <%cpp>
+ #if TNT_HAS_QUERYPARAMS
++#if TNT_QUERYPARAMS_NO_BOOL
++		tnt::QueryParams recItemParams(qparam);
++#else
+ 		tnt::QueryParams recItemParams(qparam, false);
++#endif
+ #else
+ 		cxxtools::QueryParams recItemParams(qparam, false);
+ #endif
+diff --git a/tntconfig.cpp b/tntconfig.cpp
+index 3a1fd14..3325776 100644
+--- a/tntconfig.cpp
++++ b/tntconfig.cpp
+@@ -3,7 +3,13 @@
+ #include <fstream>
+ #include <sstream>
+ #include <stdexcept>
++#include "tntfeatures.h"
++#if TNT_LOG_SERINFO
++#include <cxxtools/log.h>
++#include <cxxtools/xml/xmldeserializer.h>
++#else
+ #include <cxxtools/loginit.h>
++#endif
+ #include <tnt/sessionscope.h>
+ #include <tnt/httpreply.h>
+ #include <vdr/config.h>
+@@ -181,19 +187,67 @@ namespace vdrlive {
+ #endif
+ 
+ #if TNT_CONFIG_INTERNAL
++	namespace {
++		std::string GetResourcePath()
++		{
++#if APIVERSNUM > 10729
++			string resourceDir(Plugin::GetResourceDirectory());
++			return resourceDir;
++#else
++			string configDir(Plugin::GetConfigDirectory());
++			return configDir;
++#endif
++		}
++
++		void MapUrl(tnt::Tntnet & app, const char *rule, const char * component, std::string const & instPath, const char * pathInfo, const char * mime_type)
++		{
++#if TNT_MAPURL_NAMED_ARGS
++			tnt::Mapping::args_type argMap;
++			argMap.insert(std::make_pair("mime-type", mime_type));
++#endif
++			app.mapUrl(rule, component)
++				.setPathInfo(instPath + pathInfo)
++#if TNT_MAPURL_NAMED_ARGS
++				.setArgs(argMap);
++#else
++				.pushArg(mime_type);
++#endif
++		}
++	}
++
+ 	void TntConfig::Configure(tnt::Tntnet& app) const
+ 	{
+ 		string const configDir(Plugin::GetConfigDirectory());
+-#if APIVERSNUM > 10729
+-		string const resourceDir(Plugin::GetResourceDirectory());
+-#endif
+ 
++#if TNT_LOG_SERINFO
++		cxxtools::SerializationInfo si;
++		std::istringstream logXmlConf(
++			"<logging>\n"
++			"  <rootlogger>" + LiveSetup().GetTntnetLogLevel() + "</rootlogger>\n"
++			"  <loggers>\n"
++			"    <logger>\n"
++			"      <category>cxxtools</category>\n"
++			"      <level>" + LiveSetup().GetTntnetLogLevel() + "</level>\n"
++			"    </logger>\n"
++			"    <logger>\n"
++			"      <category>tntnet</category>\n"
++			"      <level>" + LiveSetup().GetTntnetLogLevel() + "</level>\n"
++			"    </logger>\n"
++			"  </loggers>\n"
++			"</logging>\n"
++			);
++		cxxtools::xml::XmlDeserializer d(logXmlConf);
++		d.deserialize(si);
++		log_init(si);
++#else
+ 		std::istringstream logConf(
+ 			"rootLogger=" + LiveSetup().GetTntnetLogLevel() + "\n"
+ 			"logger.tntnet=" + LiveSetup().GetTntnetLogLevel() + "\n"
+ 			"logger.cxxtools=" + LiveSetup().GetTntnetLogLevel() + "\n"
+ 			);
++
+ 		log_init(logConf);
++#endif
+ 
+ 		// +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++
+ 		// ------------------------------------------------------------------------
+@@ -229,13 +283,12 @@ namespace vdrlive {
+ 
+ 		// the following selects the theme specific 'theme.css' file
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/themes/([^/]*)/css.*/(.+\\.css)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/themes/$1/css/$2")
+-#else
+-			.setPathInfo(configDir + "/themes/$1/css/$2")
+-#endif
+-			.pushArg("text/css");
++		MapUrl(app,
++			   "^/themes/([^/]*)/css.*/(.+\\.css)",
++			   "content",
++			   GetResourcePath(),
++			   "/themes/$1/css/$2",
++			   "text/css");
+ 
+ 		// the following rules provide a search scheme for images. The first
+ 		// rule where a image is found, terminates the search.
+@@ -243,79 +296,82 @@ namespace vdrlive {
+ 		// 2. /img/<imgname>.<ext>
+ 		// deprecated: 3. <imgname>.<ext> (builtin images)
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/themes/([^/]*)/img.*/(.+)\\.(.+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/themes/$1/img/$2.$3")
+-#else
+-			.setPathInfo(configDir + "/themes/$1/img/$2.$3")
+-#endif
+-			.pushArg("image/$3");
+-		app.mapUrl("^/themes/([^/]*)/img.*/(.+)\\.(.+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/img/$2.$3")
+-#else
+-			.setPathInfo(configDir + "/img/$2.$3")
+-#endif
+-			.pushArg("image/$3");
++		MapUrl(app,
++			   "^/themes/([^/]*)/img.*/(.+)\\.(.+)",
++			   "content",
++			   GetResourcePath(),
++			   "/themes/$1/img/$2.$3",
++			   "image/$3");
++
++		MapUrl(app,
++			   "^/themes/([^/]*)/img.*/(.+)\\.(.+)",
++			   "content",
++			   GetResourcePath(),
++			   "/img/$2.$3",
++			   "image/$3");
+ 		// deprecated: file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) $2@" << endl;
+ 
+ 		// Epg images
+ 		string const epgImgPath(LiveSetup().GetEpgImageDir());
+ 		if (!epgImgPath.empty()) {
+ 			// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-			app.mapUrl("^/epgimages/([^/]*)\\.([^./]+)", "content")
+-				.setPathInfo(epgImgPath + "/$1.$2")
+-				.pushArg("image/$2");
++			MapUrl(app,
++				   "^/epgimages/([^/]*)\\.([^./]+)",
++				   "content",
++				   epgImgPath,
++				   "/$1.$2",
++				   "image/$2");
+ 		}
+ 
+ 		// select additional (not build in) javascript.
+ 		// WARNING: no path components with '.' in the name are allowed. Only
+ 		// the basename may contain dots and must end with '.js'
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/js(/[^.]*)([^/]*\\.js)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/js$1$2")
+-#else
+-			.setPathInfo(configDir + "/js$1$2")
+-#endif
+-			.pushArg("text/javascript");
++		MapUrl(app,
++			   "^/js(/[^.]*)([^/]*\\.js)",
++			   "content",
++			   GetResourcePath(),
++			   "/js$1$2",
++			   "text/javascript");
+ 
+ 		// map to 'css/basename(uri)'
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/css.*/(.+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/css/$1")
+-#else
+-			.setPathInfo(configDir + "/css/$1")
+-#endif
+-			.pushArg("text/css");
++		MapUrl(app,
++			   "^/css.*/(.+)",
++			   "content",
++			   GetResourcePath(),
++			   "/css/$1",
++			   "text/css");
+ 
+ 		// map to 'img/basename(uri)'
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/img.*/(.+)\\.([^.]+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/img/$1.$2")
+-#else
+-			.setPathInfo(configDir + "/img/$1.$2")
+-#endif
+-			.pushArg("image/$2");
++		MapUrl(app,
++			   "^/img.*/(.+)\\.([^.]+)",
++			   "content",
++			   GetResourcePath(),
++			   "/img/$1.$2",
++			   "image/$2");
+ 
+ 		// Map favicon.ico into img directory
+-		app.mapUrl("^/favicon.ico$", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/img/favicon.ico")
+-#else
+-			.setPathInfo(configDir + "/img/favicon.ico")
+-#endif
+-			.pushArg("image/x-icon");
++		MapUrl(app,
++			   "^/favicon.ico$",
++			   "content",
++			   GetResourcePath(),
++			   "/img/favicon.ico",
++			   "image/x-icon");
+ 
+ 		// takes first path components without 'extension' when it does not
+ 		// contain '.'
+ 		// modified by 'tadi' -- verified with above, but not counterchecked yet!
+ 		app.mapUrl("^/([^./]+)(.*)?", "$1");
+ 
++#if TNT_GLOBAL_TNTCONFIG
++		tnt::TntConfig::it().sessionTimeout = 86400;
++		tnt::TntConfig::it().defaultContentType = string("text/html; charset=") + LiveI18n().CharacterEncoding();
++#else
+ 		tnt::Sessionscope::setDefaultTimeout(86400);
+ 		tnt::HttpReply::setDefaultContentType(string("text/html; charset=") + LiveI18n().CharacterEncoding());
++#endif
+ 
+ 		Setup::IpList const& ips = LiveSetup().GetServerIps();
+ 		int port = LiveSetup().GetServerPort();
+diff --git a/tntfeatures.h b/tntfeatures.h
+index 6de1f88..76d3757 100644
+--- a/tntfeatures.h
++++ b/tntfeatures.h
+@@ -17,6 +17,9 @@
+ // Query params are now in tntnet and not in cxxtools
+ #define TNT_HAS_QUERYPARAMS		(TNTVERSION >= 16060)
+ 
++// Query params without boolean parameter
++#define TNT_QUERYPARAMS_NO_BOOL (TNTVERSION >= 22000)
++
+ // One can request the host part of the request url
+ #define TNT_HAS_GETHOST			(TNTVERSION >= 16060)
+ 
+@@ -26,4 +29,13 @@
+ // version of TNTNET that binds ipv6 addresses with IPV6_V6ONLY flag set to true
+ #define TNT_IPV6_V6ONLY	  	    (CXXTOOLVER >= 21000)
+ 
++// version of TNTNET with properties deserializer for logger configuration args.
++#define TNT_LOG_SERINFO			(CXXTOOLVER >= 22000)
++
++// version of TNTNET wich expects name, value mappings for Url-Mapper arguments.
++#define TNT_MAPURL_NAMED_ARGS	(TNTVERSION >= 22000)
++
++// version of TNTNET where configuration is global
++#define TNT_GLOBAL_TNTCONFIG	(TNTVERSION >= 22000)
++
+ #endif // VDR_LIVE_TNTFEATURES_H

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-2.patch

@@ -0,0 +1,25 @@
+commit 69f84f95fa875c6f562294b1a6a1ea6f584d3f6c
+Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
+Date:   Sat May 4 22:27:09 2013 +0200
+
+    With tntnet v2.2 use also the request.getArg(<name>) function.
+    In the previous commit support for tntnet 2.2 was added. The URL
+    mapping changed in that version and allows now named arguments. This
+    change makes uses of this feature now.
+
+diff --git a/pages/content.ecpp b/pages/content.ecpp
+index 27d827c..cde092f 100644
+--- a/pages/content.ecpp
++++ b/pages/content.ecpp
+@@ -17,7 +17,11 @@ bool logged_in(false);
+ 
+ string mime("image/png");
+ if (request.getArgsCount() > 0) {
++#if TNT_MAPURL_NAMED_ARGS
++	mime = request.getArg("mime-type");
++#else
+ 	mime = request.getArg(0);
++#endif
+ 	// dsyslog("vdrlive::content found mime arg (%s)", mime.c_str());
+ }
+ reply.setContentType(mime);

packages/3rdparty/multimedia/vdr-plugin-dvbapi/build

@@ -36,5 +36,6 @@ cd $PKG_BUILD
        VDRSRC="../$VDR_DIR" \
        LIBDIR="." \
        LOCALEDIR="./locale" \
+       LIBDVBCSA=1 \
        CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 

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

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="555272d"
+PKG_VERSION="2be5e15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="vdr openssl"
-PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"

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

@@ -20,6 +20,9 @@
 
 PKG_NAME="vdr-plugin-vnsiserver"
 PKG_VERSION="e3cd383"
+if [ "$XBMC" = "master" ]; then
+  PKG_VERSION="cd5023b"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-01_makefile.patch

@@ -0,0 +1,101 @@
+diff --git a/Makefile b/Makefile
+index 8f37c92..94869aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
+ 
+-PLUGIN = vnsiserver4
++PLUGIN = vnsiserver
+ 
+ ### The version number of this plugin (taken from the main source file):
+ 
+@@ -16,30 +16,18 @@ VERSION = $(shell grep 'static const char \*VERSION *=' vnsi.h | awk '{ print $$
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR ?= $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
+-ifeq ($(strip $(APIVERSION)),)
+-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+-NOCONFIG := 1
+-endif
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ # backwards compatibility version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+ 
+ VDRSRC = $(VDRDIR)
+ VDRSRC ?= ../../..
+@@ -47,21 +35,8 @@ ifeq ($(strip $(LIBDIR)),)
+ LIBDIR = $(VDRSRC)/PLUGINS/lib
+ endif
+ 
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+ -include $(VDRSRC)/Make.global
+ -include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-else
+-
+-### Allow user defined options to overwrite defaults:
+-
+--include $(PLGCFG)
+-endif
+ 
+ ### The name of the distribution archive:
+ 
+@@ -74,11 +49,9 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifeq ($(DEBUG),1)
+ DEFINES += -DDEBUG
+@@ -94,11 +67,7 @@ OBJS = vnsi.o bitstream.o vnsiclient.o config.o cxsocket.o parser.o parser_AAC.o
+ 
+ ### The main target:
+ 
+-ifdef API1733
+-all: install-lib
+-else
+ all: $(SOFILE)
+-endif
+ #
+ 
+ ### Implicit rules:
+@@ -145,6 +114,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

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

@@ -20,6 +20,9 @@
 
 PKG_NAME="vdr-plugin-xvdr"
 PKG_VERSION="33afe59"
+if [ "$XBMC" = "master" ]; then
+  PKG_VERSION="6249892"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr/build

@@ -39,12 +39,6 @@ NO_KBD=yes
 VDR_USER=root
 EOF
 
-if [ "$ICONV" = "libiconv" ]; then
-cat >> Make.config <<EOF
-LIBS += -liconv
-EOF
-fi
-
 make vdr
 make include-dir
 make plugins

packages/3rdparty/multimedia/vdr/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="2.0.1"
+PKG_VERSION="2.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/security/nss/build

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-# dont build parallel
-  MAKEFLAGS=-j1
-
-cd $PKG_BUILD/mozilla/security/nss
-
-setup_toolchain host
-
-[ "`uname -m`" = "x86_64" ] && HOST_USE_64="USE_64=1"
-
-# make host part for nsinstall binary and created library signatures
-make nss_build_all CC=$CC LDFLAGS="$LDFLAGS" $HOST_USE_64
-
-# save host binary
-cp ../coreconf/nsinstall/Linux*_DBG.OBJ/nsinstall nsinstall-host
-NSINSTALL_HOST=`pwd`/nsinstall-host
-
-# save library signatures to be used on target
-# the .chk file format is cross platform (so I read)
-find ./ -name "lib*.chk" -exec cp {} ../../dist/ \;
-
-# can't run in crosscompile (remove it from target)
-sed -i "/shlibsign/d" cmd/manifest.mn
-
-# clean up host part
-rm -rf `find ../../../ -type d -name Linux*_DBG.OBJ`
-
-[ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1"
-
-setup_toolchain target
-
-NSPR_CONFIGURE_OPTS="--host=$TARGET_NAME --build=$HOST_NAME --target=$TARGET_NAME"
-NSPR_CONFIGURE_OPTS="$NSPR_CONFIGURE_OPTS --prefix=/usr --enable-strip --with-pthreads" \
-make nss_build_all \
-  NSINSTALL=$NSINSTALL_HOST \
-  BUILD_OPT=1 $TARGET_USE_64 \
-  OS_TEST=$TARGET_ARCH \
-  CPU_ARCH_TAG=$TARGET_ARCH \
-  USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
-  CC=$CC CCC=$CXX RANLIB=$RANLIB \
-  V=1

packages/3rdparty/security/nss/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="nss"
-PKG_VERSION="3.13.3"
-PKG_REV="1"
-PKG_ARCH="i386 x86_64"
-PKG_LICENSE="Mozilla Public License"
-PKG_SITE="http://ftp.mozilla.org/"
-PKG_URL="http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/$PKG_NAME-$PKG_VERSION-with-nspr-4.9.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="security"
-PKG_SHORTDESC="nss: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications."
-PKG_LONGDESC="Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

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

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#      Copyright (C) 2011-2011 Gregor Fuis ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pcsc-lite"
-PKG_VERSION="1.8.8"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3862/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libusb"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/system"
-PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)"
-PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)"
-PKG_IS_ADDON="yes"
-PKG_AUTORECONF="yes"

packages/3rdparty/textproc/bbe/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="bbe"
-PKG_VERSION="0.2.2"
-PKG_REV="1"
-PKG_ARCH=""
-PKG_LICENSE="GPL"
-PKG_SITE="http://bbe-.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/bbe-/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="textproc"
-PKG_SHORTDESC="sed-like editor for binary files"
-PKG_LONGDESC="bbe: sed-like editor for binary files"
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/web/pycurl/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pycurl"
-PKG_VERSION="7.19.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL-2"
-PKG_SITE="http://pycurl.sourceforge.net/"
-PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python curl"
-PKG_BUILD_DEPENDS="toolchain Python distutilscross curl libgcrypt"
-PKG_PRIORITY="optional"
-PKG_SECTION="python/web"
-PKG_SHORTDESC="pycurl: a Python interface to libcurl"
-PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch

@@ -1,24 +0,0 @@
---- a/src/pycurl.c	
-+++ a/src/pycurl.c	
-@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self)
-         }
-     }
- 
-+    Py_INCREF(Py_None);
-     return Py_None;
- }
- 
---- a/tests/test_internals.py	
-+++ a/tests/test_internals.py	
-@@ -245,6 +245,11 @@ if 1 and gc:
-     if opts.verbose >= 1:
-         print "Tracked objects:", len(gc.get_objects())
- 
-+if 1:
-+    # Ensure that the refcounting error in "reset" is fixed:
-+    for i in xrange(100000):
-+        c = Curl()
-+        c.reset()
- 
- # /***********************************************************************
- # // done

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch

@@ -1,11 +0,0 @@
-diff -uNr pycurl-7.19.0-orig/setup.py pycurl-7.19.0-new/setup.py
---- pycurl-7.19.0-orig/setup.py	2012-12-21 19:20:27.000000000 +0100
-+++ pycurl-7.19.0-new/setup.py	2012-12-21 19:31:11.000000000 +0100
-@@ -104,6 +104,7 @@
-             if e[2:] == 'ssl':
-                 define_macros.append(('HAVE_CURL_OPENSSL', 1))
-             if e[2:] == 'gnutls':
-+                libraries.append("gcrypt")
-                 define_macros.append(('HAVE_CURL_GNUTLS', 1))
-         elif e[:2] == "-L":
-             library_dirs.append(e[2:])

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch

@@ -1,12 +0,0 @@
---- pycurl/setup.py~	2008-04-22 17:00:45.000000000 +0300
-+++ pycurl/setup.py	2008-07-03 21:53:36.000000000 +0300
-@@ -97,8 +97,7 @@
-         else:
-             extra_compile_args.append(e)
-     libs = split_quoted(
--        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
--        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+        os.popen("'%s' --libs" % CURL_CONFIG).read())
-     for e in libs:
-         if e[:2] == "-l":
-             libraries.append(e[2:])

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch

@@ -1,14 +0,0 @@
-diff -Naur pycurl-7.19.0/setup.py pycurl-7.19.0.patch/setup.py
---- pycurl-7.19.0/setup.py	2008-09-09 19:40:34.000000000 +0200
-+++ pycurl-7.19.0.patch/setup.py	2011-09-29 02:07:22.584412664 +0200
-@@ -11,8 +11,8 @@
- 
- import glob, os, re, sys, string
- import distutils
--from distutils.core import setup
--from distutils.extension import Extension
-+from setuptools import setup
-+from setuptools import Extension
- from distutils.util import split_quoted
- from distutils.version import LooseVersion
- 

packages/3rdparty/web/tntnet/build

@@ -27,13 +27,14 @@ cd $PKG_BUILD
 setup_toolchain host
 
 mkdir -p .build-host && cd .build-host
+
 ../configure --host=$HOST_NAME \
             --build=$HOST_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
             --disable-static \
             --enable-shared \
+            --disable-unittest \
             --with-server=no \
-            --with-cgi=no \
             --with-sdk=yes \
             --with-demos=no \
             --with-epoll=yes \
@@ -57,11 +58,13 @@ mkdir -p .build-target && cd .build-target
             --sysconfdir=/etc \
             --disable-static \
             --enable-shared \
+            --disable-unittest \
+            --with-sysroot=$SYSROOT_PREFIX \
             --with-server=no \
-            --with-cgi=no \
-            --with-sdk=yes \
+            --with-sdk=no \
             --with-demos=no \
             --with-epoll=yes \
+            --with-ssl=no \
             --with-stressjob=no
 
 $MAKEINSTALL

packages/3rdparty/web/tntnet/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tntnet"
-PKG_VERSION="2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="tntnet: C++ Dynamite for the Web"
 PKG_LONGDESC="Tntnet is a modular, multithreaded, high performance webapplicationserver for C++"
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"

packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch

@@ -0,0 +1,18 @@
+Description: Include unistd.h to fix FTBFS with gcc-4.7
+ tntnet (2.1-1ubuntu1) quantal; urgency=low
+ .
+   * Add missing header to fix FTBFS with gcc4.7 on non-amd64 archs
+Author: Micah Gersten <[email protected]>
+
+Index: tntnet-2.2/framework/defcomp/static.cpp
+===================================================================
+--- tntnet-2.2.orig/framework/defcomp/static.cpp	2013-04-21 22:13:57.000000000 +0300
++++ tntnet-2.2/framework/defcomp/static.cpp	2013-05-19 23:12:17.000000000 +0300
+@@ -34,6 +34,7 @@
+ #include <tnt/http.h>
+ #include <tnt/httpheader.h>
+ #include <tnt/comploader.h>
++#include <unistd.h>
+ #include <fstream>
+ #include <cxxtools/log.h>
+ #include <cxxtools/systemerror.h>

packages/3rdparty/x11/app/xdotool/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="xdotool"
-PKG_VERSION="2.20110530.1"
-PKG_REV="1"
-PKG_ARCH=""
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.semicomplete.com/projects/xdotool/"
-PKG_URL="http://semicomplete.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libXtst libXinerama"
-PKG_PRIORITY="optional"
-PKG_SECTION="x11/app"
-PKG_SHORTDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
-PKG_LONGDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/x11/lib/libXcursor/build

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared
-
-make
-$MAKEINSTALL

packages/3rdparty/x11/lib/libXcursor/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libXcursor"
-PKG_VERSION="1.1.13"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXfixes libXrender libX11"
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="x11/lib"
-PKG_SHORTDESC="libXcursor: X Cursor Library"
-PKG_LONGDESC="X11 Cursor management library"
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"

packages/accessibility/atk/build

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-ac_cv_func_posix_getpwuid_r=yes \
-glib_cv_stack_grows=no glib_cv_uscore=no \
-ac_cv_func_strtod=yes ac_fsusage_space=yes \
-fu_cv_sys_stat_statfs2_bsize=yes ac_cv_func_closedir_void=no \
-ac_cv_func_getloadavg=no ac_cv_lib_util_getloadavg=no \
-ac_cv_lib_getloadavg_getloadavg=no ac_cv_func_getgroups=yes \
-ac_cv_func_getgroups_works=yes ac_cv_func_chown_works=yes \
-ac_cv_have_decl_euidaccess=no ac_cv_func_euidaccess=no \
-ac_cv_have_decl_strnlen=yes ac_cv_func_strnlen_working=yes \
-ac_cv_func_lstat_dereferences_slashed_symlink=yes ac_cv_func_lstat_empty_string_bug=no \
-ac_cv_func_stat_empty_string_bug=no vb_cv_func_rename_trailing_slash_bug=no \
-ac_cv_have_decl_nanosleep=yes jm_cv_func_nanosleep_works=yes \
-gl_cv_func_working_utimes=yes ac_cv_func_utime_null=yes \
-ac_cv_have_decl_strerror_r=yes ac_cv_func_strerror_r_char_p=no \
-jm_cv_func_svid_putenv=yes ac_cv_func_getcwd_null=yes \
-ac_cv_func_getdelim=yes ac_cv_func_mkstemp=yes \
-utils_cv_func_mkstemp_limitations=no utils_cv_func_mkdir_trailing_slash_bug=no \
-ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \
-gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \
-jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \
-jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \
-ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \
-gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_path_max=yes \
-ac_cv_func_fnmatch_gnu=yes am_getline_needs_run_time_check=no \
-am_cv_func_working_getline=yes gl_cv_func_mkdir_trailing_slash_bug=no \
-gl_cv_func_mkstemp_limitations=no ac_cv_func_working_mktime=yes \
-jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
-gl_cv_c_restrict=no ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
-ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config" \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-glibtest \
-
-make
-$MAKEINSTALL

packages/accessibility/atk/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="atk"
-PKG_VERSION="2.6.0"
-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/2.6/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="glib"
-PKG_BUILD_DEPENDS="toolchain glib"
-PKG_PRIORITY="optional"
-PKG_SECTION="accessibility"
-PKG_SHORTDESC="ATK - Accessibility Toolkit"
-PKG_LONGDESC="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,12 @@
+3.1.6
+  rebuild
+3.1.5
+  get tuner id with command 'hdhomerun_config discover' and
+  set number of tuners manually
+3.1.4
+  get tuner id from /var/log/messages
+3.1.3
+  fixed parsing dvbhdhomerun.log file with timestamp
 3.1.2
   new addon settings option to enable suspend/resume driver actions
   new addon settings option to enable logging

packages/addons/driver/hdhomerun/meta

@@ -20,13 +20,13 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="3.2"
-PKG_REV="2"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."

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

@@ -63,39 +63,46 @@ if [ -z "$(pidof userhdhomerun)" ]; then
     cp $HDHR_ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
 
     # get tuner serial numbers
-    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
+    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
     . /var/config/hdhomerun-addon.conf
 
-    for SERIAL in $SERIALS; do
-      SERIAL_VAR=$(echo $SERIAL | sed 's|-|_|')
-      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DVBMODE)
-      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_FULLNAME)
-      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DISABLE)
+    for SERIAL_UNIQ in $SERIALS; do
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DVBMODE)
+      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_FULLNAME)
+      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DISABLE)
+      NUMBERS=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_NUMBERS)
 
-      [ "$DVBMODE" = "auto" ] && DVBMODE=""
+      NUMBERS=$(( $NUMBERS -1 ))
+      NUMBERS=$(( $NUMBERS *1 ))
 
-      # remove setttings for this tuner
-      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
-      mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
-      echo "" >>$DVBHDHOMERUN_CONF_TMP
-      # remove empty lines at the end of file
-      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+      for i in $(seq 0 $NUMBERS); do
+        SERIAL="$SERIAL_UNIQ-$i"
 
-      ADDNEW=true
-      if [ -n "$DVBMODE" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
-        echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
-      fi
-      if [ "$FULLNAME" = "true" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
-        echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
-      fi
-      if [ "$DISABLE" = "true" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
-        echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
-      fi
+        [ "$DVBMODE" = "auto" ] && DVBMODE=""
 
-      echo "" >>$DVBHDHOMERUN_CONF_TMP
+        # remove setttings for this tuner
+        awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
+        mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
+        echo "" >>$DVBHDHOMERUN_CONF_TMP
+        # remove empty lines at the end of file
+        sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+
+        ADDNEW=true
+        if [ -n "$DVBMODE" ]; then
+          [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+          echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
+        fi
+        if [ "$FULLNAME" = "true" ]; then
+          [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+          echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
+        fi
+        if [ "$DISABLE" = "true" ]; then
+          [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+          echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
+        fi
+
+        echo "" >>$DVBHDHOMERUN_CONF_TMP
+      done
     done
 
     # remove logging from libhdhomerun library

packages/addons/driver/hdhomerun/source/default.py

@@ -27,10 +27,8 @@ __cwd__           = __settings__.getAddonInfo('path')
 __resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
 __settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
 
-__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
-
 if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
   sys.path.append(__resources_lib__)
   from functions import refresh_hdhomerun_tuners
-  refresh_hdhomerun_tuners(__settings_xml__, __hdhomerun_log__)
+  refresh_hdhomerun_tuners(__settings_xml__)
   __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml

@@ -11,5 +11,6 @@
   <string id="9005">Enable modifying settings</string>
   <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    use full name</string>
+  <string id="9025">    number of tuners</string>
   <string id="9030">    disabled</string>
 </strings>

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -20,6 +20,8 @@
 
 import os
 import sys
+import re
+import subprocess
 import shutil
 import xmlpp
 from xml.dom import minidom
@@ -44,25 +46,28 @@ def settings_restore(settings_xml):
 
 ######################################################################################################
 # get hdhomerun supported devices on a system (only name like 101ADD2B-0)
-def get_devices_hdhomerun(hdhomerun_log):
+def get_devices_hdhomerun():
   tuners = []
   try:
-    for line in open(hdhomerun_log, 'r'):
-      line = line.strip()
-      if line.startswith('Registered tuner'):
-        name = line.split(':');
-        name = name[2].strip()
-        tuners.append(name)
+    p = os.popen("hdhomerun_config discover", "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        match = re.search(r'hdhomerun device (.+) found at .+', line)
+        if match:
+          name = match.group(1)
+          print name
+          tuners.append(name)
   except IOError:
-    print 'Error reading hdhomerun log file', hdhomerun_log
+    print 'Error getting hdhomerun tuners info'
   return tuners
 
   """
-root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
-Registered tuner, id from kernel: 0 name: 101ADD2B-0
-Registered tuner, id from kernel: 1 name: 101ADD2B-1
-Registered tuner, id from kernel: 2 name: 1031D75A-0
-Registered tuner, id from kernel: 3 name: 1031D75A-1
+openelec:~ # hdhomerun_config discover
+hdhomerun device 12345678 found at 192.168.0.3
   """
 
 ######################################################################################################
@@ -152,11 +157,13 @@ def remove_old_tuners(xmldoc):
 # add new hdhomerun tuners
 def add_hdhomerun(xmldoc, node_cat, tuners):
   for ix, tuner in enumerate(tuners):
-    tuner_var = tuner.replace('-', '_')
+    #tuner_var = tuner.replace('-', '_')
+    tuner_var = tuner
+    print tuner
 
     node1 = xmldoc.createElement("setting")
     node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
-    node1.setAttribute("label", tuner)
+    node1.setAttribute("label", "tuner serial " + tuner_var)
     node1.setAttribute("type", 'labelenum')
     node1.setAttribute("default", 'auto')
     node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
@@ -170,12 +177,20 @@ def add_hdhomerun(xmldoc, node_cat, tuners):
     node_cat.appendChild(node2)
 
     node3 = xmldoc.createElement("setting")
-    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
-    node3.setAttribute("label", '9030')
-    node3.setAttribute("type", 'bool')
-    node3.setAttribute("default", 'false')
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_NUMBERS')
+    node3.setAttribute("label", '9025')
+    node3.setAttribute("type", 'labelenum')
+    node3.setAttribute("default", '2')
+    node3.setAttribute("values", '1|2|3|4|5|6|7|8')
     node_cat.appendChild(node3)
 
+    node4 = xmldoc.createElement("setting")
+    node4.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node4.setAttribute("label", '9030')
+    node4.setAttribute("type", 'bool')
+    node4.setAttribute("default", 'false')
+    node_cat.appendChild(node4)
+
   # for tuner
 
 ######################################################################################################
@@ -247,9 +262,9 @@ def save_settings(settings_xml, xmldoc):
 
 ######################################################################################################
 # refresh hdhomerun tuners in settings.xml file
-def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+def refresh_hdhomerun_tuners(settings_xml):
   settings_backup(settings_xml)
-  tuners = get_devices_hdhomerun(hdhomerun_log)
+  tuners = get_devices_hdhomerun()
   xmldoc = parse_settings(settings_xml)
   if xmldoc == None:
     print 'No hdhomerun tuners found'

packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power

@@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
   LOCKFILE="$LOCKDIR/hdhomerun"
 
   case "$1" in
-    hibernate|suspend)
+    hibernate|suspend|pre)
       if [ -n "$(pidof userhdhomerun)" ]; then
         progress "Shutting down HDHomeRun driver for suspending..."
         mkdir -p "$LOCKDIR"
@@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
       fi
       ;;
 
-    thaw|resume)
+    thaw|resume|post)
       if [ -f "$LOCKFILE" ]; then
         # driver started within Tvheadend/VDR
         rm -f "$LOCKFILE"

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

@@ -1,3 +1,5 @@
+3.1.3
+  rebuild
 3.1.2
   new addon settings option to enable suspend/resume driver actions
 3.1.1

packages/addons/driver/sundtek-mediatv/meta

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

packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power

@@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
   LOCKFILE="$LOCKDIR/sundtek-mediatv"
 
   case "$1" in
-    hibernate|suspend)
+    hibernate|suspend|pre)
       if [ -n "$(pidof mediasrv)" ]; then
         progress "Shutting down Sundtek DVB driver for suspending..."
         mkdir -p "$LOCKDIR"
@@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
       fi
       ;;
 
-    thaw|resume)
+    thaw|resume|post)
       if [ -f "$LOCKFILE" ]; then
         # driver started within Tvheadend/VDR
         rm -f "$LOCKFILE"

packages/addons/multimedia/makemkv/addon

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-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
-  chmod 755 $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/changelog.txt

@@ -1,63 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.6
-- update to makemkv-1.8.3
-
-3.0.5
-- update to makemkv-1.8.2
-
-3.0.4
-- update to makemkv-1.8.0
-
-3.0.3
-- update to makemkv-1.7.10
-
-3.0.2
-- update to makemkv-1.7.9
-
-3.0.1
-- bump addon version
-- update to makemkv-1.7.8
-
-2.1.4
-- update to makemkv-1.7.7
-
-2.1.3
-- update to makemkv-1.7.6
-
-2.1.2
-- update to makemkv-1.7.4
-
-2.1.1
-- update to addon version 2.1
-
-2.0.2
-- update to makemkv-1.7.2
-
-2.0.1
-- update to makemkv-1.7.0
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.2
-- depends on xbmc.python API 2.0
-
-1.90.1
-- update to makemkv-1.6.16
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- prepare for OpenELEC-1.0 release
-
-0.99.3
-- update to makemkv-1.6.15
-
-0.99.2
-- change icon
-
-0.99.1
-- initial addon based on makemkv-1.6.10

packages/addons/multimedia/makemkv/meta

@@ -1,39 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="makemkv"
-PKG_VERSION="1.8.3"
-PKG_REV="1"
-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}-oss-${PKG_VERSION}.tar.gz"
-PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="openssl"
-PKG_BUILD_DEPENDS="toolchain openssl expat"
-PKG_PRIORITY="optional"
-PKG_SECTION="lib/multimedia"
-PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way."
-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-000-crosscompiling-0.1.patch

@@ -1,26 +0,0 @@
-diff --git a/lib/makefile.linux b/lib/makefile.linux
-index b3b5afa..07322ad 100644
---- a/lib/makefile.linux
-+++ b/lib/makefile.linux
-@@ -1,10 +1,10 @@
- 
- include makefile.common
- 
--GCC=gcc
-+GCC:=gcc
- MOC=$(strip $(shell which moc-qt4))
- ifeq ($(MOC),)
--MOC=moc
-+MOC:=moc
- endif
- 
- CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
-@@ -16,7 +16,7 @@ PREFIX=/usr
- LIBDIR=${PREFIX}/lib
- 
- 
--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/patches.upstream/makemkv-001-crosscompiling-objcopy.patch

@@ -1,13 +0,0 @@
-diff --git a/lib/makefile.linux b/lib/makefile.linux
-index dedf8cf..5fac196 100644
---- a/lib/makefile.linux
-+++ b/lib/makefile.linux
-@@ -38,7 +38,7 @@ endif
- 	install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
- 
- out/%: out/%.full
--	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out

packages/addons/multimedia/makemkv/unpack

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-require_eglibc $1
-
-[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
-
-mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION
-mv $BUILD/${PKG_NAME}-oss-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/lib
-mv $BUILD/${PKG_NAME}-bin-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/bin
-
-echo "### Applying upstream patches ###"
-
-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/multimedia/w_scan/build

@@ -22,10 +22,6 @@
 
 . config/options
 
-if [ "$ICONV" = "libiconv" ]; then
-  export LIBS="-liconv"
-fi
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \

packages/addons/multimedia/w_scan/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/w_scan/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="w_scan: eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf."

packages/addons/networking/backup/rsync/addon

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

packages/addons/networking/backup/rsync/build

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./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

@@ -1,36 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.2
-- rebuild against static libpopt
-
-3.0.1
-- bump addon version
-
-2.1.1
-- update to addon version 2.1
-
-2.0.1
-- rebuild for libiconv changes
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.1
-- depends on xbmc.python API 2.0
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- update to rsync-3.0.9
-- prepare for OpenELEC-1.0 release
-
-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

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="rsync"
-PKG_VERSION="3.0.9"
-PKG_REV="1"
-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 $ICONV popt"
-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/testing/iperf/addon

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

packages/addons/networking/testing/iperf/build

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-ac_cv_func_malloc_0_nonnull=yes \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-acl-support \
-            --disable-xattr-support \
-
-make

packages/addons/networking/testing/iperf/changelog.txt

@@ -1,11 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.2
-- rebuild
-
-3.0.1
-- bump addon version
-
-2.1.1
-- initial addon based on iperf-2.0.5