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

@@ -0,0 +1,98 @@
+### Questions about OpenELEC?
+
+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
+
+**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:
+- What did you do?
+- 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.**
+
+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.
+
+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
+
+- **Create topic branches**. Don't ask us to pull from your master branch.
+
+- **One pull request per feature**. If you want to do more than one thing, send
+  multiple pull requests.
+
+- **Send coherent history**. Make sure each individual commit in your pull
+  request is meaningful. If you had to make multiple intermediate commits while
+  developing, please squash them before sending them to us.
+
+Please follow this process; it's the best way to get your work included in the project:
+
+- [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
+   and configure the remotes:
+
+```bash
+   # clone your fork of the repo into the current directory in terminal
+   git clone [email protected]:<your username>/OpenELEC.tv.git
+   # navigate to the newly cloned directory
+   cd OpenELEC.tv
+   # assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/OpenELEC/OpenELEC.tv.git
+   ```
+
+- If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   # fetch upstream changes
+   git fetch upstream
+   # make sure you are on your 'master' branch
+   git checkout master
+   # merge upstream changes
+   git merge upstream/master
+   ```
+
+- Create a new topic branch to contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+- Commit your changes in logical chunks. or your pull request is unlikely
+   be merged into the main project. Use git's
+   [interactive rebase](https://help.github.com/articles/interactive-rebase)
+   feature to tidy up your commits before making them public.
+
+- Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+- [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a
+    clear title and description.
+
+[Forum]: http://openelec.tv/forum
+[issue]: https://github.com/OpenELEC/OpenELEC.tv/issues
+[webchat]: http://openelec.tv/support/chat
+[logfiles]: http://wiki.openelec.tv/index.php?title=OpenELEC_FAQ#Support_Logs
+[similar issue]: https://github.com/OpenELEC/OpenELEC.tv/search?&ref=cmdform&type=Issues

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
 

README.md

@@ -14,7 +14,7 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 **Installation**
 
-* Please read INSTALL for instructions on how to install.
+* Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
 
 **Known issues**
 

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

@@ -56,7 +56,7 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  ls -d $ROOT/$BUILD/linux-[0-9]*
+  ls -d $ROOT/$BUILD/linux-*
 }
 
 tolower(){
@@ -169,6 +169,11 @@ strip_linker_plugin() {
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
+strip_gold() {
+  # strip out usage from GOLD linker
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
+}
+
 fix_module_depends() {
   # modify .modinfo section in kernel module to depends on other required modules
   local MODULE="$1"
@@ -186,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
@@ -233,7 +254,7 @@ dashes="==========================="
 show_config() {
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options
@@ -247,6 +268,7 @@ show_config() {
   config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT"
   config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
+  config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
   config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
 
   # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS"
@@ -272,10 +294,9 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
-  config_message="$config_message\n - OpenMAX Support (provider):\t\t $OPENMAX_SUPPORT ($OPENMAX)"
+  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
 
@@ -316,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
@@ -339,9 +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 - Update support:\t\t\t $UPDATE_SUPPORT"
+  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

@@ -20,12 +20,6 @@ if [ "$SDL_SUPPORT" = no ]; then
   JOYSTICK_SUPPORT="no"
 fi
 
-if [ "$OPENMAX" = no ]; then
-  OPENMAX_SUPPORT="no"
-else
-  OPENMAX_SUPPORT="yes"
-fi
-
 if [ "$OPENGL_SUPPORT" = no ]; then
   XBMC_SCR_RSXS="no"
   XBMC_VIS_PROJECTM="no"
@@ -34,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
@@ -42,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
@@ -99,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/optimize

@@ -29,6 +29,10 @@ if [ "$LTO_SUPPORT" = yes ];then
   LD_OPTIM="$LD_OPTIM -flto"
 fi
 
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+fi
+
 if [ "$DEBUG" = yes ]; then
   TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"

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"
@@ -49,22 +53,43 @@ SED="sed -i"
   PKG_DEPENDS=""
   PKG_BUILD_DEPENDS=""
   PKG_PRIORITY="optional"
-  PKG_SECTION="misc"
+  PKG_SECTION=""
   PKG_SHORTDESC="$1 (autogenerated)"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    PKG_DIR=`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $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
 
-  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
-  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
+  if [ -r $PKG_DIR/package.mk ]; then
+    . $PKG_DIR/package.mk
+  elif [ -r $PKG_DIR/meta ]; then
+    . $PKG_DIR/meta
+  fi
+
+  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
 
   if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
     PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
@@ -129,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
@@ -154,3 +179,6 @@ else
   exec 4>/dev/null
 fi
 BUILD_INDENT_SIZE=4
+
+# multilib? nah
+unset CONFIG_SITE

config/version

@@ -2,8 +2,8 @@
   OPENELEC_VERSION="devel"
 
 # OS_VERSION: OS Version
-  OS_VERSION="3.0"
+  OS_VERSION="3.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="3.0"
+  ADDON_VERSION="3.1"
 

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="5a23be2"
-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="263272c"
-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="ebec1de"
-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/cxxtools/build

@@ -32,7 +32,10 @@ mkdir -p .build-host && cd .build-host
             --build=$HOST_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
             --disable-static \
-            --enable-shared
+            --enable-shared \
+            --disable-demos \
+            --with-atomictype=pthread \
+            --disable-unittest
 
 make
 make install
@@ -41,12 +44,19 @@ cd ..
 
 setup_toolchain target
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 mkdir -p .build-target && cd .build-target
 ../configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared
+            --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.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,18 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="util-linux"
-PKG_VERSION="2.22.2"
+PKG_NAME="libdvbcsa"
+PKG_VERSION="1.1.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.22/$PKG_NAME-$PKG_VERSION.tar.xz"
+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="system"
-PKG_SHORTDESC="util-linux: Miscellaneous system utilities for Linux"
-PKG_LONGDESC="The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among many features, Util-linux contains the fdisk configuration tool and the login program."
+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/libhdhomerun/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libhdhomerun"
-PKG_VERSION="20130117"
+PKG_VERSION="20130328"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

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 \
-             --enable-shared \
-             $CONFIG_LIBXML \
+             --disable-shared \
              --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/lib/libzip/build

@@ -27,6 +27,8 @@ cd $PKG_BUILD
 ./configure \
        --host=$TARGET_NAME \
        --build=$HOST_NAME \
+       --enable-static \
+       --disable-shared \
        --prefix=/usr 
 
 $MAKEINSTALL

packages/3rdparty/multimedia/rotorng/build

@@ -24,7 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
 
 make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
-

packages/3rdparty/multimedia/rotorng/meta

@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="rotorng"
-PKG_VERSION="0.1.0"
+PKG_VERSION="0.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-rotor-ng"
-PKG_URL="http://projects.vdr-developer.org/attachments/download/631/rotorng-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="vdr"
 PKG_BUILD_DEPENDS="toolchain vdr"
 PKG_PRIORITY="optional"
+PKG_URL="http://projects.vdr-developer.org/attachments/download/1088/rotorng-${PKG_VERSION}.tar.gz"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
 PKG_LONGDESC="Next generation of a VDR plugin design to drive a diseqc rotor"

packages/3rdparty/multimedia/rotorng/patches/rotorng-0.1.0-vdr.patch

@@ -1,30 +0,0 @@
-diff -uNr rotorng-0.1.0-orig/rotorng.c rotorng-0.1.0/rotorng.c
---- rotorng-0.1.0-orig/rotorng.c	2012-05-06 16:14:06.000000000 +0200
-+++ rotorng-0.1.0/rotorng.c	2012-05-07 10:52:18.000000000 +0200
-@@ -338,7 +338,7 @@
-   int last_position_shown;
-   bool transfer;
- protected:
--  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber,bool LiveView);
- public:
-   cStatusMonitor();
- };
-@@ -348,7 +348,7 @@
-   transfer=false;
- }
- 
--void cStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber)
-+void cStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber,bool LiveView)
- {
-   //actuator_status status;
-   if (ChannelNumber) {
-@@ -1494,7 +1494,7 @@
-                snprintf(buf, sizeof(buf),"%s %d", tr(menucaption[itemindex]), menuvalue[itemindex]);
-                break;  
-              case MI_SYSTEM:
--               snprintf(buf, sizeof(buf),"%s %s", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], SystemValues));
-+               snprintf(buf, sizeof(buf),"%s %s", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], SystemValuesSat));
-                break;
-              case MI_MODULATION:
-                snprintf(buf, sizeof(buf),"%s %s ", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], ModulationValues));

packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch

@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index 9d62d04..5519a07 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ 
+ ### The C++ compiler and options:
+ 
+-CXX      ?= g++
+ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive
+ 
+ ### Make sure that the necessary options are included
+@@ -27,7 +26,6 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive
+ ### The directory environment:
+ 
+ DVBDIR = ../../../../DVB
+-VDRDIR = ../../..
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+ 
+@@ -37,11 +35,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-ifeq ($(strip $(APIVERSION)),)
+-  APIVERSION = $(VDRVERSION)
+-endif
+ 
+ ### The name of the distribution archive:
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch

@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 65a7674..1a5976e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -54,7 +54,7 @@ all: libvdr-$(PLUGIN).so
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

packages/3rdparty/multimedia/vdr-epgsearch/build

@@ -23,6 +23,11 @@
 . config/options $1
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
 cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-epgsearch"
-PKG_VERSION="0fc4817"
+PKG_VERSION="e2de927"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch

@@ -0,0 +1,68 @@
+diff --git a/Makefile b/Makefile
+index 6bb1b96..118e379 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,21 +62,10 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
+ 
+ ### 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)
+-MANDIR   = $(call PKGCFG,mandir)
+-CONFDIR  = $(call PKGCFG,configdir)
+-BINDIR   = $(call PKGCFG,bindir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
+-
+ ### configuring modules
+ ifeq ($(AUTOCONFIG),1)
+ 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
+@@ -92,9 +81,11 @@ ifeq ($(AUTOCONFIG),1)
+ 	endif
+ endif
+ 
++include $(VDRDIR)/Make.global
++
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -103,7 +94,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += 
+ 
+@@ -231,15 +222,19 @@ install-i18n: $(I18Nmsgs)
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN2).so: $(OBJS2)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN3).so: $(OBJS3)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN4).so: $(OBJS4)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ createcats: createcats.o Makefile
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@

packages/3rdparty/multimedia/vdr-iptv/build

@@ -30,4 +30,3 @@ LDFLAGS="$LDFLAGS -fPIC"
 
 cd $PKG_BUILD
 make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
-

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

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-iptv"
-PKG_VERSION="0.5.2"
+PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
 PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_DEPENDS="vdr"
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS="toolchain vdr curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"

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

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

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch

@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d41acd1..58faab1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,9 +5,6 @@
- # Debugging on/off 
- #IPTV_DEBUG = 1
- 
--# Strip debug symbols?  Set eg. to /bin/true if not
--STRIP = strip
--
- # The official name of this plugin.
- # 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.

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch

@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index 7f147b8..db294fc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,6 @@
+ 
+ # Strip debug symbols?  Set eg. to /bin/true if not
+ 
+-STRIP = strip
+-
+ # The official name of this plugin.
+ # 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.
+@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+ 
+ ### 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)
+-CFGDIR = $(call PKGCFG,configdir)
+-#
+ 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)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ ifndef IPTV_DEBUG
+ 	@$(STRIP) $@
+ endif

packages/3rdparty/multimedia/vdr-live/build

@@ -24,9 +24,9 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
-CFLAGS="$CFLAGS -fPIC"
-CXXFLAGS="$CXXFLAGS -fPIC"
-LDFLAGS="$LDFLAGS -fPIC"
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
 # dont build parallel
   MAKEFLAGS=-j1

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

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-live"
-PKG_VERSION="0.2.0"
+PKG_VERSION="0.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://live.vdr-developer.org/en/index.php"
 PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="vdr"
-PKG_BUILD_DEPENDS="toolchain vdr tntnet"
+PKG_BUILD_DEPENDS="toolchain vdr tntnet pcre-host pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch

@@ -1,39 +0,0 @@
-Description: Allows to use IPV6 addresses
-Forwarded: not-needed
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630627#10
-Bug-Debian: http://bugs.debian.org/630627
-Author: Luboš Doležel <[email protected]>
-
---- live-0.2.0/setup.cpp.orig	2008-04-23 01:01:53.000000000 +0200
-+++ live-0.2.0/setup.cpp	2011-06-15 20:22:36.577961061 +0200
-@@ -151,13 +151,28 @@
- 
- bool Setup::CheckServerIps()
- {
-+	bool v6supported = false;
-+	int s = socket(AF_INET6, SOCK_STREAM, 0);
-+	
-+	if (s != -1) {
-+		close(s);
-+		v6supported = true;
-+	}
-+	
- 	if ( m_serverIps.empty() ) {
--		m_serverIps.push_back( "0.0.0.0" );
-+		if (v6supported)
-+			m_serverIps.push_back( "::" );
-+		else
-+			m_serverIps.push_back( "0.0.0.0" );
- 		return true;
- 	}
- 
-+        union {
-+		in_addr in4;
-+		in6_addr in6;
-+	};
- 	for ( IpList::const_iterator ip = m_serverIps.begin(); ip != m_serverIps.end(); ++ip ) {
--		if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) {
-+		if ( !inet_pton(AF_INET, ip->c_str(), &in4) && !inet_pton(AF_INET6, ip->c_str(), &in6) ) {
- 			esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
- 			cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
- 			return false;

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch

@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_timers_colon.dpatch by Timo Weingärtner <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: colons have to be replaced by pipes in timer titles.
-
-@DPATCH@
---- vdr-plugin-live-0.2.0/timers.cpp	2008-04-10 22:06:05.000000000 +0200
-+++ vdr-plugin-live-0.2.0.new/timers.cpp	2009-07-25 23:39:02.000000000 +0200
-@@ -138,7 +138,7 @@
- 		ostringstream builder;
- 		builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" )
- 				<< ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":"
--				<< priority << ":" << lifetime << ":" << title << ":" << aux;
-+				<< priority << ":" << lifetime << ":" << StringReplace(title, ":", "|") << ":" << aux;
- 		// dsyslog("%s", builder.str().c_str());
- 
- 		TimerPair timerData( timer, builder.str() );

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch

@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_live-0.2.0-fix-INCLUDES.dpatch by Thomas Günther <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes compilation with VDR >= 1.7.13.
-
-@DPATCH@
---- live-0.2.0/Makefile
-+++ live-0.2.0/Makefile
-@@ -38,6 +38,7 @@
- ### Allow user defined options to overwrite defaults:
- 
- -include $(VDRDIR)/Make.config
-+EXTRA_INCLUDES = $(INCLUDES)
- 
- ### The version number of VDR's plugin API (taken from VDR's "config.h"):
- 
-@@ -139,10 +140,10 @@
- subdirs: $(SUBDIRS)
- 
- $(SUBDIRS):
--	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS)
-+	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" $(MAKECMDGOALS)
- 
- PAGES:
--	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies
-+	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" .dependencies
- 
- $(VERSIONSUFFIX): FORCE
- 	./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
---- live-0.2.0/css/Makefile
-+++ live-0.2.0/css/Makefile
-@@ -7,6 +7,7 @@
- CXXFLAGS += `tntnet-config --cxxflags`
- LDFLAGS  += `tntnet-config --libs`
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I..
- 
- ### The directory environment:
---- live-0.2.0/httpd/Makefile
-+++ live-0.2.0/httpd/Makefile
-@@ -7,6 +7,7 @@
- 
- ### Includes and Defines (add further entries here):
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.
- 
- ### The object files (add further files here):
---- live-0.2.0/javascript/Makefile
-+++ live-0.2.0/javascript/Makefile
-@@ -7,6 +7,7 @@
- CXXFLAGS += `tntnet-config --cxxflags`
- LDFLAGS  += `tntnet-config --libs`
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.. -I$(VDRDIR)/include
- 
- ### The directory environment:
---- live-0.2.0/pages/Makefile
-+++ live-0.2.0/pages/Makefile
-@@ -2,6 +2,7 @@
- AR       ?= ar
- ECPPC    ?= ecppc
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.. -I$(VDRDIR)/include
- 
- ### The directory environment:

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.2.0-05_do-not-use-the-direct-access-to-crecoding.patch

@@ -1,50 +0,0 @@
-From 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9 Mon Sep 17 00:00:00 2001
-From: Dieter Hametner
-Date: Sun, 25 Mar 2012 14:42:12 +0000
-Subject: Updated LIVE to latest changes in vdr 1.7.27
-
-- Do not use the direct access to cRecoding members any more.
----
-diff --git a/epg_events.cpp b/epg_events.cpp
-index a514769..cd4996e 100644
---- a/epg_events.cpp
-+++ b/epg_events.cpp
-@@ -182,12 +182,20 @@ namespace vdrlive
- 
- 	time_t EpgRecording::GetStartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	time_t EpgRecording::GetEndTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	const string EpgRecording::Name() const
-diff --git a/recman.cpp b/recman.cpp
-index fb315d2..6a2fc00 100644
---- a/recman.cpp
-+++ b/recman.cpp
-@@ -383,7 +383,11 @@ namespace vdrlive {
- 
- 	time_t RecordingsItemRec::StartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording->start;
-+#else
-+		return m_recording->Start();
-+#endif
- 	}
- 
- 	long RecordingsItemRec::Duration() const
---
-cgit v0.9.0.2-40-g7c79

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch

@@ -1,40 +0,0 @@
-From c3ecf9fabb674bc154f5a08cdd62e74e2b5d0e36 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert
-Date: Sun, 03 Jun 2012 23:42:31 +0000
-Subject: Compile fix for >=vdr-1.7.28
-
----
-diff --git a/tasks.cpp b/tasks.cpp
-index 9f20190..2a2b8d5 100644
---- a/tasks.cpp
-+++ b/tasks.cpp
-@@ -60,9 +60,15 @@ void PlayRecordingTask::Action()
- 
- 	const char *current = NowReplaying();
- 	if (!current || (0 != strcmp(current, recording->FileName()))) {
-+#if VDRVERSNUM >= 10728
-+		cReplayControl::SetRecording( 0 );
-+		cControl::Shutdown();
-+		cReplayControl::SetRecording( recording->FileName() );
-+#else
- 		cReplayControl::SetRecording( 0, 0 );
- 		cControl::Shutdown();
- 		cReplayControl::SetRecording( recording->FileName(), recording->Title() );
-+#endif
- 		cControl::Launch( new cReplayControl );
- 		cControl::Attach();
- 	}
-@@ -122,7 +128,11 @@ void StopRecordingTask::Action()
- 		return;
- 	}
- 
-+#if VDRVERSNUM >= 10728
-+	cReplayControl::SetRecording( 0 );
-+#else
- 	cReplayControl::SetRecording( 0, 0 );
-+#endif
- 	cControl::Shutdown();
- }
- 
---
-cgit v0.9.0.2-40-g7c79

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="cd93752"
+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-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch

@@ -0,0 +1,77 @@
+diff --git a/Makefile b/Makefile
+index ebe9d76..ef2d2e5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,11 @@ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.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
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -34,33 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+ 
+ ### 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
+-
+-# backward compatibility with VDR version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+-
+-VDRSRC = $(VDRDIR)
+-ifeq ($(strip $(VDRSRC)),)
+-VDRSRC := ../../..
+-endif
+-LIBDIR = $(VDRSRC)/PLUGINS/lib
+-
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+--include $(VDRSRC)/Make.global
+--include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-endif
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -73,9 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -145,6 +110,7 @@ $(DEPFILE): Makefile
+ 
+ $(SOFILE): $(OBJS) $(FFDECSA)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libdvbapi-dvbsddevice.so: device-sd.o
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $< -o $@

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

@@ -24,6 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-streamdev"
-PKG_VERSION="f58086a"
+PKG_VERSION="329129d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 90f3261..d80e15d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
+ 
+ ### 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)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+diff --git a/client/Makefile b/client/Makefile
+index ea9dc45..6fac485 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -72,6 +72,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+diff --git a/server/Makefile b/server/Makefile
+index 37cd4bb..8d2f49f 100644
+--- a/server/Makefile
++++ b/server/Makefile
+@@ -78,6 +78,7 @@ install-i18n: $(I18Nmsgs)
+ $(SOFILE): $(SERVEROBJS) $(COMMONOBJS) \
+ 	../tools/sockettools.a ../remux/remux.a ../libdvbmpeg/libdvbmpegtools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index d80e15d..ed2e168 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ INCLUDES += -I$(VDRDIR)/include -I..
+ export INCLUDES
+ 
+-DEFINES += -D_GNU_SOURCE
++DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifdef DEBUG
+ DEFINES += -DDEBUG

packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-f58086a-makefile.patch

@@ -1,19 +0,0 @@
-commit 949a46ec2ea06d97a7fcd47adc33153215399ac5
-Author: Stefan Saraev <[email protected]>
-Date:   Sun Mar 4 16:39:58 2012 +0200
-
-    vdr-streamdev: adjust makefile for openelec
-
-diff --git a/Makefile b/Makefile
-index b375844..231041f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -21,8 +21,6 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
- TMPDIR = /tmp
- 
- ### The version number of VDR (taken from VDR's "config.h"):

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

@@ -24,6 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
   make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
 

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-vnsiserver/patches/e3cd383/vdr-plugin-vnsiserver-02_makefile-largefile.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 92fc90d..4196724 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)
+ 
+-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

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

@@ -23,6 +23,11 @@
 . config/options $1
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xmltv2vdr"
-PKG_VERSION="8be374e781e734b44edbd6bc03cfdc1694f6617e"
+PKG_VERSION="30903cc0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
 PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt"
-PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca"
+PKG_DEPENDS="vdr curl libxml2"
+PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-xmltv2vdr"

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

@@ -19,7 +19,10 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="c43033c"
+PKG_VERSION="33afe59"
+if [ "$XBMC" = "master" ]; then
+  PKG_VERSION="6249892"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch

@@ -0,0 +1,79 @@
+diff --git a/Makefile b/Makefile
+index 06a49a2..ab037bd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,45 +16,46 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
+ ### 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)
+-CFGDIR  = $(call PKGCFG,configdir)/plugins/$(PLUGIN)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++OPTLEVEL ?= 2
++CXXFLAGS = -O$(OPTLEVEL) -g -Wall -Woverloaded-virtual -fPIC -DPIC
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++#DVBDIR = ../../../../DVB
++#VDRDIR = ../../..
++#LIBDIR = ../../lib
++#TMPDIR = /tmp
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+--include $(PLGCFG)
++-include $(VDRDIR)/Make.config
++-include $(VDRDIR)/Make.global
+ 
+ ### The name of the distribution archive:
+ 
+ ARCHIVE = $(PLUGIN)-$(VERSION)
+ PACKAGE = vdr-$(ARCHIVE)
+ 
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++
+ ### The name of the shared object file:
+ 
+ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src
++INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR) -I./src -I.
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+ endif
+ 
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DXVDR_VERSION='"$(VERSION)"'
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DXVDR_VERSION='"$(VERSION)"'
+ 
+ ### The object files (add further files here):
+ 
+@@ -103,7 +104,7 @@ all: $(SOFILE) i18n
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
++	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ 
+ -include $(DEPFILE)
+ 
+@@ -137,6 +138,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-dynamite.patch

@@ -1,282 +0,0 @@
-diff -r 442eee2f550d device-hd.c
---- a/device-hd.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device-hd.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -50,12 +50,18 @@
- {
-   if(!initial) cCondWait::SleepMs(150);
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_DESCR,ca_descr)>=0;
- }
- 
- bool cScDvbHdFfDevice::SetCaPid(ca_pid_t *ca_pid)
- {
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_PID,ca_pid)>=0;
- }
- 
-diff -r 442eee2f550d device-sd.c
---- a/device-sd.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device-sd.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -59,12 +59,18 @@
- bool cScDvbSdFfDevice::SetCaDescr(ca_descr_t *ca_descr, bool initial)
- {
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_DESCR,ca_descr)>=0;
- }
- 
- bool cScDvbSdFfDevice::SetCaPid(ca_pid_t *ca_pid)
- {
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_PID,ca_pid)>=0;
- }
- 
-@@ -88,6 +94,9 @@
- 
- void cScDvbSdFfDevice::DumpAV(void)
- {
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return;
-+// END vdr-plugin-dynamite
-   if(LOG(L_CORE_AV7110)) {
- #define CODEBASE (0x2e000404+0x1ce00)
-     cMutexLock lock(&cafdMutex);
-diff -r 442eee2f550d device-tmpl.c
---- a/device-tmpl.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device-tmpl.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -62,6 +62,14 @@
- #else
-   cCam *Cam(void) { return cam; }
- #endif //!SASC
-+// BEGIN vdr-plugin-dynamite
-+private:
-+  bool lateInit;
-+public:
-+#ifdef __DYNAMIC_DEVICE_PROBE
-+  virtual bool SetIdleDevice(bool Idle, bool TestOnly);
-+#endif
-+// END vdr-plugin-dynamite
-   };
- 
- SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int cafd)
-@@ -75,6 +83,9 @@
- :DVBDEVICE(Adapter)
- #endif //APIVERSNUM >= 10711
- {
-+// BEGIN vdr-plugin-dynamite
-+  lateInit = false;
-+// END vdr-plugin-dynamite
- #ifndef SASC
-   tsBuffer=0; hwciadapter=0;
- #endif
-@@ -88,10 +99,18 @@
- #ifdef SASC
-   cam=new cCam(this,Adapter,0,devId,devplugin,softcsa,fullts);
- #endif // !SASC
-+// BEGIN vdr-plugin-dynamite
-+  cScDevices::AddScDevice(this);
-+  if (cScDevices::AutoLateInit())
-+     LateInit();
-+// END vdr-plugin-dynamite
- }
- 
- SCDEVICE::~SCDEVICE()
- {
-+// BEGIN vdr-plugin-dynamite
-+  cScDevices::DelScDevice(this);
-+// END vdr-plugin-dynamite
- #ifndef SASC
-   DetachAllReceivers();
-   Cancel(3);
-@@ -139,6 +158,9 @@
- 
- void SCDEVICE::LateInit(void)
- {
-+  if (lateInit)
-+     return;
-+  lateInit = true;
-   int n=CardIndex();
-   if(DeviceNumber()!=n)
-     PRINTF(L_GEN_ERROR,"CardIndex - DeviceNumber mismatch! Put SC plugin first on VDR commandline!");
-@@ -155,8 +177,17 @@
-     if(fullts) PRINTF(L_GEN_INFO,"Enabling hybrid full-ts mode on card %s",devId);
-     else PRINTF(L_GEN_INFO,"Using software decryption on card %s",devId);
-     }
--  if(fd_ca2>=0) hwciadapter=cDvbCiAdapter::CreateCiAdapter(this,fd_ca2);
--  cam=new cCam(this,DVB_DEV_SPEC,devId,devplugin,softcsa,fullts);
-+// BEGIN vdr-plugin-dynamite
-+#ifdef __DYNAMIC_DEVICE_PROBE
-+  cDevice *cidev = parentDevice ? parentDevice : this;
-+#else
-+  cDevice *cidev = this;
-+#endif
-+  if(fd_ca2>=0) hwciadapter=cDvbCiAdapter::CreateCiAdapter(cidev,fd_ca2);
-+  if (cidev != this)
-+     fd_ca2 = -1; // will be closed by patched cDvbCiAdapter
-+  cam=new cCam(cidev,DVB_DEV_SPEC,devId,devplugin,softcsa,fullts);
-+// END vdr-plugin-dynamite
- }
- 
- bool SCDEVICE::HasCi(void)
-@@ -225,6 +256,36 @@
-   return false;
- }
- 
-+// BEGIN vdr-plugin-dynamite
-+#ifdef __DYNAMIC_DEVICE_PROBE
-+bool SCDEVICE::SetIdleDevice(bool Idle, bool TestOnly)
-+{
-+  if (TestOnly) {
-+     if (hwciadapter)
-+        return hwciadapter->SetIdle(Idle, true);
-+     return DVBDEVICE::SetIdleDevice(Idle, true);
-+     }
-+  if (hwciadapter && !hwciadapter->SetIdle(Idle, false))
-+     return false;
-+  if (!DVBDEVICE::SetIdleDevice(Idle, false)) {
-+     if (hwciadapter)
-+        hwciadapter->SetIdle(!Idle, false);
-+     return false;
-+     }
-+  if (Idle) {
-+     if (fd_ca >= 0)
-+        close(fd_ca);
-+     fd_ca = -1;
-+     }
-+  else {
-+     if (fd_ca < 0)
-+        fd_ca = cScDevices::DvbOpen(DEV_DVB_CA,adapter,frontend,O_RDWR);
-+     }
-+  return true;
-+}
-+#endif
-+// END vdr-plugin-dynamite
-+
- #endif // !SASC
- 
- #undef SCDEVICE
-diff -r 442eee2f550d device.c
---- a/device.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -285,6 +285,58 @@
- 
- int cScDevices::budget=0;
- 
-+// BEGIN vdr-plugin-dynamite
-+// dynamite fills the vdr::cDevice::device array with vdr::plugin::dynamite::cDynamicDevice
-+// we have to maintain our own list of sc-devices
-+int cScDevices::numScDevices = 0;
-+cDevice *cScDevices::scdevice[MAXDEVICES] = { NULL };
-+bool cScDevices::autoLateInit = false;
-+
-+int cScDevices::NumScDevices(void)
-+{
-+  return numScDevices;
-+}
-+
-+cDevice *cScDevices::GetScDevice(int CardIndex)
-+{
-+  for (int n = 0; n < numScDevices; n++) {
-+      if (scdevice[n] && (scdevice[n]->CardIndex() == CardIndex))
-+         return scdevice[n];
-+      }
-+  return NULL;
-+}
-+
-+void cScDevices::AddScDevice(cDevice *Device)
-+{
-+  if (Device == NULL)
-+     return;
-+  int i = 0;
-+  while ((i < numScDevices) && (i < MAXDEVICES) && (scdevice[i] != Device))
-+        i++;
-+  if (i < MAXDEVICES) {
-+     scdevice[i] = Device;
-+     if (i == numScDevices)
-+        numScDevices++;
-+     }
-+  else
-+     esyslog("too many sc-devices!");
-+}
-+
-+void cScDevices::DelScDevice(cDevice *Device)
-+{
-+  if (Device == NULL)
-+     return;
-+  int i = 0;
-+  while ((i < numScDevices) && (i < MAXDEVICES)) {
-+        if (scdevice[i] == Device) {
-+           scdevice[i] = NULL;
-+           break;
-+           }
-+        i++;
-+        }
-+}
-+// END vdr-plugin-dynamite
-+
- void cScDevices::DvbName(const char *Name, int a, int f, char *buffer, int len)
- {
-   snprintf(buffer,len,"%s%d/%s%d",DEV_DVB_ADAPTER,a,Name,f);
-@@ -393,17 +445,22 @@
- {
-   if(ScSetup.ForceTransfer)
-     SetTransferModeForDolbyDigital(2);
--  for(int n=cDevice::NumDevices(); --n>=0;) {
--    cDevice *dev=cDevice::GetDevice(n);
-+// BEGIN vdr-plugin-dynamite
-+  for(int n=NumScDevices(); --n>=0;) {
-+    cDevice *dev=GetScDevice(n);
-     for(cScDevicePlugin *dp=devplugins.First(); dp; dp=devplugins.Next(dp))
-       if(dp->LateInit(dev)) break;
-     }
-+  autoLateInit = true;
-+// END vdr-plugin-dynamite
- }
- 
- void cScDevices::Shutdown(void)
- {
--  for(int n=cDevice::NumDevices(); --n>=0;) {
--    cDevice *dev=cDevice::GetDevice(n);
-+// BEGIN vdr-plugin-dynamite
-+  for(int n=NumScDevices(); --n>=0;) {
-+    cDevice *dev=GetScDevice(n);
-+// END vdr-plugin-dynamite
-     for(cScDevicePlugin *dp=devplugins.First(); dp; dp=devplugins.Next(dp))
-       if(dp->EarlyShutdown(dev)) break;
-     }
-diff -r 442eee2f550d device.h
---- a/device.h	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device.h	Thu Oct 13 00:15:52 2011 +0200
-@@ -84,6 +84,21 @@
-   static bool ForceBudget(int n);
-   static void DvbName(const char *Name, int a, int f, char *buffer, int len);
-   static int DvbOpen(const char *Name, int a, int f, int Mode, bool ReportError=false);
-+
-+// BEGIN vdr-plugin-dynamite
-+// dynamite fills the vdr::cDevice::device array with vdr::plugin::dynamite::cDynamicDevice
-+// we have to maintain our own list of sc-devices
-+private:
-+  static int numScDevices;
-+  static cDevice *scdevice[MAXDEVICES];
-+  static bool autoLateInit;
-+public:
-+  static int NumScDevices(void);
-+  static cDevice *GetScDevice(int CardIndex);
-+  static void AddScDevice(cDevice *Device);
-+  static void DelScDevice(cDevice *Device);
-+  static bool AutoLateInit() { return autoLateInit; };
-+// END vdr-plugin-dynamite
-   };
- 
- // ----------------------------------------------------------------

packages/3rdparty/multimedia/vdr/build

@@ -29,20 +29,17 @@ cd $PKG_BUILD
 
 cat > Make.config <<EOF
 PLUGINLIBDIR = /usr/lib/vdr
+PREFIX = /usr
 VIDEODIR = /storage/videos
 CONFDIR = /storage/.config/vdr
 LOCDIR = /usr/share/locale
-LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
+#LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
 
 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
+make install-plugins DESTDIR=$ROOT/$PKG_BUILD/.install

packages/3rdparty/multimedia/vdr/meta

@@ -20,14 +20,14 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="1.7.33"
+PKG_VERSION="2.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="fontconfig freetype libcap"
-PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2"
+PKG_URL="ftp://ftp.tvdr.de/vdr/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="fontconfig freetype"
+PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2 ncurses"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/3rdparty/multimedia/vdr/patches/vdr-1.7.33-10_hannels.conf.terr-fix.patch

@@ -1,16 +0,0 @@
-Description: Removes Ch 14 fom example channels.conf.terr, because the entry is
- invalid (reported as Ubuntu Bug #45721)
-Author: Thomas Schmidt <[email protected]>
-
-Index: vdr/channels.conf.terr
-===================================================================
---- vdr.orig/channels.conf.terr	2011-12-10 22:22:04.000000000 +0100
-+++ vdr/channels.conf.terr	2011-12-11 01:49:01.000000000 +0100
-@@ -9,7 +9,6 @@
- bid-up.tv (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6273:6274:0:0:14272:0:0:0
- CBBC (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4671:0:0:0
- Cbeebies (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16960:0:0:0
--Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841:2843:0:0:8800:0:0
- Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
- Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
- Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0

packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch

@@ -0,0 +1,133 @@
+Description: This patch is needed for the rotor plugin.
+Author: Thomas Bergwinkl <[email protected]>
+Origin: extracted from the rotor plugin 0.1.4-vdr1.5
+
+Index: b/device.h
+===================================================================
+--- a/device.h
++++ b/device.h
+@@ -24,6 +24,8 @@
+ #include "spu.h"
+ #include "thread.h"
+ #include "tools.h"
++#include <asm/types.h>
++#include <linux/dvb/frontend.h>
+ 
+ #define MAXDEVICES         16 // the maximum number of devices in the system
+ #define MAXPIDHANDLES      64 // the maximum number of different PIDs per device
+@@ -337,6 +339,7 @@
+   virtual bool HasProgramme(void) const;
+          ///< Returns true if the device is currently showing any programme to
+          ///< the user, either through replaying or live.
++  virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd) {return false;}
+ 
+ // PID handle facilities
+ 
+Index: b/dvbdevice.c
+===================================================================
+--- a/dvbdevice.c
++++ b/dvbdevice.c
+@@ -283,6 +283,7 @@
+ private:
+   static cMutex bondMutex;
+   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
++  bool SendDiseqc;
+   int frontendType;
+   const cDvbDevice *device;
+   int fd_frontend;
+@@ -299,6 +300,7 @@
+   cMutex mutex;
+   cCondVar locked;
+   cCondVar newSet;
++  dvb_diseqc_master_cmd diseqc_cmd;
+   cDvbTuner *bondedTuner;
+   bool bondedMaster;
+   bool SetFrontendType(const cChannel *Channel);
+@@ -325,12 +327,16 @@
+   bool Locked(int TimeoutMs = 0);
+   int GetSignalStrength(void) const;
+   int GetSignalQuality(void) const;
++  bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
++private:
++  int GetCurrentDeliverySystem(void);
+   };
+ 
+ cMutex cDvbTuner::bondMutex;
+ 
+ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
+ {
++  SendDiseqc = false;
+   frontendType = SYS_UNDEFINED;
+   device = Device;
+   fd_frontend = Fd_Frontend;
+@@ -653,6 +659,35 @@
+   return -1;
+ }
+ 
++int cDvbTuner::GetCurrentDeliverySystem()
++{
++  dtv_property Frontend[1];
++  memset(&Frontend, 0, sizeof(Frontend));
++  dtv_properties CmdSeq;
++  memset(&CmdSeq, 0, sizeof(CmdSeq));
++  CmdSeq.props = Frontend;
++  Frontend[0].cmd = DTV_DELIVERY_SYSTEM;
++  Frontend[0].u.data = 0;
++  if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) < 0) {
++     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
++     return SYS_UNDEFINED;
++     }
++  return Frontend[0].u.data;
++}
++
++bool cDvbTuner::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
++{
++  cMutexLock MutexLock(&mutex);
++  int frontendType = GetCurrentDeliverySystem();
++  if ((frontendType != SYS_DVBS && frontendType != SYS_DVBS2) || SendDiseqc)
++    return false;
++  diseqc_cmd=cmd;
++  SendDiseqc=true;
++  newSet.Broadcast();
++  return true;
++}
++
++
+ static unsigned int FrequencyToHz(unsigned int f)
+ {
+   while (f && f < 1000000)
+@@ -874,6 +909,10 @@
+         if (GetFrontendStatus(NewStatus))
+            Status = NewStatus;
+         cMutexLock MutexLock(&mutex);
++        if (SendDiseqc) {
++           CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &diseqc_cmd));
++           SendDiseqc=false;
++           }
+         int WaitTime = 1000;
+         switch (tunerStatus) {
+           case tsIdle:
+@@ -1571,6 +1610,11 @@
+   return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
+ }
+ 
++bool cDvbDevice::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
++{
++  return dvbTuner->SendDiseqcCmd(cmd);
++}
++
+ void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
+ {
+   setTransferModeForDolbyDigital = Mode;
+Index: b/dvbdevice.h
+===================================================================
+--- a/dvbdevice.h
++++ b/dvbdevice.h
+@@ -196,6 +196,7 @@
+   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+ public:
+   virtual bool HasLock(int TimeoutMs = 0) const;
++  virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
+ 
+ // PID handle facilities
+ 

packages/3rdparty/multimedia/vdr/patches/vdr-98-ncurses.patch

@@ -0,0 +1,26 @@
+diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
+index fa0ce41..5c71bcf 100644
+--- a/PLUGINS/src/skincurses/Makefile
++++ b/PLUGINS/src/skincurses/Makefile
+@@ -102,7 +102,7 @@ install-i18n: $(I18Nmsgs)
+ ### Targets:
+ 
+ $(SOFILE): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncurses -o $@
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
+index 8a4da96..4c2eeed 100644
+--- a/PLUGINS/src/skincurses/skincurses.c
++++ b/PLUGINS/src/skincurses/skincurses.c
+@@ -6,7 +6,7 @@
+  * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
+  */
+ 
+-#include <ncurses.h>
++#include <ncurses/ncurses.h>
+ #include <vdr/osd.h>
+ #include <vdr/plugin.h>
+ #include <vdr/skins.h>

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"