Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

TODO

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

packages/3rdparty/multimedia/rotorng/meta

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

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr control plugin"
@@ -35,3 +35,18 @@ PKG_LONGDESC="vdr control plugin"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-epgsearch"
@@ -35,3 +35,18 @@ PKG_LONGDESC="vdr-epgsearch"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+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"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr curl"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"
@@ -35,3 +35,18 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr tntnet pcre-host pcre"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr tntnet pcre-host pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"
@@ -35,3 +35,23 @@ PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plu
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+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
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,26 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      VDRSRC=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\" \
+                      LIBDVBCSA=1"
+
+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
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,19 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}
+

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,17 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-xmltv2vdr"
@@ -35,3 +35,24 @@ PKG_LONGDESC="vdr-xmltv2vdr"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+post_make_target() {
+  cd dist/epgdata2xmltv
+  make -j1
+  cd -
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ 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_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,12 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://85.17.209.13:6100/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="vdr openssl"
+PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,26 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_make_target() {
+  # dont build parallel
+  MAKEFLAGS=-j1
+}
+
+pre_configure_target() {
+  # vdr-sc fails building with LTO support
+  strip_lto
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+  export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

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

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_DEPENDS="vdr"
+PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,19 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}
+

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

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

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

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_DEPENDS="vdr"
+PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain vdr vdr-wirbelscan"
+PKG_BUILD_DEPENDS_TARGET="toolchain vdr vdr-wirbelscan"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -35,3 +35,22 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
+PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
+                      LIBDIR=\".\" \
+                      LOCALEDIR=\"./locale\""
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+pre_build_target() {
+  ln -sf $ROOT/$BUILD/vdr-wirbelscan-[0-9]*/wirbelscan_services.h $PKG_BUILD
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

packages/3rdparty/multimedia/vdr/build

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
-
-cd $PKG_BUILD
-
-cat > Make.config <<EOF
-PLUGINLIBDIR = /usr/lib/vdr
-PREFIX = /usr
-VIDEODIR = /storage/videos
-CONFDIR = /storage/.config/vdr
-LOCDIR = /usr/share/locale
-#LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
-
-NO_KBD=yes
-VDR_USER=root
-EOF
-
-make vdr
-make include-dir

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

@@ -20,14 +20,14 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="2.0.3"
+PKG_VERSION="2.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-PKG_URL="ftp://ftp.tvdr.de/vdr/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="fontconfig freetype"
+PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2 ncurses"
+PKG_BUILD_DEPENDS_TARGET="toolchain fontconfig freetype libcap libjpeg-turbo bzip2 ncurses"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -35,3 +35,29 @@ PKG_LONGDESC="This project describes how to build your own digital satellite rec
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export LDFLAGS=$(echo $LDFLAGS | sed -e "s|-Wl,--as-needed||")
+}
+
+pre_make_target() {
+  cat > Make.config <<EOF
+  PLUGINLIBDIR = /usr/lib/vdr
+  PREFIX = /usr
+  VIDEODIR = /storage/videos
+  CONFDIR = /storage/.config/vdr
+  LOCDIR = /usr/share/locale
+
+  NO_KBD=yes
+  VDR_USER=root
+EOF
+}
+
+make_target() {
+  make vdr
+  make include-dir
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

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

packages/addons/service/multimedia/vdr-addon/addon

@@ -40,7 +40,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
   cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
-  cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/
   cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
@@ -57,7 +56,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-streamdev-*/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-streamdev-*/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-live-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,7 @@
+4.0.1
+- update to vdr-2.1.1
+- remove rotorng. dish positioner is now implemented in vdr
+
 4.0.0
 - update to vdr-2.0.3
 - update to vdr-plugin-vnsiserver-cd5023b

packages/addons/service/multimedia/vdr-addon/config/settings.xml

@@ -14,7 +14,6 @@
     <setting id="LIVE_PORT" value="8008" />
     <setting id="ENABLE_CONTROL" value="false" />
     <setting id="CONTROL_PORT" value="2002" />
-    <setting id="ENABLE_ROTORNG" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
     <setting id="ENABLE_XMLTV2VDR" value="false" />
     <setting id="SOFTCAM_PLUGIN" value="sc" />

packages/addons/service/multimedia/vdr-addon/meta

@@ -20,14 +20,14 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="3.1"
+PKG_VERSION="4.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/addons/service/multimedia/vdr-addon/source/bin/vdr

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

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -129,9 +129,6 @@ fi
 if [ "$ENABLE_LIVE" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
 fi
-if [ "$ENABLE_ROTORNG" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P rotorng"
-fi
 if [ "$ENABLE_CONTROL" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
 fi

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -17,7 +17,6 @@
 	<string id="1038">Enable plugin: live</string>
 	<string id="1039">live: listen on ip</string>
 	<string id="1040">live: listen on port</string>
-	<string id="1041">Enable plugin: rotorng</string>
 	<string id="1042">Enable plugin: control</string>
 	<string id="1043">control: listen on port</string>
 	<string id="1044">Enable plugin: epgsearch</string>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -25,7 +25,6 @@
 		<setting id="LIVE_PORT" type="number" label="1040" values="" enable="!eq(-2,false)"  default="8008"/>
 		<setting id="ENABLE_CONTROL" type="bool" label="1042" default="false" />
 		<setting id="CONTROL_PORT" type="number" label="1043" values="" enable="!eq(-1,false)"  default="2002"/>
-		<setting id="ENABLE_ROTORNG" type="bool" label="1041" default="false" />
 		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" />
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting type="sep" />

packages/devel/llvm/patches/llvm-3.3-fix-rpath.patch

@@ -0,0 +1,24 @@
+commit 59c7f0369a67e1aecf365c92186bc5b45e0efcba
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Mon Oct 14 22:03:43 2013 +0300
+
+    fix rpath
+
+diff --git a/Makefile.rules b/Makefile.rules
+index f0c542b..fc5fe64 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -639,11 +639,10 @@ endif
+ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+   ifneq ($(HOST_OS), Darwin)
+     ifdef TOOLNAME
+-      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
+       ifdef EXAMPLE_TOOL
+-        LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
++        LD.Flags += $(DynamicFlag)
+       else
+-        LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
++        LD.Flags += $(DynamicFlag)
+     endif
+   endif
+ else

packages/linux/patches/3.11.5/linux-706-Sitecom-N300.patch

@@ -0,0 +1,11 @@
+diff -Naur linux-3.10.16/drivers/staging/rtl8712/usb_intf.c linux-3.10.16.patch/drivers/staging/rtl8712/usb_intf.c
+--- linux-3.10.16/drivers/staging/rtl8712/usb_intf.c	2013-10-14 01:08:56.000000000 +0200
++++ linux-3.10.16.patch/drivers/staging/rtl8712/usb_intf.c	2013-10-16 13:27:44.032951265 +0200
+@@ -92,6 +92,7 @@
+ 	{USB_DEVICE(0x0DF6, 0x005B)},
+ 	{USB_DEVICE(0x0DF6, 0x005D)},
+ 	{USB_DEVICE(0x0DF6, 0x0063)},
++	{USB_DEVICE(0x0DF6, 0x006C)},
+ 	/* Sweex */
+ 	{USB_DEVICE(0x177F, 0x0154)},
+ 	/* Thinkware */

packages/mediacenter/service.openelec.settings/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.3.4"
+PKG_VERSION="0.3.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

packages/mediacenter/xbmc-addon-xvdr/patches/frodo-acd4e14/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch

@@ -1,33 +0,0 @@
-From 7c1bae9cc4819ed9148354fd878824b40bd7a6a5 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sun, 6 Oct 2013 17:48:50 +0300
-Subject: [PATCH] fix scrambled/hd channel scan
-
-from wirbelscan:
-  #define SCAN_TV        ( 1 << 0 )
-  #define SCAN_RADIO     ( 1 << 1 )
-  #define SCAN_FTA       ( 1 << 2 )
-  #define SCAN_SCRAMBLED ( 1 << 3 )
-  #define SCAN_HD        ( 1 << 4 )
----
- src/libxvdr/include/xvdr/dataset.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libxvdr/include/xvdr/dataset.h b/src/libxvdr/include/xvdr/dataset.h
-index 53b0540..36d9a94 100644
---- a/src/libxvdr/include/xvdr/dataset.h
-+++ b/src/libxvdr/include/xvdr/dataset.h
-@@ -287,8 +287,8 @@ public:
-     FLAG_TV = 1,
-     FLAG_RADIO = 2,
-     FLAG_FTA = 4,
--    FLAG_SCRAMBLED = 16,
--    FLAG_HDTV = 32
-+    FLAG_SCRAMBLED = 8,
-+    FLAG_HDTV = 16
-   } Flags;
- 
-   Verbosity verbosity;
--- 
-1.7.2.5
-

packages/mediacenter/xbmc/config/repository.openelec.tv/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="repository.openelec.tv"
 		name="[COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] Mediacenter OS Add-ons"
-		version="3.0.0"
+		version="4.0.0"
 		provider-name="Team [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR]">
 	<extension point="xbmc.addon.repository"
 		name="Official OpenELEC.tv Add-on Repository">

packages/mediacenter/xbmc/package.mk

@@ -453,6 +453,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share/xbmc/addons/visualization.dxspectrum
   rm -rf $INSTALL/usr/share/xbmc/addons/visualization.itunes
   rm -rf $INSTALL/usr/share/xbmc/addons/visualization.milkdrop
+  rm -rf $INSTALL/usr/share/xbmc/addons/service.xbmc.versioncheck
   rm -rf $INSTALL/usr/share/xsessions
 
   mkdir -p $INSTALL/usr/share/xbmc/addons

packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf

@@ -1,39 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-# Core (PATH) environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-# hack: add addons to $PATH
-  for addon in /storage/.xbmc/addons/*/bin; do
-    if [ -d "$addon" ] ; then
-      PATH="$PATH:$addon"
-    fi
-  done
-
-  for sys in /usr/lib/xbmc/addons/*/bin; do
-    if [ -d "$sys" ] ; then
-      PATH="$PATH:$sys"
-    fi
-  done
-
-export PATH

packages/mediacenter/xbmc/profile.d/02-xbmc-library-path.conf

@@ -1,43 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  Added by Adam Boeglin: adamrb@gmail.com
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-# Core (PATH) environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-LD_LIBRARY_PATH="/usr/lib:/lib"
-
-# hack: add addons to $LD_LIBRARY_PATH
-  for addon in /storage/.xbmc/addons/*/lib; do
-    if [ -d "$addon" ] ; then
-     LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
-    fi
-  done
-
-  for sys in /usr/lib/xbmc/addons/*/lib; do
-    if [ -d "$sys" ] ; then
-      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
-    fi
-  done
-
-export LD_LIBRARY_PATH

packages/mediacenter/xbmc/profile.d/02-xbmc.conf

@@ -17,12 +17,22 @@
 #  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
-# Core (PATH) environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 
+# PATH
+for addon in /storage/.xbmc/addons/*/bin; do
+  [ -d "$addon" ] && PATH="$PATH:$addon"
+done
+for sys in /usr/lib/xbmc/addons/*/bin; do
+  [ -d "$sys" ] &&  PATH="$PATH:$sys"
+done
 export PATH
+
+# LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/usr/lib:/lib"
+for addon in /storage/.xbmc/addons/*/lib; do
+  [ -d "$addon" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
+done
+for sys in /usr/lib/xbmc/addons/*/lib; do
+  [ -d "$sys" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
+done
+export LD_LIBRARY_PATH

packages/mediacenter/xbmc/profile.d/91-xbmc-startdelay.conf

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

packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-# Mediacenter environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-GPUTYPE="OTHER"
-
-if [ -x /usr/bin/lspci ]; then
-  GPUDEVICE=$(lspci -n | grep 0300)
-
-  [ "$(echo $GPUDEVICE | grep 8086)" ] && GPUTYPE="INTEL"   # 8086 == INTEL
-  [ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA"  # 10de == NVIDIA
-  [ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD"     # 1002 == AMD
-fi
-
-export GPUTYPE

packages/mediacenter/xbmc/scripts/xbmc-sources

@@ -88,6 +88,11 @@ EOF
   #
 
   # Always sync to vblank
+    if [ -x /usr/bin/lspci ]; then
+      GPUDEVICE=$(lspci -n | grep 0300)
+      [ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA"  # 10de == NVIDIA
+      [ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD"     # 1002 == AMD
+    fi
     if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
       cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
     <videoscreen>

packages/network/avahi/system.d/avahi-daemon.service

@@ -9,6 +9,7 @@ ConditionPathExists=/storage/.cache/services/avahi.conf
 EnvironmentFile=-/run/openelec/debug/avahi.conf
 ExecStart=/usr/sbin/avahi-daemon -s $AVAHI_DEBUG
 ExecReload=/usr/sbin/avahi-daemon -r
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/network/bluez/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.8"
+PKG_VERSION="5.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -59,6 +59,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
                            --enable-tools \
                            --enable-datafiles \
                            --disable-experimental \
+                           --enable-playstation-peripheral \
                            --with-gnu-ld \
                            $BLUEZ_CONFIG \
                            storagedir=/storage/.cache/bluetooth"

packages/network/bluez/patches/bluez-logitech.patch

@@ -1,12 +0,0 @@
-diff -Naur bluez-5.8/tools/hid2hci.rules bluez-5.8.patch/tools/hid2hci.rules
---- bluez-5.8/tools/hid2hci.rules	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.8.patch/tools/hid2hci.rules	2013-09-23 15:34:52.148848897 +0200
-@@ -11,7 +11,7 @@
-   RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
- 
- # Logitech devices
--KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
-+KERNEL=="hiddev*|hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
-   RUN+="hid2hci --method=logitech-hid --devpath=%p"
- 
- ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"

packages/network/bluez/patches/bluez-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch

@@ -0,0 +1,29 @@
+From aa73bf5039dfd2cf0a52dd6fd22501d955cc1a00 Mon Sep 17 00:00:00 2001
+From: Tommy <mesilliac@gmail.com>
+Date: Thu, 10 Jan 2013 09:18:43 +0100
+Subject: [PATCH] work around Logitech diNovo Edge keyboard firmware issue
+
+https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/269851
+---
+ tools/hid2hci.rules |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/tools/hid2hci.rules b/tools/hid2hci.rules
+index db6bb03..7db4572 100644
+--- a/tools/hid2hci.rules
++++ b/tools/hid2hci.rules
+@@ -11,7 +11,10 @@ ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProt
+   RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
+ 
+ # Logitech devices
+-KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
++KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[3bc]", \
++  RUN+="hid2hci --method=logitech-hid --devpath=%p"
++# Logitech, Inc. diNovo Edge Keyboard
++KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c714", \
+   RUN+="hid2hci --method=logitech-hid --devpath=%p"
+ 
+ ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"
+-- 
+1.8.0.1
+

packages/network/bluez/system.d/bluetooth.service

@@ -11,6 +11,7 @@ EnvironmentFile=-/run/openelec/debug/bluez.conf
 ExecStart=/usr/lib/bluetooth/bluetoothd $BLUEZ_ARGS $BLUEZ_DEBUG
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
 LimitNPROC=1
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=bluetooth.target

packages/network/bluez/system.d/obex.service

@@ -11,6 +11,7 @@ EnvironmentFile=/storage/.cache/services/obexd.conf
 EnvironmentFile=-/run/openelec/debug/obexd.conf
 ExecStartPre=/bin/sh -c 'mkdir -p $OBEXD_ROOT'
 ExecStart=/usr/lib/bluetooth/obexd -r $OBEXD_ROOT $OBEXD_DEBUG
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=bluetooth.target

packages/network/openssh/system.d/sshd.service

@@ -9,6 +9,7 @@ EnvironmentFile=-/storage/.cache/services/sshd.conf
 ExecStartPre=/usr/sbin/sshd-keygen
 ExecStart=/usr/sbin/sshd -D $SSH_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/network/rpcbind/system.d/rpcbind.service

@@ -6,6 +6,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/rpcbind
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/network/samba/system.d.opt/nmbd.service

@@ -11,6 +11,7 @@ Type=forking
 PIDFile=/var/run/nmbd-smb.conf.pid
 ExecStart=/usr/bin/nmbd --configfile=/run/samba/smb.conf
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/network/samba/system.d.opt/smbd.service

@@ -12,6 +12,7 @@ PIDFile=/var/run/smbd-smb.conf.pid
 LimitNOFILE=16384
 ExecStart=/usr/bin/smbd --configfile=/run/samba/smb.conf
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/sysutils/busybox/profile.d/00-busybox.conf

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -20,14 +18,17 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+export HOME="/storage"
-
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+export HOSTNAME=`cat /etc/hostname`
-
+export PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
-CFLAGS="$CFLAGS -fPIC"
+case "$TERM" in
-CXXFLAGS="$CXXFLAGS -fPIC"
+  linux|nxterm|screen|vt100|vt100-am|xterm|xterm-color)
-LDFLAGS="$LDFLAGS -fPIC"
+    ;;
-
+  "")
-cd $PKG_BUILD
+    export TERM="linux"
-
+    ;;
-make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+  *)
+    export TERM="xterm"
+    ;;
+esac

packages/sysutils/busybox/profile.d/00-home-path.conf

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

packages/sysutils/busybox/profile.d/01-hostname.conf

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

packages/sysutils/busybox/profile.d/02-shell.conf

@@ -1,46 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-# Core (Shell) environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
-export PS1
-
-case "$TERM" in
-
-    # Do nothing when TERM already set (e.g. by SSH) and known
-    (linux|nxterm|screen|vt100|vt100-am|xterm|xterm-color)
-        ;;
-
-    # Default to "linux" when unset
-    ("")
-        TERM="linux"
-        ;;
-
-    # Default to "xterm" when unknown
-    (*)
-        TERM="xterm"
-        ;;
-
-esac
-export TERM

packages/sysutils/busybox/system.d.opt/cron.service

@@ -9,6 +9,7 @@ ConditionPathExists=/storage/.cache/services/crond.conf
 ExecStartPre=/bin/sh -c 'mkdir -p /storage/.cache/cron/crontabs'
 ExecStart=/sbin/crond -f -S
 KillMode=process
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/sysutils/remote/eventlircd/system.d/eventlircd.service

@@ -4,6 +4,7 @@ Description=Eventlirc server daemon
 [Service]
 ExecStart=/usr/sbin/eventlircd -f --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
 KillMode=process
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target

packages/sysutils/systemd/patches/systemd-02_order-remote-mounts-from-mountinfo-before-remote-.patch

@@ -0,0 +1,38 @@
+From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001
+From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Date: Fri, 04 Oct 2013 02:15:08 +0000
+Subject: systemd: order remote mounts from mountinfo before remote-fs.target
+
+Usually the network is stopped before filesystems are umounted.
+Ordering network filesystems before remote-fs.target means that their
+unmounting will be performed earlier, and can terminate sucessfully.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=70002
+---
+(limited to 'src/core/mount.c')
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 3d46557..93bfa99 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1440,6 +1440,9 @@ static int mount_add_one(
+ 
+         u = manager_get_unit(m, e);
+         if (!u) {
++                const char* const target =
++                        fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
++
+                 delete = true;
+ 
+                 u = unit_new(m, sizeof(Mount));
+@@ -1466,7 +1469,7 @@ static int mount_add_one(
+                         goto fail;
+                 }
+ 
+-                r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true);
++                r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
+                 if (r < 0)
+                         goto fail;
+ 
+--
+cgit v0.9.0.2-2-gbebe

packages/unofficial

@@ -1 +1 @@
-Subproject commit 91337e2a39c4cd84eaad4b74cf4562aa82e17d7c
+Subproject commit 7eb47552b34e77dd3c32678bef8e2e8ca5ca3497

packages/x11/driver/xf86-video-intel/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://intellinuxgraphics.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXcomposite systemd intel-gpu-tools"
+PKG_DEPENDS="libXcomposite systemd"
 PKG_BUILD_DEPENDS_TARGET="toolchain libXcomposite util-macros fontsproto systemd xorg-server"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"

packages/x11/other/dwm/system.d/windowmanager.service

@@ -11,6 +11,7 @@ KillMode=process
 Restart=always
 RestartSec=1
 StartLimitInterval=0
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=graphical.target

packages/x11/other/intel-gpu-tools/build

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

packages/x11/other/intel-gpu-tools/install

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

packages/x11/other/intel-gpu-tools/meta

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

packages/x11/other/intel-gpu-tools/patches/intel-gpu-tools-1.2-disable-cairo.patch

@@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6cd724c..9e77183 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--SUBDIRS = lib man tools scripts tests benchmarks demos
-+SUBDIRS = lib man tools scripts benchmarks demos
- 
- if BUILD_SHADER_DEBUGGER
- SUBDIRS += debugger
-diff --git a/configure.ac b/configure.ac
-index 94d54a6..236904a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,7 +57,6 @@ PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.31 libdrm])
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- 
- # for testdisplay
--PKG_CHECK_MODULES(CAIRO, cairo)
- PKG_CHECK_MODULES(LIBUDEV, [libudev], [udev=yes], [udev=no])
- if test x"$udev" = xyes; then
- 	AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])

packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space

@@ -1,48 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.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
-################################################################################
-# Enable Limited or RGB full on intel Computers
-# Usage:
-#  Set Limited mode:
-#   ./set-intel-color-space limited
-#  Set Full mode:
-#   ./set-intel-color-space full
-################################################################################
-
-if [ $# -gt 0 ] ; then
-  OUTPUT=`xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'`
-  if [ "$1" = "limited" ] ; then
-    # limited modes
-    intel_reg_write 0x70008 0xC0000000
-    intel_reg_write 0x70180 0xD8004400
-    xrandr --output $OUTPUT --set "Broadcast RGB" "Limited 16:235"
-  elif [ "$1" == "full" ] ; then
-    # reset old mode
-    xrandr --output $OUTPUT --set "Broadcast RGB" "Limited 16:235"
-    intel_reg_write 0x70008 0xC4002000
-    intel_reg_write 0x70180 0xDA004400
-    # set new mode
-    xrandr --output $OUTPUT --set "Broadcast RGB" "Full"
-    intel_reg_write 0x70180 0xDA004400
-  fi
-else
-  echo "Usage: $0 limited | full"
-fi

packages/x11/other/ratpoison/system.d/windowmanager.service

@@ -11,6 +11,7 @@ KillMode=process
 Restart=always
 RestartSec=1
 StartLimitInterval=0
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=graphical.target