config/version: set version to 3.1.3

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

.gitignore

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

CHANGELOG

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

CONTRIBUTING.md

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

Makefile

@@ -1,6 +1,6 @@
 BUILD_DIRS=build.*
 
-all: release
+all: system
 
 system:
 	./scripts/image
@@ -8,15 +8,6 @@ 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
 

TODO

@@ -1,8 +1,2 @@
 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

@@ -5,7 +5,7 @@
        provider-name="@PROVIDER_NAME@">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="xbmc.python" version="2.0"/>
 @REQUIRES@
   </requires>
   <extension point="@PKG_ADDON_TYPE@"

config/arch.arm

@@ -27,31 +27,28 @@
     arm1176jzf-s)
       TARGET_SUBARCH=armv6zk
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="no"
       ;;
-    cortex-a7|cortex-a15)
+    cortex-a8)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      # 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_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
-    cortex-a5|cortex-a8|cortex-a9)
+    cortex-a9)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
   esac
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated $TARGET_EXTRA_FLAGS"
+  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mcpu=$TARGET_CPU -mabi=aapcs-linux $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,29 +56,7 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  . $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
+  ls -d $ROOT/$BUILD/linux-*
 }
 
 tolower(){
@@ -99,6 +77,17 @@ 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
@@ -202,22 +191,6 @@ 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
@@ -308,6 +281,7 @@ show_config() {
   config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
+  config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
 
   # Input device configuration
 
@@ -354,7 +328,7 @@ show_config() {
   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_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_CLIENT"
   config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
@@ -363,13 +337,15 @@ 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 - UDevil support:\t\t\t $UDEVIL"
+  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 - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems

config/graphic

@@ -1,4 +1,4 @@
-if [ "$DISPLAYSERVER" = "x11" ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
   SDL_SUPPORT="yes"
 else
   SDL_SUPPORT="no"
@@ -28,7 +28,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -36,75 +36,82 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS dove"
     fi
 
+    if [ "$drv" = "fglrx" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "fglrx-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
-      COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-driver-intel"
+#      LLVM_SUPPORT="yes"
     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 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/
+#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
       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

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

config/noobs/partition_setup.sh

@@ -1,69 +0,0 @@
-#!/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

@@ -1,20 +0,0 @@
-{
-  "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,20 +1,36 @@
+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="-O2"
+  GCC_OPTIM="$GCC_OPTIM -O2"
   LD_OPTIM=""
 fi
 
 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="-Os -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -Os"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
   LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$LTO_SUPPORT" = yes ];then
-  GCC_OPTIM_LTO="-flto -ffat-lto-objects"
-  LD_OPTIM_LTO="-fuse-linker-plugin -flto"
+  GCC_OPTIM="$GCC_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+  LD_OPTIM="$LD_OPTIM -flto"
 fi
 
 if [ "$GOLD_SUPPORT" = yes ];then
-  LD_OPTIM_GOLD="-fuse-ld=gold"
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
 fi
 
 if [ "$DEBUG" = yes ]; then
@@ -28,9 +44,9 @@ else
 fi
 
 TARGET_CPPFLAGS=
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
@@ -40,11 +56,6 @@ 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,7 +19,6 @@ 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

config/path

@@ -1,7 +1,5 @@
 set -e
 
-. config/functions
-
 # setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
@@ -34,11 +32,6 @@ 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"
@@ -53,10 +46,8 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
-  PKG_DEPENDS_TARGET=""
-  PKG_DEPENDS_HOST=""
-  PKG_DEPENDS_INIT=""
-  PKG_DEPENDS_BOOTSTRAP=""
+  PKG_DEPENDS=""
+  PKG_BUILD_DEPENDS=""
   PKG_PRIORITY="optional"
   PKG_SECTION=""
   PKG_SHORTDESC="$1 (autogenerated)"
@@ -65,14 +56,14 @@ SED="sed -i"
 
   if [ -n "$1" ]; then
     FOUND=0
-    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+    for DIR in `find $PACKAGES -type d -name $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
+      if [ -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then
         FOUND=$((FOUND+1))
         # found first. set $PKG_DIR
         PKG_DIR="$DIR"
@@ -86,15 +77,13 @@ SED="sed -i"
     done
   fi
 
-  if [ -r $PKG_DIR/package.mk ]; then
-    . $PKG_DIR/package.mk
-  fi
-
+  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
-  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  [ -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}`
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -147,7 +136,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:$ROOT/$TOOLCHAIN/sbin:$PATH"
+  export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
 fi
 
 if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
@@ -155,6 +144,7 @@ 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
@@ -171,29 +161,3 @@ 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="4.0.2"
+  OPENELEC_VERSION="3.1.3"
 
 # OS_VERSION: OS Version
-  OS_VERSION="4.0"
+  OS_VERSION="3.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="4.1"
+  ADDON_VERSION="3.1"
 

packages/3rdparty/graphics/libpng12/build

@@ -0,0 +1,34 @@
+#!/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

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

@@ -0,0 +1,27 @@
+#!/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/cxxtools/build

@@ -0,0 +1,60 @@
+#!/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 \
+            --disable-demos \
+            --disable-unittest
+
+make
+make install
+
+cd ..
+
+setup_toolchain target
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+mkdir -p .build-target && cd .build-target
+../configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-static \
+            --disable-shared \
+            --disable-demos \
+            --disable-unittest
+
+$MAKEINSTALL

packages/3rdparty/lib/cxxtools/meta

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

@@ -1,53 +0,0 @@
-################################################################################
-#      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.1.1-arm.patch

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

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

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

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

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

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

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

@@ -0,0 +1,27 @@
+#!/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

@@ -0,0 +1,35 @@
+################################################################################
+#      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="20130328"
+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

@@ -0,0 +1,26 @@
+#!/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

@@ -0,0 +1,44 @@
+#!/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 \
+             --sysconfdir=/etc \
+             --enable-static \
+             --disable-shared \
+             --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

@@ -0,0 +1,36 @@
+################################################################################
+#      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=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="textproc"
+PKG_SHORTDESC="libxslt"
+PKG_LONGDESC="libxslt"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/3rdparty/lib/libzip/build

@@ -0,0 +1,34 @@
+#!/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 \
+       --enable-static \
+       --disable-shared \
+       --prefix=/usr 
+
+$MAKEINSTALL

packages/3rdparty/lib/libzip/meta

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

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

@@ -0,0 +1,33 @@
+#!/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/rotorng/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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.3.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-rotor-ng"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_URL="http://projects.vdr-developer.org/attachments/download/1088/rotorng-${PKG_VERSION}.tar.gz"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
+PKG_LONGDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

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

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

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

@@ -0,0 +1,33 @@
+#!/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

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

@@ -1,55 +0,0 @@
-################################################################################
-#      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/rename

@@ -0,0 +1,26 @@
+#!/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

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

@@ -1,46 +0,0 @@
-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-epgsearch/build

@@ -0,0 +1,33 @@
+#!/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 -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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="e2de927"
+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

@@ -1,51 +0,0 @@
-################################################################################
-#      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-02_vdr-2.1.2-buildfix.patch

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

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

@@ -0,0 +1,32 @@
+#!/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

@@ -0,0 +1,37 @@
+################################################################################
+#      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="2.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr 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"

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

@@ -1,51 +0,0 @@
-################################################################################
-#      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-01_makefile.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 48c8b2c..d370f92 100644
+index 7f147b8..db294fc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,8 +12,6 @@
@@ -11,16 +11,15 @@ index 48c8b2c..d370f92 100644
  # 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)
+@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
  
  ### The directory environment:
  
 -# Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-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)
--RESDIR = $(call PKGCFG,resdir)
 -CFGDIR = $(call PKGCFG,configdir)
 -#
  TMPDIR ?= /tmp
@@ -38,7 +37,7 @@ index 48c8b2c..d370f92 100644
  
  ### Allow user defined options to overwrite defaults:
  
-@@ -65,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
  
  ### Includes and Defines (add further entries here):
  
@@ -47,7 +46,7 @@ index 48c8b2c..d370f92 100644
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
-@@ -139,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs)
  
  $(SOFILE): $(OBJS)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@

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

@@ -0,0 +1,26 @@
+#!/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

@@ -0,0 +1,36 @@
+#!/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 -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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.3.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://live.vdr-developer.org/en/index.php"
+PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr tntnet 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"

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

@@ -1,56 +0,0 @@
-################################################################################
-#      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-04_tntnet-2.0.patch

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

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

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

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

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

@@ -0,0 +1,26 @@
+#!/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}

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

@@ -0,0 +1,40 @@
+#!/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
+  make VDRDIR="../$VDR_DIR" \
+       VDRSRC="../$VDR_DIR" \
+       LIBDIR="." \
+       LOCALEDIR="./locale" \
+       CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-dvbapi"
+PKG_VERSION="555272d"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk

@@ -1,59 +0,0 @@
-################################################################################
-#      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-plugin-dvbapi"
-PKG_VERSION="bf11f9e"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr openssl libdvbcsa"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="TV"
-PKG_LONGDESC="TV"
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
-
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC"
-  export CXXFLAGS="$CXXFLAGS -fPIC"
-  export LDFLAGS="$LDFLAGS -fPIC"
-  export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
-}
-
-pre_make_target() {
-  # dont build parallel
-  MAKEFLAGS=-j1
-}
-
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  make VDRDIR=$VDR_DIR \
-    VDRSRC=$VDR_DIR \
-    LIBDIR="." \
-    LOCALEDIR="./locale" \
-    LIBDVBCSA=1
-}
-
-makeinstall_target() {
-  : # installation not needed, done by create-addon script
-}

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

@@ -1,17 +1,13 @@
 diff --git a/Makefile b/Makefile
-index efd124a..ed303fa 100644
+index ebe9d76..ef2d2e5 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -12,22 +12,14 @@ PLUGIN = dvbapi
- ### The version number of this plugin (taken from the main source file):
- 
- VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
--GITTAG  = $(shell git describe --always 2>/dev/null)
+@@ -15,18 +15,11 @@ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print
  
  ### The directory environment:
  
 -# Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG  = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-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)
@@ -26,29 +22,56 @@ index efd124a..ed303fa 100644
  
  ### Allow user defined options to overwrite defaults:
  
-@@ -35,7 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+@@ -34,33 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
  
  ### The version number of VDR's plugin API:
  
 -APIVERSION = $(call PKGCFG,apiversion)
+-ifeq ($(strip $(APIVERSION)),)
+-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+-NOCONFIG := 1
+-endif
+-
+-# backward compatibility with VDR version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+-
+-VDRSRC = $(VDRDIR)
+-ifeq ($(strip $(VDRSRC)),)
+-VDRSRC := ../../..
+-endif
+-LIBDIR = $(VDRSRC)/PLUGINS/lib
+-
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+--include $(VDRSRC)/Make.global
+--include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-endif
 +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
  
  ### The name of the distribution archive:
  
-@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+@@ -73,9 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
  
  ### Includes and Defines (add further entries here):
  
--INCLUDES +=
-+INCLUDES += -I$(VDRDIR)/include
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
-@@ -122,6 +114,7 @@ install-i18n: $(I18Nmsgs)
+@@ -145,6 +110,7 @@ $(DEPFILE): Makefile
  
  $(SOFILE): $(OBJS) $(FFDECSA)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
 +	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
  
- ifndef LIBDVBCSA
- $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
+ libdvbapi-dvbsddevice.so: device-sd.o
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $< -o $@

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch

@@ -0,0 +1,13 @@
+diff --git a/device-tmpl.cpp b/device-tmpl.cpp
+index 158324b..4d9f862 100644
+--- a/device-tmpl.cpp
++++ b/device-tmpl.cpp
+@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca
+   fd_dvr = -1;
+ 
+   int n = Adapter;
+-  softcsa = (fd_ca < 0);
++  softcsa = true;
+   if (softcsa)
+   {
+     if (HasDecoder())

packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk

@@ -1,51 +0,0 @@
-################################################################################
-#      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-plugin-eepg"
-PKG_VERSION="69b47ba"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="vdr-plugin-eepg"
-PKG_LONGDESC="This plugin parses the Extended (2 to 10 day) EPG data which is send by providers on their portal channels. This EEPG data is transmitted in a non-standard format on a non-standard PID."
-
-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-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch

@@ -1,34 +0,0 @@
---- vdr-plugin-eepg-master/Makefile	2014-03-11 15:44:36.675368020 +0000
-+++ vdr-plugin-eepg-master/Makefile	2014-03-11 15:51:02.065495474 +0000
-@@ -31,21 +31,16 @@
- ### 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)
- #
- 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:
- 
-@@ -119,6 +114,7 @@
- 
- $(SOFILE): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- install-lib: $(SOFILE)
- 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

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

@@ -0,0 +1,33 @@
+#!/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
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-streamdev"
+PKG_VERSION="329129d"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/show/plg-streamdev"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk

@@ -1,52 +0,0 @@
-################################################################################
-#      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-plugin-streamdev"
-PKG_VERSION="40704cd"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://projects.vdr-developer.org/projects/show/plg-streamdev"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr openssl"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="TV"
-PKG_LONGDESC="TV"
-
-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-plugin-vnsiserver/build

@@ -0,0 +1,33 @@
+#!/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-plugin-vnsiserver/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-vnsiserver"
+PKG_VERSION="e3cd383"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
+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="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk

@@ -1,51 +0,0 @@
-################################################################################
-#      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-plugin-vnsiserver"
-PKG_VERSION="a3f7ac5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="TV"
-PKG_LONGDESC="TV"
-
-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-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-01_makefile.patch

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

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

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 92fc90d..4196724 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifeq ($(DEBUG),1)
+ DEFINES += -DDEBUG

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

@@ -0,0 +1,36 @@
+#!/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
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+  cd dist/epgdata2xmltv
+  make -j1
+

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-xmltv2vdr"
+PKG_VERSION="30903cc0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
+PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="vdr curl libxml2"
+PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-xmltv2vdr"
+PKG_LONGDESC="vdr-xmltv2vdr"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk

@@ -1,59 +0,0 @@
-################################################################################
-#      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-plugin-xmltv2vdr"
-PKG_VERSION="30903cc0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
-PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="vdr-xmltv2vdr"
-PKG_LONGDESC="vdr-xmltv2vdr"
-
-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() {
-  cd dist/epgdata2xmltv
-  make -j1
-  cd -
-  $STRIP dist/epgdata2xmltv/epgdata2xmltv
-  $STRIP libvdr-*.so*
-}
-
-makeinstall_target() {
-  : # installation not needed, done by create-addon script
-}

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch

@@ -1,19 +0,0 @@
-commit 6d5c30323f49c7960c873a423ec948834bbe8737
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Sat Oct 19 22:24:10 2013 +0300
-
-    vdr 2.1.2 buildfix
-
-diff --git a/xmltv2vdr.cpp b/xmltv2vdr.cpp
-index b367508..7b61c61 100644
---- a/xmltv2vdr.cpp
-+++ b/xmltv2vdr.cpp
-@@ -274,7 +274,7 @@ cGlobals::cGlobals()
-     imgdelafter=30;
-     soundex=false;
- 
--    if (asprintf(&epgfile_store,"%s/epg.db",VideoDirectory)==-1) {};
-+    if (asprintf(&epgfile_store,"%s/epg.db",cVideoDirectory::Name())==-1) {};
- 
-     if (!CheckEPGDir("/var/run/vdr"))
-     {

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

@@ -0,0 +1,29 @@
+#!/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/vdr-plugin-xvdr/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-xvdr"
+PKG_VERSION="33afe59"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/pipelka/vdr-plugin-xvdr"
+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="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk

@@ -1,51 +0,0 @@
-################################################################################
-#      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-plugin-xvdr"
-PKG_VERSION="7f49bfa"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/pipelka/vdr-plugin-xvdr"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="TV"
-PKG_LONGDESC="TV"
-
-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-plugin-xvdr/patches/vdr-plugin-xvdr-01_makefile.patch

@@ -1,59 +0,0 @@
-From 08b08a02a8e93e9b11594e2e846ec2b1a316d314 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 12 Feb 2014 20:32:03 +0200
-Subject: [PATCH] makefile
-
----
- Makefile |   15 ++++-----------
- 1 files changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index da54323..81ba0e7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,23 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
- 
- ### The directory environment:
- 
--# Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
--LIBDIR = $(call PKGCFG,libdir)
--LOCDIR = $(call PKGCFG,locdir)
--PLGCFG = $(call PKGCFG,plgcfg)
--CFGDIR  = $(call PKGCFG,configdir)/plugins/$(PLUGIN)
--#
- TMPDIR ?= /tmp
- 
- ### The compiler options:
- 
--export CFLAGS   = $(call PKGCFG,cflags)
--export CXXFLAGS = $(call PKGCFG,cxxflags)
-+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:
- 
-@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES += -I./src -I./src/vdr
-+INCLUDES += -I./src -I./src/vdr -I$(VDRDIR)/include
- 
- ifdef DEBUG
- INCLUDES += -DDEBUG
-@@ -136,6 +128,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)
--- 
-1.7.2.5
-

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

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

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

@@ -1,52 +0,0 @@
-################################################################################
-#      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-satip"
-PKG_VERSION="0.2.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_SOURCE_DIR="satip-${PKG_VERSION}"
-PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="vdr-satip: SAT>IP plugin for VDR"
-PKG_LONGDESC="vdr-satip is a SAT>IP plugin for 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 \
-    SATIP_USE_TINYXML=1 \
-    LIBDIR="." \
-    LOCALEDIR="./locale"
-}
-
-makeinstall_target() {
-  : # installation not needed, done by create-addon script
-}

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

@@ -1,56 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 524338c..0569ebe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,8 +12,6 @@
- 
- # Strip debug symbols?  Set eg. to /bin/true if not
- 
--STRIP = strip
--
- # The official name of this plugin.
- # This name will be used in the '-P...' option of VDR to load the plugin.
- # By default the main source file also carries this name.
-@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
- 
- ### The directory environment:
- 
--# Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
--LIBDIR = $(call PKGCFG,libdir)
--LOCDIR = $(call PKGCFG,locdir)
--PLGCFG = $(call PKGCFG,plgcfg)
--CFGDIR = $(call PKGCFG,configdir)
--#
- TMPDIR ?= /tmp
- 
- ### The compiler options:
- 
--export CFLAGS   = $(call PKGCFG,cflags)
--export CXXFLAGS = $(call PKGCFG,cxxflags)
-+include $(VDRDIR)/Make.global
- 
- ### The version number of VDR's plugin API:
- 
--APIVERSION = $(call PKGCFG,apiversion)
-+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
- 
- ### Allow user defined options to overwrite defaults:
- 
-@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES +=
-+INCLUDES += -I$(VDRDIR)/include
- 
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
-@@ -139,6 +129,7 @@ install-i18n: $(I18Nmsgs)
- 
- $(SOFILE): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- ifndef SATIP_DEBUG
- 	@$(STRIP) $@
- endif