config/version: set version to 4.0.4

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

.gitignore

@@ -26,3 +26,5 @@ mkpkg-temp
 # backup files
 *.orig
 
+# crap
+.DS_Store

.gitmodules

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

CHANGELOG

@@ -1,20 +1,13 @@
-OpenELEC (Version 2.1)
+OpenELEC CHANGELOG
+==================
 
-Changelog OpenELEC-2.0 to OpenELEC-2.1
+To view recent changes/commits to the project (master branch) please visit:
 
-Added packages:
-  - add package 'ppp'
-  - add package 'pptp'
+https://github.com/OpenELEC/OpenELEC.tv/commits/master
 
-Package updates:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
+To compare commits between versions use a formatted URL like:
 
-Added functions:
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
+https://github.com/OpenELEC/OpenELEC.tv/compare/3.2.3...3.2.4
 
-Changed functions:
-
-Removed functions:
+If you have questions on differences between releases please ask them in the
+OpenELEC website forums or IRC support channel.

CONTRIBUTING.md

@@ -0,0 +1,105 @@
+### 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.
+
+### Reporting build failures
+
+As buildsystem / core packages (toolchain) / random libraries change from time to time, it is required
+that you always do a clean build (make clean) before reporting build failures. Also make sure that you
+have a clean, unmodified git clone, we can't fix bugs caused by you failed to merge / rebase on
+your own fork.
+
+### 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 git@github.com:<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

@@ -1,6 +1,6 @@
 BUILD_DIRS=build.*
 
-all: system
+all: release
 
 system:
 	./scripts/image
@@ -8,6 +8,15 @@ system:
 release:
 	./scripts/image release
 
+image:
+	./scripts/image mkimage
+
+image-efi:
+	./scripts/image mkimage efi
+
+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,8 @@
 ncurses-5.8/5.9:
   - segfaults in nano and dialog -> using ncurses-5.7
+
+irserver:
+  - rework irserver/init.d for systemd
+
+settings addon:
+  - remove ps3 sleep? should be fixed in bluez 5.13/5.14

config/addon/addon.xml

@@ -2,10 +2,10 @@
 <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"/>
+    <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
   <extension point="@PKG_ADDON_TYPE@"

config/arch.arm

@@ -27,28 +27,31 @@
     arm1176jzf-s)
       TARGET_SUBARCH=armv6zk
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
+      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="no"
       ;;
-    cortex-a8)
+    cortex-a7|cortex-a15)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
+      # It's not currently possible to specify the exact architecture variant (-mcpu)
+      # that A7/A15 supports in the command line so use -mtune here.
+      # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57907
+      TARGET_EXTRA_FLAGS="-mtune=$TARGET_CPU"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
-    cortex-a9)
+    cortex-a5|cortex-a8|cortex-a9)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
+      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
   esac
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mcpu=$TARGET_CPU -mabi=aapcs-linux $TARGET_EXTRA_FLAGS"
+  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated $TARGET_EXTRA_FLAGS"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
   TARGET_LDFLAGS="-march=$TARGET_SUBARCH -mtune=$TARGET_CPU"
   GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"

config/functions

@@ -56,7 +56,29 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  ls -d $ROOT/$BUILD/linux-[0-9]*
+  . $ROOT/packages/linux/package.mk
+  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+}
+
+kernel_version() {
+  . $ROOT/packages/linux/package.mk
+  echo ${PKG_VERSION}
+}
+
+# get kernel module dir
+get_module_dir() {
+  basename $(ls -d $(get_build_dir linux)/.install_pkg/lib/modules/*)
+}
+
+# get package's build dir
+get_build_dir() {
+  if [ ! -z $1 ] ; then
+    local _PKG_DIR=$(find $ROOT/packages -name $1)
+    if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then
+      . $_PKG_DIR/package.mk
+    fi
+    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  fi
 }
 
 tolower(){
@@ -77,17 +99,6 @@ require_cxx() {
   fi
 }
 
-xorg_drv_configure_prepend() {
-  incdir=${SYSROOT_PREFIX}/usr/include/xorg
-  for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
-    incfile="$incdir/$f"
-    if [ -f "$incfile" ]; then
-      p=`echo "$incfile" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
-      eval "export ac_cv_file_$p=yes"
-    fi
-  done
-}
-
 add_user() {
   # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell"
   mkdir -p ${INSTALL}/etc
@@ -169,6 +180,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 +202,22 @@ fix_module_depends() {
   rm new.modinfo*
 }
 
+# Usage: enable_service <unit> [target]
+enable_service () {
+  local unit="$1"
+  local unit_dir="/usr/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 +265,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 +279,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 +305,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 +348,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
@@ -332,16 +363,13 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
-  config_message="$config_message\n - Default Hostname:\t\t\t $HOSTNAME"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
 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 - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems

config/graphic

@@ -1,4 +1,4 @@
-if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+if [ "$DISPLAYSERVER" = "x11" ]; then
   SDL_SUPPORT="yes"
 else
   SDL_SUPPORT="no"
@@ -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,82 +36,75 @@ 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"
-#      LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
+      LIBVA="$LIBVA libva-driver-intel"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
+      LIBVA="$LIBVA libva-driver-intel"
     fi
 
     if [ "$drv" = "nouveau" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
+      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
+      DRI_DRIVERS="$DRI_DRIVERS"
+      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
+      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
+      COMPOSITE_SUPPORT="yes"
 #      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      XINERAMA_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia-legacy" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      XINERAMA_SUPPORT="yes"
     fi
 
     if [ "$drv" = "virtualbox" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,swrast"
       XORG_DRIVERS="$XORG_DRIVERS virtualbox"
-      XINERAMA_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "omapfb" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-      XORG_DRIVERS="$XORG_DRIVERS ompafb"
-#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       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" = "radeonsi" ]; then
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,swrast"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
       XORG_DRIVERS="$XORG_DRIVERS vmware"
-      XINERAMA_SUPPORT="yes"
 #      LLVM_SUPPORT="yes"
     fi
 

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 (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+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":    160,
+      "want_maximised":            false,
+      "uncompressed_tarball_size": 120,
+      "mkfs_options":              ""
+    },
+    {
+      "label":                     "Storage",
+      "filesystem_type":           "ext4",
+      "partition_size_nominal":    864,
+      "want_maximised":            true,
+      "uncompressed_tarball_size": 10,
+      "mkfs_options":              ""
+    }
+  ]
+}

config/optimize

@@ -1,32 +1,20 @@
-if [ "$OPTIMIZATIONS" = fast ];then
-  GCC_OPTIM="-Ofast"
-  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-  LD_OPTIM="-Wl,--as-needed"
-fi
-
-if [ "$OPTIMIZATIONS" = speed ];then
-  GCC_OPTIM="$GCC_OPTIM -O3"
-  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-  GCC_OPTIM="$GCC_OPTIM -ffast-math"
-  LD_OPTIM="-Wl,--as-needed"
-fi
-
 if [ "$OPTIMIZATIONS" = normal ];then
-  GCC_OPTIM="$GCC_OPTIM -O2"
+  GCC_OPTIM="-O2"
   LD_OPTIM=""
 fi
 
 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="$GCC_OPTIM -Os"
-  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  GCC_OPTIM="-Os -fexcess-precision=fast"
   LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$LTO_SUPPORT" = yes ];then
-  GCC_OPTIM="$GCC_OPTIM -flto"
-  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
-  LD_OPTIM="$LD_OPTIM -flto"
+  GCC_OPTIM_LTO="-flto -ffat-lto-objects"
+  LD_OPTIM_LTO="-fuse-linker-plugin -flto"
+fi
+
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM_GOLD="-fuse-ld=gold"
 fi
 
 if [ "$DEBUG" = yes ]; then
@@ -40,9 +28,9 @@ else
 fi
 
 TARGET_CPPFLAGS=
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
@@ -52,6 +40,11 @@ HOST_CXXFLAGS="$HOST_CFLAGS"
 HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
 HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
 
+# work around Ubuntu default C*FLAGS 
+# see https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-Wformat_-Wformat-security
+HOST_CFLAGS="$HOST_CFLAGS -Wno-format-security"
+HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security" 
+
 # add distro specific library dirs
   # ubuntu/debian specific "multiarch support"
     FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")

config/options

@@ -19,6 +19,7 @@ fi
 
 ROOT=`pwd`
 PROJECT_DIR="$ROOT/projects"
+LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
 
 # include versioning
   . config/version
@@ -31,10 +32,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

@@ -1,5 +1,7 @@
 set -e
 
+. config/functions
+
 # setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
@@ -32,6 +34,11 @@ TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 
 FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 
+if [ -z "$INSTALL" ]; then
+  INSTALL=$BUILD/image/system
+fi
+INSTALL_INIT=$BUILD/image/initramfs/root-image
+
 . config/sources
 
 MAKE="$ROOT/$TOOLCHAIN/bin/make"
@@ -46,28 +53,48 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
-  PKG_DEPENDS=""
-  PKG_BUILD_DEPENDS=""
+  PKG_DEPENDS_TARGET=""
+  PKG_DEPENDS_HOST=""
+  PKG_DEPENDS_INIT=""
+  PKG_DEPENDS_BOOTSTRAP=""
   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 $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" ] ; 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
+  fi
 
-  [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
-  [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
+  if [ "$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
+
+  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -120,7 +147,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
@@ -128,7 +155,6 @@ if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOO
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH
-. config/functions
 
 check_path
 check_config
@@ -145,3 +171,29 @@ else
   exec 4>/dev/null
 fi
 BUILD_INDENT_SIZE=4
+
+# define colors
+  black="\e[0;30m"
+  boldblack="\e[1;30m"
+  red="\e[0;31m"
+  boldred="\e[1;31m"
+  green="\e[0;32m"
+  boldgreen="\e[1;32m"
+  yellow="\e[0;33m"
+  boldyellow="\e[1;33m"
+  blue="\e[0;34m"
+  boldblue="\e[1;34m"
+  magenta="\e[0;35m"
+  boldmagenta="\e[1;35m"
+  cyan="\e[0;36m"
+  boldcyan="\e[1;36m"
+  white="\e[0;37m"
+  boldwhite="\e[1;37m"
+  endcolor="\e[0m"
+
+# multilib? nah
+unset CONFIG_SITE
+
+# meh suse
+unset PYTHONSTARTUP
+unset PYTHONPATH

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="4.0.4"
 
 # OS_VERSION: OS Version
-  OS_VERSION="3.0"
+  OS_VERSION="4.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="3.0"
+  ADDON_VERSION="4.1"
 

packages/3rdparty/download/CouchPotato/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="CouchPotato"
-PKG_VERSION="806bed6"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/RuudBurger/CouchPotato"
-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="CouchPotato: automated movie downloading."
-PKG_LONGDESC="CouchPotato: automated movie downloading."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

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 (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="CouchPotatoServer"
-PKG_VERSION="a49a00a"
-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-a49a00a-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 (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="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 (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="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 (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="SickBeard"
-PKG_VERSION="4e57625"
-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-4e57625-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-4e57625-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 826cf0a..02f14af 100755
---- a/data/interfaces/default/config_notifications.tmpl
-+++ b/data/interfaces/default/config_notifications.tmpl
-@@ -547,45 +547,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 20f0dfc..b0bf6a6 100644
---- a/sickbeard/webserve.py
-+++ b/sickbeard/webserve.py
-@@ -609,7 +609,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 (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-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 (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="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/graphics/libpng12/build

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

packages/3rdparty/graphics/libpng12/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libpng"
-PKG_VERSION="1.2.50"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.libpng.org/"
-PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="zlib"
-PKG_BUILD_DEPENDS="toolchain zlib"
-PKG_PRIORITY="optional"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library - old 1.2 version"
-PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits. Old 1.2 version."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/graphics/libpng12/unpack

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-TGZ_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
-
-  tar xJf $SOURCES/$1/$TGZ_PKG -C $BUILD >/dev/null 2>&1

packages/3rdparty/lib/ccid/build

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

packages/3rdparty/lib/ccid/meta

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

packages/3rdparty/lib/cxxtools/build

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

packages/3rdparty/lib/cxxtools/install

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

packages/3rdparty/lib/cxxtools/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="cxxtools"
-PKG_VERSION="2.1.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL-2"
-PKG_SITE="http://www.tntnet.org/cxxtools.html"
-PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="python/web"
-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"

packages/3rdparty/lib/cxxtools/package.mk

@@ -0,0 +1,53 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="cxxtools"
+PKG_VERSION="2.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL-2"
+PKG_SITE="http://www.tntnet.org/cxxtools.html"
+PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST=""
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+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="no"
+
+PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-unittest"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest"
+
+pre_configure_target() {
+  CFLAGS="$CFLAGS -fPIC"
+  CXXFLAGS="$CXXFLAGS -fPIC"
+  LDFLAGS="$LDFLAGS -fPIC"
+}
+
+
+post_makeinstall_host() {
+  rm -rf $TOOLCHAIN/bin/cxxtools-config
+}
+
+post_makeinstall_target() {
+  rm -rf $SYSROOT_PREFIX/usr/bin/cxxtools-config
+  rm -rf $INSTALL/usr/bin
+}

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/cxxtools/patches/cxxtools-crosscompile.patch

@@ -0,0 +1,28 @@
+diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure
+--- cxxtools-2.2/configure	2013-04-21 21:13:11.000000000 +0200
++++ cxxtools-2.2.patch/configure	2014-01-03 20:34:53.404660480 +0100
+@@ -17316,8 +17316,8 @@
+ 
+ 
+ 
+-CXXTOOLS_CXXFLAGS='-I${includedir}'
+-CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools'
++CXXTOOLS_CXXFLAGS=''
++CXXTOOLS_LDFLAGS='-lcxxtools'
+ 
+ 
+ 
+diff -Naur cxxtools-2.2/configure.in cxxtools-2.2.patch/configure.in
+--- cxxtools-2.2/configure.in	2013-04-20 23:31:50.000000000 +0200
++++ cxxtools-2.2.patch/configure.in	2014-01-03 20:26:32.064005192 +0100
+@@ -106,8 +106,8 @@
+ 
+ AC_PROG_LIBTOOL
+ 
+-CXXTOOLS_CXXFLAGS='-I${includedir}'
+-CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools'
++CXXTOOLS_CXXFLAGS=''
++CXXTOOLS_LDFLAGS='-lcxxtools'
+ 
+ AC_SUBST(CXXTOOLS_CXXFLAGS)
+ AC_SUBST(CXXTOOLS_LDFLAGS)

packages/3rdparty/lib/libdvbcsa/package.mk

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libdvbcsa"
+PKG_VERSION="1.1.0"
+PKG_REV="1"
+PKG_ARCH="any"
+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_TARGET="toolchain"
+PKG_PRIORITY="optional"
+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"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSROOT_PREFIX"

packages/3rdparty/lib/libhdhomerun/build

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

packages/3rdparty/lib/libhdhomerun/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libhdhomerun"
-PKG_VERSION="20130117"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
-PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="driver"
-PKG_SHORTDESC="The library provides functionality to setup the HDHomeRun, change channels, setup PID filtering, get signal quality and so on."
-PKG_LONGDESC="The library provides functionality to setup the HDHomeRun, change channels, setup PID filtering, get signal quality and so on."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/lib/libhdhomerun/rename

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

packages/3rdparty/lib/libxslt/build

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

packages/3rdparty/lib/libxslt/meta

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

packages/3rdparty/lib/libzip/build

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

packages/3rdparty/lib/libzip/meta

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

packages/3rdparty/lib/libzip/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libzip"
+PKG_VERSION="0.11.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.nih.at/libzip/"
+PKG_URL="http://www.nih.at/libzip/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SHORTDESC="libzip"
+PKG_LONGDESC="libzip"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+  rm -rf $INSTALL/usr/lib
+}

packages/3rdparty/multimedia/rotorng/build

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

packages/3rdparty/multimedia/rotorng/meta

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

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/vdr-control/build

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-CFLAGS="$CFLAGS -fPIC"
-CXXFLAGS="$CXXFLAGS -fPIC"
-LDFLAGS="$LDFLAGS -fPIC"
-
-VDR_DIR=`basename $BUILD/vdr-[0-9]*`
-
-cd $PKG_BUILD
-  PWD=`pwd`
-  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

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

packages/3rdparty/multimedia/vdr-control/package.mk

@@ -0,0 +1,55 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-control"
+PKG_VERSION="0.0.2a"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://ricomp.de/vdr/"
+PKG_URL="http://ricomp.de/vdr/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_SOURCE_DIR="control-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr control plugin"
+PKG_LONGDESC="vdr control plugin"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+post_make_target() {
+  $STRIP libvdr-*.so*
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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-control/rename

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

packages/3rdparty/multimedia/vdr-dummydevice/package.mk

@@ -0,0 +1,55 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-dummydevice"
+PKG_VERSION="2.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
+PKG_URL="http://phivdr.dyndns.org/vdr/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_SOURCE_DIR="dummydevice-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr dummydevice plugin"
+PKG_LONGDESC="vdr dummydevice plugin"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+post_make_target() {
+  $STRIP libvdr-*.so*
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

@@ -0,0 +1,46 @@
+diff --git a/Makefile b/Makefile
+index dc959f1..5cb2315 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ 
+ ### 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:
+ 
+@@ -47,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -103,6 +96,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-dynamite/build

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-VDR_DIR=`basename $BUILD/vdr-[0-9]*`
-
-# dont build parallel
-  MAKEFLAGS=-j1
-
-cd $PKG_BUILD
-  make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
-

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

@@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="vdr-dynamite"
-PKG_VERSION="914af24"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://projects.vdr-developer.org/projects/plg-dynamite"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="vdr systemd"
-PKG_BUILD_DEPENDS="toolchain vdr systemd"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="vdr-dynamite turns the dvbdevices into hotpluggable devices. They can be dynamically attached and detached while vdr is running."
-PKG_LONGDESC="This plugin turns the dvbdevices into hotpluggable devices. They can be dynamically attached and detached while vdr is running."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

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

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

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

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

packages/3rdparty/multimedia/vdr-epgsearch/package.mk

@@ -0,0 +1,51 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-epgsearch"
+PKG_VERSION="29c174a"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-epgsearch"
+PKG_LONGDESC="vdr-epgsearch"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,19 @@
+commit e8bb2e8e0ef3602fc8cb252cee541bed5d45fc5c
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:19:10 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/uservars.h b/uservars.h
+index f098750..a0e047c 100644
+--- a/uservars.h
++++ b/uservars.h
+@@ -538,7 +538,7 @@ class cVideodirVar : public cInternalVar {
+     cVideodirVar() : cInternalVar("videodir") {}
+     string Evaluate(const cEvent*, bool escapeStrings = false)
+ 	{
+-	    return VideoDirectory;
++	    return cVideoDirectory::Name();
+ 	}
+ };
+ 

packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-03_don-t-build-unused-plugins.patch

@@ -0,0 +1,29 @@
+From 61c795e71df00f4d3c22d2be405ceb0eb0e0e49c Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Fri, 22 Nov 2013 21:45:56 +0200
+Subject: [PATCH] don't build unused plugins
+
+---
+ Makefile |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 118e379..5f15ebe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,9 +16,9 @@
+ ### edit one of these lines to '1', if you don't want the addon epgsearchonly, 
+ ### conflictcheckonly or quickepgsearch
+ 
+-WITHOUT_EPGSEARCHONLY=0
+-WITHOUT_CONFLICTCHECKONLY=0
+-WITHOUT_QUICKSEARCH=0
++WITHOUT_EPGSEARCHONLY=1
++WITHOUT_CONFLICTCHECKONLY=1
++WITHOUT_QUICKSEARCH=1
+ 
+ ### edit this to '0' if you don't want epgsearch to auto config itself
+ AUTOCONFIG=1
+-- 
+1.7.2.5
+

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

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

@@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="vdr-iptv"
-PKG_VERSION="0.5.2"
-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_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"
-PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-iptv/package.mk

@@ -0,0 +1,51 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-iptv"
+PKG_VERSION="2.1.2"
+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_SOURCE_DIR="iptv-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr curl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"
+PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

packages/3rdparty/multimedia/vdr-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,57 @@
+diff --git a/Makefile b/Makefile
+index 48c8b2c..d370f92 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,24 +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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-RESDIR = $(call PKGCFG,resdir)
+-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:
+ 
+@@ -65,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)"'
+ 
+@@ -139,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-iptv/rename

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

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

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-VDR_DIR=`basename $BUILD/vdr-[0-9]*`
-
-CFLAGS="$CFLAGS -fPIC"
-CXXFLAGS="$CXXFLAGS -fPIC"
-LDFLAGS="$LDFLAGS -fPIC"
-
-# dont build parallel
-  MAKEFLAGS=-j1
-
-cd $PKG_BUILD
-  PWD=`pwd`
-  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="vdr-live"
-PKG_VERSION="0.2.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_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"
-PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plugins trough a web interface"
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-live/package.mk

@@ -0,0 +1,56 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-live"
+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_SOURCE_DIR="live-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"
+PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plugins trough a web interface"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+}
+
+pre_make_target() {
+  # dont build parallel
+  MAKEFLAGS=-j1
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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 <lubos@dolezel.info>
-
---- 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 <timo@tiwe.de>
-##
-## 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 <tom@toms-cafe.de>
-##
-## 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-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,76 @@
+commit 0f8a281027f852ed5968361bcb7420ed242d0476
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:15:14 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index 80f145b..6da5285 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -79,7 +79,7 @@ for (deletions_type::const_iterator it = deletions.begin(); it != deletions.end(
+ deletions.clear();
+ 
+ int FreeMB, UsedMB;
+-int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
+ int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+ int Hours = Minutes / 60;
+ Minutes %= 60;
+diff --git a/recman.cpp b/recman.cpp
+index 6a2fc00..9ed88f0 100644
+--- a/recman.cpp
++++ b/recman.cpp
+@@ -112,7 +112,7 @@ namespace vdrlive {
+ 		if (found == string::npos)
+ 			return false;
+ 
+-		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
++		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
+ 
+ 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
+ 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
+diff --git a/tntconfig.cpp b/tntconfig.cpp
+index 3325776..161fdc4 100644
+--- a/tntconfig.cpp
++++ b/tntconfig.cpp
+@@ -279,7 +279,7 @@ namespace vdrlive {
+ 		// inserted by 'tadi' -- not verified, not counterchecked yet!
+ 		//app.mapUrl("^/vlc/(.+)", "static@tntnet")
+ 		//	.setPathInfo("/$1")
+-		//	.pushArg(string("DocumentRoot=") + VideoDirectory);
++		//	.pushArg(string("DocumentRoot=") + cVideoDirectory::Name());
+ 
+ 		// the following selects the theme specific 'theme.css' file
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+diff --git a/tools.cpp b/tools.cpp
+index c744d06..cb3529e 100644
+--- a/tools.cpp
++++ b/tools.cpp
+@@ -365,7 +365,7 @@ namespace vdrlive {
+ 			stat(source.c_str(), &st1);
+ 			stat(target.c_str(),&st2);
+ 			if (!copy && (st1.st_dev == st2.st_dev)) {
+-				if (!RenameVideoFile(source.c_str(), target.c_str())) {
++				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
+ 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
+ 					return false;
+ 				}
+@@ -461,7 +461,7 @@ namespace vdrlive {
+ 						size_t found = source.find_last_of(delim);
+ 						if (found != std::string::npos) {
+ 							source = source.substr(0, found);
+-							while (source != VideoDirectory) {
++							while (source != cVideoDirectory::Name()) {
+ 								found = source.find_last_of(delim);
+ 								if (found == std::string::npos)
+ 									break;
+@@ -478,7 +478,7 @@ namespace vdrlive {
+ 					size_t found = target.find_last_of(delim);
+ 					if (found != std::string::npos) {
+ 						target = target.substr(0, found);
+-						while (target != VideoDirectory) {
++						while (target != cVideoDirectory::Name()) {
+ 							found = target.find_last_of(delim);
+ 							if (found == std::string::npos)
+ 								break;

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

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