config/version: set version to 4.1.1, set OS version to 4.2

Signed-off-by: Stephan Raue <stephan@openelec.tv>
nano: disable build of locales
2025-09-24 19:46:01 +07:00 · 2014-07-16 23:41:25 +02:00 · 2014-07-15 19:10:31 +02:00 · 2014-07-15 07:56:59 +02:00 · 2014-07-14 19:20:26 +03:00 · 2014-07-14 18:17:09 +02:00
923 changed files with 118551 additions and 536513 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,12 +35,6 @@ 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.

-Please dont ask us to add 3rdparty drivers unless you are the maintainer/developer of the driver,
-we have no manpower to support a non-mainlined kernel driver for your hardware.
-However, OpenELEC comes with minimal set of kernel drivers enabled, if you are sure that your hardware
-is supported in mainline kernel, feel free to send us a Pull Request to enable it in our
-kernel defconfigs. We are always happy to support known-working hardware.
-
 ### Reporting build failures

 As buildsystem / core packages (toolchain) / random libraries change from time to time, it is required
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@

 # OpenELEC - Open Embedded Linux Entertainment Center

-OpenELEC runs [Kodi](http://kodi.tv), an award-winning free and open source (GPL) software media 
-player and entertainment hub for digital media. For more info see http://kodi.tv .
+OpenELEC runs [XBMC](http://xbmc.org), an award-winning free and open source (GPL) software media 
+player and entertainment hub for digital media. For more info see http://xbmc.org .
 The base system has been designed and built from the ground up to be as 
 efficient as possible – consuming only tiny disk and memory footprints and
 providing cutting edge hardware support to deliver a set-top box experience.
@@ -48,12 +48,12 @@ providing cutting edge hardware support to deliver a set-top box experience.
 * Minimal hardware requirements
 * Ultra fast boot
 * Optimized builds for platforms such as ION, Intel, Fusion
-* Simple configuration via Kodi itself
+* Simple configuration via XBMC itself
 * Plug and Play external storage

 **Software**

-* Kodi HTPC software – View/Manage all your media.
+* XBMC HTPC software – View/Manage all your media.
 * Samba server – File transfer from any PC client
 * SSH server – Remote console access for debugging
 * IR/Bluetooth Remote Control
@@ -64,6 +64,8 @@ providing cutting edge hardware support to deliver a set-top box experience.
  SSH allows command line access to your openelec.tv machine for configuration
  and file transfer. Linux/Mac clients can natively use SSH, while Windows
  users might want to try PuTTY for their terminal access.
+  Starting with OpenELEC 2.0, SSH is disabled by default but all that is needed
+  is an empty “ssh_enable” file to exist in /storage/.config to enable it.
 * $HOME is mounted on /storage (the second ext4 partition on the drive). 
  All data transfered to the machine will go here, the rest of the system is
  read-only with the exception of /var (containing runtime configuration data).
@@ -74,7 +76,7 @@ providing cutting edge hardware support to deliver a set-top box experience.
  next reboot.
 * Automatic mounting of filesystems is supported. Devices such as USB Flash 
  sticks can be plugged into a running machine and will be mounted to /media,
-  showing up in Kodi’s GUI.
+  showing up in xbmc’s GUI.
 * Comments and questions are more than welcome, help is even better and patches 
  are absolutely perfect!!

--- a/config/addon/xbmc.python.module.xml
+++ b/config/addon/xbmc.python.module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
+       name="@PKG_NAME@"
       version="@ADDON_VERSION@"
       provider-name="@PROVIDER_NAME@">
  <requires>
@@ -8,7 +8,9 @@
    <import addon="xbmc.python" version="2.1.0"/>
@REQUIRES@
  </requires>
-  <extension point="xbmc.python.module" library="lib/">
+  <extension point="@PKG_ADDON_TYPE@"
+             library="default.py">
+        <provides>executable</provides>
  </extension>
  <extension point="xbmc.addon.metadata">
    <summary>@PKG_SHORTDESC@</summary>
--- a/config/addon/xbmc.python.script.xml
+++ b/config/addon/xbmc.python.script.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.python.script" library="default.py">
-    <provides>executable</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>
--- a/config/addon/xbmc.service.xml
+++ b/config/addon/xbmc.service.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.service" library="default.py">
-    <provides>executable</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>
--- a/config/arch.arm
+++ b/config/arch.arm
@@ -32,9 +32,12 @@
      SIMD_SUPPORT="no"
      ;;
    cortex-a7|cortex-a15)
-      TARGET_SUBARCH=armv7ve
+      TARGET_SUBARCH=armv7-a
      TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      # It's not currently possible to specify the exact architecture variant (-mcpu)
+      # that A7/A15 supports in the command line so use -mtune here.
+      # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57907
+      TARGET_EXTRA_FLAGS="-mtune=$TARGET_CPU"
      TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
      SIMD_SUPPORT="yes"
      ;;
--- a/config/functions
+++ b/config/functions
@@ -1,9 +1,12 @@
 setup_toolchain() {
+  if [ "$1" = "--optimize" ]; then
+    OPTIMIZE=yes
+    shift
+  fi
+
  if [ "$1" = target ]; then
    export DESTIMAGE="target"

-    unset CPP
-
    export CC=$TARGET_CC
    export CXX=$TARGET_CXX
    export LD=$TARGET_LD
@@ -28,8 +31,6 @@ setup_toolchain() {
  elif [ "$1" = host ]; then
    export DESTIMAGE="host"

-    unset CPP
-
    export AWK=$HOST_AWK
    export CC=$HOST_CC
    export CXX=$HOST_CXX
@@ -55,22 +56,12 @@ setup_toolchain() {
 }

 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
 }

 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
  echo ${PKG_VERSION}
 }

@@ -82,16 +73,10 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
  if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
+    local _PKG_DIR=$(find $ROOT/packages -name $1)
+    if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then
      . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
    fi
-
    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
  fi
 }
@@ -185,13 +170,14 @@ do_autoreconf() {

 strip_lto() {
  # strip out LTO optimization from *FLAGS
-  if [ -n "$GCC_OPTIM_LTO" ] ; then
-    CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-    CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-  fi
-  if [ -n "$LD_OPTIM_LTO" ] ; then
-    LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
-  fi
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
+}
+
+strip_linker_plugin() {
+  # strip out usage from linker plugin
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }

 strip_gold() {
@@ -277,9 +263,6 @@ dashes="==========================="
 }

 show_config() {
-  # load graphic configuration
-    get_graphicdrivers
-
  dashes="==========================="
  config_message="$config_message\n $dashes$dashes$dashes"
  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
@@ -315,16 +298,16 @@ show_config() {
  config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
  config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
  config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
-  config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"

  # Hardware decoder support

  config_message="$config_message\n\n Hardware decoder configuration:"
  config_message="$config_message\n $dashes$dashes"

-  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
-  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
+  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"

  # Input device configuration

@@ -335,7 +318,7 @@ show_config() {
  config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
  config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
  config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"

  # Misc. hardware configuration

@@ -344,6 +327,7 @@ show_config() {

  config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
  config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
+  config_message="$config_message\n - Blu-Ray support:\t\t\t $BLURAY_SUPPORT"
  config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
  config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
  config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
@@ -356,22 +340,22 @@ show_config() {
    config_message="$config_message\n - Include firmware:\t\t\t $config_firmware"
  done

-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
  # Network service configuration

  config_message="$config_message\n\n Network service configuration:"
  config_message="$config_message\n $dashes$dashes"

  config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
  config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
  config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
+  config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
+  config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
+  config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
+  config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"

  # OS configuration

@@ -401,37 +385,24 @@ fi
  config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
  config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"

-  # Kodi configuration
+  # XBMC configuration

-  config_message="$config_message\n\n Kodi configuration:"
+  config_message="$config_message\n\n XBMC configuration:"
  config_message="$config_message\n $dashes$dashes"

-  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
-  config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  config_message="$config_message\n - Bluray BD+ support:\t\t\t $BLURAY_BDPLUS_SUPPORT"
-  config_message="$config_message\n - Bluray AACS support:\t\t\t $BLURAY_AACS_SUPPORT"
-  config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
-  config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
-  config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-  config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-  config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-  config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-  config_message="$config_message\n - Kodi SSH client support:\t\t $KODI_SSHLIB_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
-
+  config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
+  config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"

  for config_skin in $SKINS; do
    config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
  done

  config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
-  config_message="$config_message\n - Include RSXS Screensaver:\t\t $KODI_SCR_RSXS"
-  config_message="$config_message\n - Include ProjectM Visualization:\t $KODI_VIS_PROJECTM"
-  config_message="$config_message\n - Include Goom Visualization:\t\t $KODI_VIS_GOOM"
+  config_message="$config_message\n - Include extra fonts:\t\t\t $XBMC_EXTRA_FONTS"
+  config_message="$config_message\n - Include RSXS Screensaver:\t\t $XBMC_SCR_RSXS"
+  config_message="$config_message\n - Include ProjectM Visualization:\t $XBMC_VIS_PROJECTM"
+  config_message="$config_message\n - Include Goom Visualization:\t\t $XBMC_VIS_GOOM"

  config_message="$config_message\n"
  config_message="$config_message\n $dashes$dashes$dashes"
--- a/config/graphic
+++ b/config/graphic
@@ -21,9 +21,9 @@ if [ "$SDL_SUPPORT" = no ]; then
 fi

 if [ "$OPENGL_SUPPORT" = no ]; then
-  KODI_SCR_RSXS="no"
-  KODI_VIS_PROJECTM="no"
-  KODI_VIS_GOOM="no"
+  XBMC_SCR_RSXS="no"
+  XBMC_VIS_PROJECTM="no"
+  XBMC_VIS_GOOM="no"
 fi

 get_graphicdrivers() {
@@ -32,18 +32,22 @@ get_graphicdrivers() {
  fi

  for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "dove" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS dove"
+    fi
+
    if [ "$drv" = "i915" ]; then
      DRI_DRIVERS="$DRI_DRIVERS,i915"
      XORG_DRIVERS="$XORG_DRIVERS intel"
      COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+      LIBVA="$LIBVA libva-intel-driver"
    fi

    if [ "$drv" = "i965" ]; then
      DRI_DRIVERS="$DRI_DRIVERS,i965"
      XORG_DRIVERS="$XORG_DRIVERS intel"
      COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+      LIBVA="$LIBVA libva-intel-driver"
    fi

    if [ "$drv" = "nouveau" ]; then
@@ -54,16 +58,15 @@ get_graphicdrivers() {
      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"
-      VDPAU_SUPPORT="yes"
    fi

    if [ "$drv" = "nvidia-legacy" ]; then
      XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      VDPAU_SUPPORT="yes"
    fi

    if [ "$drv" = "r200" ]; then
@@ -77,7 +80,6 @@ get_graphicdrivers() {
      XORG_DRIVERS="$XORG_DRIVERS ati"
      LLVM_SUPPORT="yes"
      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
    fi

    if [ "$drv" = "r600" ]; then
@@ -85,7 +87,6 @@ get_graphicdrivers() {
      XORG_DRIVERS="$XORG_DRIVERS ati"
      LLVM_SUPPORT="yes"
      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
    fi

    if [ "$drv" = "radeonsi" ]; then
@@ -93,7 +94,6 @@ get_graphicdrivers() {
      XORG_DRIVERS="$XORG_DRIVERS ati"
      LLVM_SUPPORT="yes"
      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
    fi

  done
--- a/distributions/OpenELEC/OpenELEC.png
+++ b/distributions/OpenELEC/OpenELEC.png
--- a/config/noobs/os.json
+++ b/config/noobs/os.json
@@ -1,10 +1,7 @@
 {
-  "name": "@DISTRONAME@_@PROJECT@",
+  "name": "@DISTRONAME@",
  "version": "@OPENELEC_VERSION@",
  "release_date": "@RELEASE_DATE@",
  "kernel": "@KERNEL_VERSION@",
-  "description": "@DESCRIPTION@",
-  "username": "root",
-  "password": "@ROOT_PASSWORD@",
-  "supported_hex_revisions": "@NOOBS_HEX@"
+  "description": "@DESCRIPTION@"
 }
--- a/config/noobs/partitions.json
+++ b/config/noobs/partitions.json
@@ -1,7 +1,7 @@
 {
  "partitions": [
    {
-      "label":                     "@DISTRONAME@_@PROJECT@_System",
+      "label":                     "System",
      "filesystem_type":           "FAT",
      "partition_size_nominal":    160,
      "want_maximised":            false,
@@ -9,7 +9,7 @@
      "mkfs_options":              ""
    },
    {
-      "label":                     "@DISTRONAME@_@PROJECT@_Storage",
+      "label":                     "Storage",
      "filesystem_type":           "ext4",
      "partition_size_nominal":    864,
      "want_maximised":            true,
--- a/config/optimize
+++ b/config/optimize
@@ -30,7 +30,7 @@ fi
 TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"

--- a/config/options
+++ b/config/options
@@ -1,14 +1,6 @@
 # set default language for buildsystem
  export LC_ALL=C

-# determines DISTRO, if not forced by user
-# default is OpenELEC
-if [ -z "$DISTRO" ]; then
-  DISTRO="OpenELEC"
-else
-  DISTRO="$DISTRO"
-fi
-
 # determines PROJECT, if not forced by user
 # default is Generic
 if [ -z "$PROJECT" ]; then
@@ -26,28 +18,23 @@ else
 fi

 ROOT=`pwd`
-DISTRO_DIR="$ROOT/distributions"
 PROJECT_DIR="$ROOT/projects"
 LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"

 # include versioning
  . config/version

-# read distro versioning if available
- if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
-   . $DISTRO_DIR/$DISTRO/version
- fi
-
-# read distro options if available
- if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
-   . $DISTRO_DIR/$DISTRO/options
- fi
-
 # read project options if available
 if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
   . $PROJECT_DIR/$PROJECT/options
 fi

+# Target system library C (eglibc)
+  TARGET_LIBC="eglibc"
+
+# Library strip
+  LIBSTRIP="yes"
+
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
  LOCAL_CC=`which gcc`
@@ -65,9 +52,7 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
-  if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
-    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
-  fi
+  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`

 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
@@ -92,10 +77,5 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
    . $HOME/.openelec/$PROJECT/options
  fi

-# read distro options from $HOME if available
-  if [ -f "$HOME/.openelec/options.$DISTRO" ]; then
-    . $HOME/.openelec/options.$DISTRO
-  fi
-
 . config/graphic
 . config/path $1
--- a/config/path
+++ b/config/path
@@ -20,10 +20,6 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}

 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
-if [ -n "$BUILD_SUFFIX" ]; then
-  BUILD=$BUILD-$BUILD_SUFFIX
-fi
-
 TARGET_IMG=$ROOT/$TARGET
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"
@@ -68,46 +64,26 @@ SED="sed -i"
  PKG_IS_ADDON="no"

  if [ -n "$1" ]; then
-    _PKG_ROOT_NAME=$(echo $1 | cut -d: -f1)
-    _ALL_DIRS=""
-    _FOUND=0
-    PKG_DIR=""
-
-    # first check project folder for a package
-    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
        PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
          echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
+          echo -e "$ALL_DIRS"
          exit 1
        fi
      fi
    done
-
-    # then check packages folder if not found already
-    if [ $_FOUND -eq 0 ]; then
-      for DIR in $(find $ROOT/$PACKAGES -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-        if [ -r "$DIR/package.mk" ]; then
-          # found first, set $PKG_DIR
-          PKG_DIR="$DIR"
-          # keep track of dirs with package.mk for detecting multiple folders
-          _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-          _FOUND=$((_FOUND+1))
-          if [ $_FOUND -gt 1 ]; then
-            # found more ? fail
-            echo "Error - multiple package folders:"
-            echo -e "$_ALL_DIRS"
-            exit 1
-          fi
-        fi
-      done
-    fi
  fi

  if [ -r $PKG_DIR/package.mk ]; then
@@ -132,8 +108,6 @@ SSL_CERTIFICATES="/etc/pki/tls"
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++

-unset TARGET_CPP
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -151,8 +125,6 @@ TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"

-unset HOST_CPP
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
--- a/config/version
+++ b/config/version
@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="5.0.6"
+  OPENELEC_VERSION="4.1.1"

 # OS_VERSION: OS Version
-  OS_VERSION="5.0"
+  OS_VERSION="4.2"

 # ADDON_VERSION: Addon version
-  ADDON_VERSION="4.3"
+  ADDON_VERSION="4.1"

--- a/distributions/OpenELEC/options
+++ b/distributions/OpenELEC/options
@@ -1,236 +0,0 @@
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
-
-# short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
-
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREETING0="##############################################"
-  GREETING1="# OpenELEC - The living room PC for everyone #"
-  GREETING2="# ...... visit http://www.openelec.tv ...... #"
-  GREETING3="##############################################"
-  GREETING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
-
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
-
-# Skins to install (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
-
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
-
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
-
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="yes"
-
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="yes"
-
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="yes"
-
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
-
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
-
-# build and install 'FishBMC' Visualization (yes / no)
-  # does not work on RPi
-  KODI_VIS_FISHBMC="yes"
-
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
-
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
-
-# build and install with non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
-
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
-
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
-
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
-
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
-
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
-
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
-
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
-
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
-
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
-
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
-
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
-
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
-
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
-
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
-
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
-
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
-
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
-
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
-
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
-
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
-
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# Windowmanager to use (ratpoison / fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-  if [ "$TARGET_ARCH" = "i386" ]; then
-    # TODO: create Legacy build with OpenELEC-4.2
-    # install legacy drivers to i386 ARCH
-    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
-  elif [ "$TARGET_ARCH" = "x86_64" ]; then
-    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
-  fi
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="yes"
-
-# build and install IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
--- a/packages/3rdparty/lib/cxxtools/package.mk
+++ b/packages/3rdparty/lib/cxxtools/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="cxxtools"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
--- a/packages/3rdparty/lib/libdvbcsa/package.mk
+++ b/packages/3rdparty/lib/libdvbcsa/package.mk
--- a/packages/3rdparty/multimedia/vdr-control/package.mk
+++ b/packages/3rdparty/multimedia/vdr-control/package.mk
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch
--- a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch
+++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch
--- a/packages/3rdparty/multimedia/vdr-dummydevice/package.mk
+++ b/packages/3rdparty/multimedia/vdr-dummydevice/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
-PKG_URL="$DISTRO_MIRROR/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
+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"
--- a/packages/3rdparty/multimedia/vdr-dummydevice/patches/vdr-dummydevice-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-dummydevice/patches/vdr-dummydevice-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk
+++ b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk
--- a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch
+++ b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch
--- a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-03_don-t-build-unused-plugins.patch
+++ b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-03_don-t-build-unused-plugins.patch
--- a/packages/3rdparty/multimedia/vdr-iptv/package.mk
+++ b/packages/3rdparty/multimedia/vdr-iptv/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="vdr-iptv"
-PKG_VERSION="2.2.0"
+PKG_VERSION="2.1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-live/package.mk
+++ b/packages/3rdparty/multimedia/vdr-live/package.mk
--- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-1.patch
+++ b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-1.patch
--- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-2.patch
+++ b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-2.patch
--- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch
+++ b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
@@ -17,13 +17,13 @@
 ################################################################################

 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="c0c7fa2"
+PKG_VERSION="bdcad3f"
 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 libdvbcsa"
+PKG_DEPENDS_TARGET="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-03_ffdecsa.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-03_ffdecsa.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="vdr-plugin-eepg"
-PKG_VERSION="9cd9a75"
+PKG_VERSION="d7dc614"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk
@@ -17,13 +17,13 @@
 ################################################################################

 PKG_NAME="vdr-plugin-streamdev"
-PKG_VERSION="84c6f6b"
+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 libressl"
+PKG_DEPENDS_TARGET="toolchain vdr openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
--- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk
@@ -17,11 +17,11 @@
 ################################################################################

 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="9529e6d"
+PKG_VERSION="7d4aa81"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
+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"
@@ -30,6 +30,7 @@ PKG_SHORTDESC="TV"
 PKG_LONGDESC="TV"

 PKG_IS_ADDON="no"
+
 PKG_AUTORECONF="no"

 pre_configure_target() {
--- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk
--- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch
--- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/config/allowed_hosts.conf
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/config/allowed_hosts.conf
--- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="b300fc3"
+PKG_VERSION="7f49bfa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-satip/package.mk
+++ b/packages/3rdparty/multimedia/vdr-satip/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="vdr-satip"
-PKG_VERSION="2.2.0"
+PKG_VERSION="0.3.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/3rdparty/multimedia/vdr-satip/patches/vdr-satip-01_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-satip/patches/vdr-satip-01_makefile.patch
--- a/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk
+++ b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="vdr-wirbelscan"
-PKG_VERSION="0.0.9"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-dont-build-i18n.patch
+++ b/packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-dont-build-i18n.patch
@@ -1,6 +1,6 @@
-From c2121393b05a756266fe728f83eaddbd3755ce13 Mon Sep 17 00:00:00 2001
+From f1923761486397809be88b3344d0c498afe1bf29 Mon Sep 17 00:00:00 2001
 From: Stefan Saraev <stefan@saraev.ca>
-Date: Mon, 16 Jun 2014 12:14:33 +0300
+Date: Mon, 9 Jun 2014 22:02:58 +0300
 Subject: [PATCH] dont build i18n

 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] dont build i18n
 1 files changed, 1 insertions(+), 1 deletions(-)

 diff --git a/Makefile b/Makefile
-index aa344a4..819b5b0 100644
+index 87d274e..b9f4b29 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -62,7 +62,7 @@ OBJS = $(PLUGIN).o soundex.o extpipe.o parse.o source.o import.o event.o setup.o
+@@ -74,7 +74,7 @@ UNCRUSTIFY_FILES = scanner.c scanner.h scanfilter.c scanfilter.h statemachine.h
 
 ### The main target:
 
--- a/packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-receiver-api-fixes.patch
+++ b/packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-receiver-api-fixes.patch
@@ -0,0 +1,51 @@
+commit 64f969e39d18aefa263dc3a61172e33df33963fb
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Thu Mar 29 20:22:11 2012 +0300
+
+    wirbelscan: receiver-api-fixes
+
+diff --git a/statemachine.c b/statemachine.c
+index 48a212e..bc0c8e5 100644
+--- a/statemachine.c
+++ b/statemachine.c
+@@ -36,12 +36,12 @@ protected:
+     while (Running()) cCondWait::SleepMs(5);
+     }; /*TODO: check here periodically for lock and wether we got any data!*/
+ public:
+-  cScanReceiver(tChannelID ChannelID, int AnyPid);
+  cScanReceiver(const cChannel* chan, int AnyPid);
+   virtual ~cScanReceiver() {cReceiver::Detach(); };
+   };
+ 
+-cScanReceiver::cScanReceiver(tChannelID ChannelID, int AnyPid) :
+-     cReceiver(ChannelID, 99, AnyPid), cThread("dummy receiver") { }
+cScanReceiver::cScanReceiver(const cChannel* chan, int AnyPid) :
+     cReceiver(chan, 99), cThread("dummy receiver") {  AddPid(AnyPid); }
+ 
+ ///!-----------------------------------------------------------------
+ ///!  v 0.0.5, store state in lastState if different and print state
+@@ -144,7 +144,7 @@ void cStateMachine::Action(void) {
+          ScannedTransponders.Add(ScannedTransponder);
+ 
+          dev->SwitchChannel(Transponder, false);
+-         aReceiver = new cScanReceiver(Transponder->GetChannelID(), 99);
+         aReceiver = new cScanReceiver(Transponder, 99);
+          dev->AttachReceiver(aReceiver);
+ 
+          cCondWait::SleepMs(1000);
+diff --git a/ttext.c b/ttext.c
+index 0053936..0864484 100644
+--- a/ttext.c
+++ b/ttext.c
+@@ -374,9 +374,9 @@ void cSwReceiver::Action() {
+      }
+ }
+ 
+-cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel->GetChannelID(),
+-   100, Channel->Tpid()), cThread("ttext") {
+cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel, 100), cThread("ttext") {
+ 
+   AddPid(Channel->Tpid());
+    stopped = fuzzy = false;
+    channel = Channel;
+    buffer  = new cRingBufferLinear(MEGABYTE(1),184);
--- a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk
+++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk
--- a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/patches/vdr-wirbelscancontrol-01-dont-build-i18n.patch
+++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/patches/vdr-wirbelscancontrol-01-dont-build-i18n.patch
--- a/packages/3rdparty/multimedia/vdr/package.mk
+++ b/packages/3rdparty/multimedia/vdr/package.mk
@@ -18,12 +18,12 @@
 ################################################################################

 PKG_NAME="vdr"
-PKG_VERSION="2.2.0"
+PKG_VERSION="2.1.6"
 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_TARGET="toolchain fontconfig freetype libcap libjpeg-turbo bzip2"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
--- a/packages/3rdparty/multimedia/vdr/patches/vdr-01_disable_ca_updates.patch
+++ b/packages/3rdparty/multimedia/vdr/patches/vdr-01_disable_ca_updates.patch
--- a/packages/3rdparty/multimedia/vdr/patches/vdr-02_disable_eitscan.patch
+++ b/packages/3rdparty/multimedia/vdr/patches/vdr-02_disable_eitscan.patch
@@ -0,0 +1,12 @@
+diff -Nru vdr-1.7.15-vanilla/eitscan.c vdr-1.7.15-disable_eitscan/eitscan.c
+--- vdr-1.7.15-vanilla/eitscan.c	2010-06-06 19:11:14.000000000 +0300
+++ vdr-1.7.15-disable_eitscan/eitscan.c	2010-06-06 20:44:07.000000000 +0300
+@@ -146,7 +146,7 @@
+                if (Device) {
+                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
+                       const cChannel *Channel = ScanData->GetChannel();
+-                      if (Channel) {
+                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {
--- a/packages/3rdparty/multimedia/vdr/patches/vdr-10_decrease-channels.conf-autosave-delay.patch
+++ b/packages/3rdparty/multimedia/vdr/patches/vdr-10_decrease-channels.conf-autosave-delay.patch
--- a/packages/3rdparty/web/tntnet/package.mk
+++ b/packages/3rdparty/web/tntnet/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="tntnet"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
--- a/packages/addons/driver/hdhomerun/changelog.txt
+++ b/packages/addons/driver/hdhomerun/changelog.txt
@@ -1,9 +1,3 @@
-4.3.2
-  allow running scripts from addon settings
-4.3.1
-  rebuild for addon api bump
-4.3.0
-  rebuild for addon api bump
 4.1.2
  clean up
 4.1.0
--- a/packages/addons/driver/hdhomerun/package.mk
+++ b/packages/addons/driver/hdhomerun/package.mk
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="hdhomerun"
-PKG_VERSION="4.3"
+PKG_VERSION="4.1"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
@@ -32,8 +32,8 @@ unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFIL
 # exclusive lock
 exlock

-HDHR_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.hdhomerun"
-HDHR_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
 HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"

 # modules are not automatically loaded
--- a/packages/addons/driver/hdhomerun/source/default.py
+++ b/packages/addons/driver/hdhomerun/source/default.py
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -15,3 +15,18 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
+
+import os
+import sys
+import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
+
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_hdhomerun_tuners
+  refresh_hdhomerun_tuners(__settings_xml__)
+  __settings__.openSettings()
--- a/packages/addons/driver/hdhomerun/source/resources/actions.py
+++ b/packages/addons/driver/hdhomerun/source/resources/actions.py
@@ -1,32 +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/>.
-################################################################################
-
-import os
-import sys
-import xbmcaddon
-
-__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
-__cwd__           = __settings__.getAddonInfo('path')
-__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
-__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
-
-if len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
-  sys.path.append(__resources_lib__)
-  from functions import refresh_hdhomerun_tuners
-  refresh_hdhomerun_tuners(__settings_xml__)
-  __settings__.openSettings()
--- a/packages/addons/driver/hdhomerun/source/resources/lib/functions.py
+++ b/packages/addons/driver/hdhomerun/source/resources/lib/functions.py
@@ -24,7 +24,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom

-__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'

 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist
--- a/packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py
+++ b/packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py
@@ -37,39 +37,36 @@ def _usage(this_file):
    return """SYNOPSIS: pretty print an XML document
 USAGE: python %s <filename> \n""" % this_file

-def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
    if line.strip():
        start = ""
        number_chars = 0
        for l in range(indent_level):
            start = start + " "
            number_chars = number_chars + 1
-        if not ignore_contents:
-            try:
-                elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
-                elem_finished = _re.findall("([?|\]\]/|\-\-]*\>)", line)[0] 
-                #should not have *
-                attrs = _re.findall("(\S*?\=\".*?\")", line)
-                output.write(start + elem_start)
-                number_chars = len(start + elem_start)
-                for attr in attrs:
-                    if (attrs.index(attr) + 1) == len(attrs):
-                        number_chars = number_chars + len(elem_finished)
-                    if (number_chars + len(attr) + 1) > width:
-                        output.write("\n")
-                        for i in range(len(start + elem_start) + 1):
-                            output.write(" ")
-                        number_chars = len(start + elem_start) + 1 
-                    else:
+        try:
+            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
+            #should not have *
+            attrs = _re.findall("(\S*?\=\".*?\")", line)
+            output.write(start + elem_start)
+            number_chars = len(start + elem_start)
+            for attr in attrs:
+                if (attrs.index(attr) + 1) == len(attrs):
+                    number_chars = number_chars + len(elem_finished)
+                if (number_chars + len(attr) + 1) > width:
+                    output.write("\n")
+                    for i in range(len(start + elem_start) + 1):
                        output.write(" ")
-                        number_chars = number_chars + 1
-                    output.write(attr)
-                    number_chars = number_chars + len(attr)
-                output.write(elem_finished + "\n")
-            except IndexError:
-                #give up pretty print this line
-                output.write(start + line + "\n")
-        else:
+                    number_chars = len(start + elem_start) + 1 
+                else:
+                    output.write(" ")
+                    number_chars = number_chars + 1
+                output.write(attr)
+                number_chars = number_chars + len(attr)
+            output.write(elem_finished + "\n")
+        except IndexError:
+            #give up pretty print this line
            output.write(start + line + "\n")
                

@@ -83,8 +80,7 @@ def _get_next_elem(data):
    start_pos = data.find("<")
    end_pos = data.find(">") + 1
    retval = data[start_pos:end_pos]
-    stopper = retval.rfind("/")
-    ignore_contents = False
+    stopper = retval.rfind("/") 
    if stopper < retval.rfind("\""):
        stopper = -1
    single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
@@ -93,19 +89,11 @@ def _get_next_elem(data):
    ignore_question =  retval.find("<?") > -1

    if ignore_excl:
-        ignore_contents = True
        cdata = retval.find("<![CDATA[") > -1
        if cdata:
            end_pos = data.find("]]>")
            if end_pos > -1:
                end_pos = end_pos + len("]]>")
-                stopper = end_pos
-        else:
-            end_pos = data.find("-->")
-            if end_pos > -1:
-                end_pos = end_pos + len("-->")
-                stopper = end_pos
-        retval = data[start_pos:end_pos]

    elif ignore_question:
        end_pos = data.find("?>") + len("?>")
@@ -113,12 +101,11 @@ def _get_next_elem(data):
    
    no_indent = ignore or single

-    
+    #print retval, end_pos, start_pos, stopper > -1, no_indent
    return start_pos, \
           end_pos, \
           stopper > -1, \
-           no_indent, \
-           ignore_contents
+           no_indent

 def get_pprint(xml, indent=4, width=80):
    """Returns the pretty printed xml """
@@ -129,8 +116,6 @@ def get_pprint(xml, indent=4, width=80):
            self.output += string
    out = out()
    pprint(xml, output=out, indent=indent, width=width)
-    
-

    return out.output

@@ -141,7 +126,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
    Use indent to select indentation level. Default is 4   """
    data = xml
    indent_level = 0
-    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
    while ((start_pos > -1 and end_pos > -1)):
        _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                             output=output)
@@ -151,8 +136,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        _pprint_line(indent_level, 
                     data[:end_pos - start_pos], 
                     width=width,
-                     output=output,
-                     ignore_contents=ignore_contents)
+                     output=output)
        data = data[end_pos - start_pos:]
        if not is_stop and not no_indent :
            indent_level = indent_level + indent
@@ -160,7 +144,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        if not data:
            break
        else:
-            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
    

 if __name__ == "__main__":
--- a/packages/addons/driver/hdhomerun/source/resources/settings.xml
+++ b/packages/addons/driver/hdhomerun/source/resources/settings.xml
@@ -11,6 +11,6 @@
  <category label="9000">
    <setting type="sep" />
    <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" id="refresh_tuners" action="RunScript($CWD/resources/actions.py, refresh_tuners)" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
  </category>
 </settings>
--- a/packages/addons/driver/imon-mce/changelog.txt
+++ b/packages/addons/driver/imon-mce/changelog.txt
@@ -1,21 +1,11 @@
-4.3.1
- fix keymaps path
-
-4.3.0
- rebuild for addon api bump
-
 4.1.0
 rebuild for addon api bump
-
 4.0.1
 rebuild
-
 4.0.0
  rebuild for OpenELEC-4.0
-
 3.1.1
  rebuild for OpenELEC-3.2
-
 3.0.1
 - bump addon version

--- a/packages/addons/driver/imon-mce/package.mk
+++ b/packages/addons/driver/imon-mce/package.mk
@@ -17,8 +17,8 @@
 ################################################################################

 PKG_NAME="imon-mce"
-PKG_VERSION="4.3"
-PKG_REV="1"
+PKG_VERSION="4.1"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"
--- a/packages/addons/driver/imon-mce/source/bin/imon-mce.service
+++ b/packages/addons/driver/imon-mce/source/bin/imon-mce.service
@@ -21,4 +21,4 @@
 . /etc/profile

 sleep 1 && \
-ir-keytable -p rc6 -w /usr/lib/udev/rc_keymaps/imon_mce &
+ir-keytable -p rc6 -w /etc/rc_keymaps/imon_mce &
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,15 +1,3 @@
-4.3.4
-  fixed xbmc/kodi rebranding error
-  some fixes
-4.3.3
-  addon transformed to service addon
-  new addon settings option to enable to check for new driver at boot
-4.3.2
-  new addon settings option to enable to update driver from web with latest version
-4.3.1
-  update driver
-4.3.0
-  rebuild for addon api bump
 4.1.5
  dont touch /storage/.profile
 4.1.4
--- a/packages/addons/driver/sundtek-mediatv/package.mk
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@@ -17,19 +17,19 @@
 ################################################################################

 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="4.3"
-PKG_REV="4"
+PKG_VERSION="4.1"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS_TARGET=""
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
 PKG_LONGDESC="Driver for Sundtek MediaTV Pro (DVB-C, DVB-T, AnalogTV, Composite, S-Video, FM-Radio USB Stick) and Sundtek SkyTV Ultimate (DVB-S/S2 USB)."
 PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_TYPE="xbmc.python.script"
 PKG_AUTORECONF="no"

 make_target() {
@@ -47,18 +47,11 @@ make_target() {
      INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
      ;;
  esac
-  
  wget -O installer.tar.gz $INSTALLER_URL
-  
  tar -xzf installer.tar.gz
-  
-  chmod -R 755 opt/ etc/
-  
-  rm -f  opt/bin/getinput.sh
-  rm -f  opt/bin/lirc.sh
-  rm -fr opt/lib/pm/
-
-  wget -O version.used http://sundtek.de/media/latest.phtml
+  # we run this via wrapper
+  mv opt/bin/mediaclient opt/bin/mediaclient.bin
+  chmod 755 opt/bin/*
 }

 makeinstall_target() {
@@ -71,5 +64,4 @@ addon() {
  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
  cp -Pa $PKG_BUILD/opt/bin $ADDON_BUILD/$PKG_ADDON_ID/
  cp -Pa $PKG_BUILD/opt/lib $ADDON_BUILD/$PKG_ADDON_ID/
-  cp $PKG_BUILD/version.used $ADDON_BUILD/$PKG_ADDON_ID/
 }
--- a/packages/addons/driver/sundtek-mediatv/settings-default.xml
+++ b/packages/addons/driver/sundtek-mediatv/settings-default.xml
@@ -17,5 +17,4 @@
  <setting id="DEVICE4_NUM" value="1" />
  <setting id="DEVICE5_IP"  value="" />
  <setting id="DEVICE5_NUM" value="1" />
-  <setting id="CHECK_BOOT" value="false" />
 </settings>
--- a/packages/addons/driver/sundtek-mediatv/source/bin/mediaclient
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/mediaclient
@@ -0,0 +1,2 @@
+#!/bin/sh
+LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so exec mediaclient.bin "$@"
--- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start
@@ -1,247 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      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/>.
-################################################################################
-
-. /etc/profile
-
-net_tuner_num_fix() {
-  local num=$1
-
-  [ -z "$num" ] && num=1
-  num=$(( $num *1 ))
-  [ $num -lt 1 ] && num=1
-  num=$(( $num -1 ))
-  echo $num
-}
-
-SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
-
-mkdir -p $SUNDTEK_ADDON_HOME
-
-if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
-  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
-else
-  # in case of missing entries in addon home's sundtek.conf
-  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
-  if [ -z "$entry_set" ]; then
-    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
-    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
-
-    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
-    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
-  fi
-fi
-
-if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
-  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
-fi
-
-[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
-[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
-
-mkdir -p /var/config
-cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
-. /var/config/sundtek-addon.conf
-
-# check if there is new driver on web
-if [ "$CHECK_BOOT" = "true" ]; then
-  if [ ! -f /var/run/sundtek.checked ]; then
-    # only once after boot
-    touch /var/run/sundtek.checked
-
-(
-    # wait some time before checking
-    sleep 20
-    cd $SUNDTEK_ADDON_DIR
-
-    wget -O version.latest http://sundtek.de/media/latest.phtml
-
-    version_used=$(cat version.used)
-    version_latest=$(cat version.latest)
-    if [ "$version_used" != "$version_latest" ]; then
-      # new version exist
-      kodi-send -a "Notification(Sundtek, \"New driver version exist, update manually\", 4000, $SUNDTEK_ADDON_DIR/icon.png)"
-    fi
-)&
-  fi
-fi
-
-if [ -z "$(pidof mediasrv)" ]; then
-  rm -f /var/log/mediasrv.log
-  rm -f /var/log/mediaclient.log
-
-  SUNDTEK_CONF_TMP=/tmp/sundtek.conf
-  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
-
-  [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
-  sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
-
-  # enable HW PID filter
-  if [ "$ENABLE_HW_PID_FILTER" = "true" ]; then
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=off|g' $SUNDTEK_CONF_TMP
-  fi
-
-  # enable IR receiver
-  if [ "$ENABLE_IR_RECEIVER" = "true" ]; then
-    sed -i 's|^ir_disabled=.*|ir_disabled=0|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^ir_disabled=.*|ir_disabled=1|g' $SUNDTEK_CONF_TMP
-  fi
-
-  if [ "$ALLOW_NET_USE" = "true" ]; then
-    sed -i 's|^enablenetwork=.*|enablenetwork=on|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^enablenetwork=.*|enablenetwork=off|g' $SUNDTEK_CONF_TMP
-  fi
-
-  [ "$DEVICE1_IP" = "0.0.0.0" ] && DEVICE1_IP=""
-  [ "$DEVICE2_IP" = "0.0.0.0" ] && DEVICE2_IP=""
-  [ "$DEVICE3_IP" = "0.0.0.0" ] && DEVICE3_IP=""
-  [ "$DEVICE4_IP" = "0.0.0.0" ] && DEVICE4_IP=""
-  [ "$DEVICE5_IP" = "0.0.0.0" ] && DEVICE5_IP=""
-  DEVICE1_NUM=$(net_tuner_num_fix $DEVICE1_NUM)
-  DEVICE2_NUM=$(net_tuner_num_fix $DEVICE2_NUM)
-  DEVICE3_NUM=$(net_tuner_num_fix $DEVICE3_NUM)
-  DEVICE4_NUM=$(net_tuner_num_fix $DEVICE4_NUM)
-  DEVICE5_NUM=$(net_tuner_num_fix $DEVICE5_NUM)
-
-  if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then
-    # delete all network tuner entries
-    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
-    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
-    echo "" >>$SUNDTEK_CONF_TMP
-    # remove empty lines at the end of file
-    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-    # add entries
-    echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
-    for dev in $(seq 0 $DEVICE1_NUM); do
-      echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
-    done
-    if [ -n "$DEVICE2_IP" ]; then
-      for dev in $(seq 0 $DEVICE2_NUM); do
-        echo "device=$DEVICE2_IP:$dev" >>$SUNDTEK_CONF_TMP
-      done
-      if [ -n "$DEVICE3_IP" ]; then
-        for dev in $(seq 0 $DEVICE3_NUM); do
-          echo "device=$DEVICE3_IP:$dev" >>$SUNDTEK_CONF_TMP
-        done
-        if [ -n "$DEVICE4_IP" ]; then
-          for dev in $(seq 0 $DEVICE4_NUM); do
-            echo "device=$DEVICE4_IP:$dev" >>$SUNDTEK_CONF_TMP
-          done
-          if [ -n "$DEVICE5_IP" ]; then
-            for dev in $(seq 0 $DEVICE5_NUM); do
-              echo "device=$DEVICE5_IP:$dev" >>$SUNDTEK_CONF_TMP
-            done
-          fi
-        fi
-      fi
-    fi
-  else
-    # delete all network tuner entries
-    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
-    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
-    echo "" >>$SUNDTEK_CONF_TMP
-    # remove empty lines at the end of file
-    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-  fi
-
-  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
-    # get tuner serial numbers
-    SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
-    . /var/config/sundtek-addon.conf
-
-    for SERIAL in $SERIALS; do
-      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
-      IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
-      KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
-
-      if [ "$DVBMODE" = "DVB-T" ]; then
-        # only set DVB-T because default is DVB-C (and DVB-S is not set either)
-        DVBMODE="DVBT"
-      else
-        DVBMODE=""
-      fi
-
-      [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
-
-      [ ! -f $KEYMAP ] && KEYMAP=""
-
-      # remove setttings for this tuner
-      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
-      mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
-      echo "" >>$SUNDTEK_CONF_TMP
-      # remove empty lines at the end of file
-      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-
-      ADDNEW=true
-      if [ -n "$DVBMODE" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP
-      fi
-      if [ -n "$IRPROT" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
-      fi
-      if [ -n "$KEYMAP" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
-      fi
-
-      echo "" >>$SUNDTEK_CONF_TMP
-    done
-  fi
-
-  md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
-  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
-  if [ "$md5_1" != "$md5_2" ]; then
-    # file changed - copy to addon home
-    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
-  fi
-
-  chmod +x $SUNDTEK_ADDON_DIR/bin/*
-  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
-
-  # wait few seconds
-  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
-  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
-  if [ $SETTLE_TIME -gt 0 ]; then
-    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
-    sleep $SETTLE_TIME
-  fi
-
-  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
-    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
-    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
-    sh /var/run/sundtek-userscript.sh
-  fi
-
-  # save adapter serial number
-  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
-  serial_number_new=$(mediaclient -e | awk '/device / {print $0} /SERIAL/ {id=1} /ID:/ {if (id==1) print $2}')
-  if [ "$serial_number_old" != "$serial_number_new" ]; then
-    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
-  fi
-fi
-
-logger -t Sundtek "### Sundtek ready ###"
--- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      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/>.
-################################################################################
-
-. /etc/profile
-
-SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
-
-trap_exit_install() {
-  kodi-send -a "Notification(Sundtek, Something went wrong. Cleaning..., 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd "$SUNDTEK_ADDON_DIR"
-  rm -fr tmp
-  exit 5
-}
-
-# kill process
-systemctl stop driver.dvb.sundtek-mediatv
-killall -9 mediaclient &>/dev/null
-killall -9 mediasrv &>/dev/null
-
-# exit on errors
-set -e
-
-trap trap_exit_install EXIT
-
-cd "$SUNDTEK_ADDON_DIR"
-rm -fr tmp
-mkdir tmp
-cd tmp
-
-logger -t Sundtek "### Starting updating driver ###"
-kodi-send -a "Notification(Sundtek, Starting updating driver, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
-
-wget -O ../version.used http://sundtek.de/media/latest.phtml
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Can't get latest version ###"
-  kodi-send -a "Notification(Sundtek, Cant get latest version, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp/
-  exit 1
-fi
-
-ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
-if [ "$ARCH" = "x86_64" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
-elif [ "$ARCH" = "i386" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
-elif [ "$ARCH" = "arm" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
-else
-  logger -t Sundtek "### Unsupported architecture ###"
-  kodi-send -a "Notification(Sundtek, Unsupported architecture, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp
-  exit 2
-fi
-
-logger -t Sundtek "### Downloading driver archive for $ARCH ###"
-kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
-wget -O installer.tar.gz $INSTALLER_URL
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Archive damaged ###"
-  kodi-send -a "Notification(Sundtek, Download failed, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp/
-  exit 3
-fi
-
-logger -t Sundtek "### Extracting archive ###"
-kodi-send -a "Notification(Sundtek, Extracting archive, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
-tar -xzf installer.tar.gz
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Archive damaged ###"
-  kodi-send -a "Notification(Sundtek, Archive damaged, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp/
-  exit 4
-fi
-
-# fix permissions
-chmod -R 755 opt/ etc/
-
-rm -f  opt/bin/getinput.sh
-rm -f  opt/bin/lirc.sh
-rm -fr opt/lib/pm/
-
-cp -Pa opt/bin/* ../bin/
-cp -Pa opt/lib/* ../lib/
-
-cd ..
-rm -fr tmp
-
-logger -t Sundtek "### Driver update finished ###"
-kodi-send -a "Notification(Sundtek, Driver update finished, 5000, $SUNDTEK_ADDON_DIR/icon.png)"
-kodi-send -a "Notification(Sundtek, Please reboot, 5000, $SUNDTEK_ADDON_DIR/icon.png)"
-
-trap - EXIT
-
-systemctl start driver.dvb.sundtek-mediatv
-
-exit 0
--- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
@@ -2,7 +2,7 @@

 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -20,11 +20,223 @@

 . /etc/profile

-SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
+# start locking mechanism - allows only one instance to be run at a time
+SUNDTEK_LOCKFILE="/var/lock/userspace-driver-sundtek.lck"
+SUNDTEK_LOCKFD=99
+# obtain an exclusive lock
+exlock() { eval "exec $SUNDTEK_LOCKFD>\"$SUNDTEK_LOCKFILE\""; flock -x $SUNDTEK_LOCKFD; }
+# drop a lock
+unlock() { flock -u $SUNDTEK_LOCKFD; flock -xn $SUNDTEK_LOCKFD && rm -f "$SUNDTEK_LOCKFILE"; }
+# end locking mechanism

-if [ -f $SUNDTEK_ADDON_DIR/lib/libmediaclient.so ]; then
-  logger -t Sundtek "### Preloading library ###"
-  export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
+# exclusive lock
+exlock
+
+net_tuner_num_fix() {
+  local num=$1
+
+  [ -z "$num" ] && num=1
+  num=$(( $num *1 ))
+  [ $num -lt 1 ] && num=1
+  num=$(( $num -1 ))
+  echo $num
+}
+
+SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
+
+mkdir -p $SUNDTEK_ADDON_HOME
+
+if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
+  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
 else
-  logger -t Sundtek "### Preloading library doesn't exist ###"
+  # in case of missing entries in addon home's sundtek.conf
+  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
+  if [ -z "$entry_set" ]; then
+    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+
+    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
+  fi
 fi
+
+if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
+  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
+fi
+
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
+
+mkdir -p /var/config
+cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+. /var/config/sundtek-addon.conf
+
+export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
+
+if [ -z "$(pidof mediasrv)" ]; then
+  rm -f /var/log/mediasrv.log
+  rm -f /var/log/mediaclient.log
+
+  SUNDTEK_CONF_TMP=/tmp/sundtek.conf
+  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
+
+  [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
+  sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
+
+  # enable HW PID filter
+  if [ "$ENABLE_HW_PID_FILTER" = "true" ]; then
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=off|g' $SUNDTEK_CONF_TMP
+  fi
+
+  # enable IR receiver
+  if [ "$ENABLE_IR_RECEIVER" = "true" ]; then
+    sed -i 's|^ir_disabled=.*|ir_disabled=0|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^ir_disabled=.*|ir_disabled=1|g' $SUNDTEK_CONF_TMP
+  fi
+
+  if [ "$ALLOW_NET_USE" = "true" ]; then
+    sed -i 's|^enablenetwork=.*|enablenetwork=on|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^enablenetwork=.*|enablenetwork=off|g' $SUNDTEK_CONF_TMP
+  fi
+
+  [ "$DEVICE1_IP" = "0.0.0.0" ] && DEVICE1_IP=""
+  [ "$DEVICE2_IP" = "0.0.0.0" ] && DEVICE2_IP=""
+  [ "$DEVICE3_IP" = "0.0.0.0" ] && DEVICE3_IP=""
+  [ "$DEVICE4_IP" = "0.0.0.0" ] && DEVICE4_IP=""
+  [ "$DEVICE5_IP" = "0.0.0.0" ] && DEVICE5_IP=""
+  DEVICE1_NUM=$(net_tuner_num_fix $DEVICE1_NUM)
+  DEVICE2_NUM=$(net_tuner_num_fix $DEVICE2_NUM)
+  DEVICE3_NUM=$(net_tuner_num_fix $DEVICE3_NUM)
+  DEVICE4_NUM=$(net_tuner_num_fix $DEVICE4_NUM)
+  DEVICE5_NUM=$(net_tuner_num_fix $DEVICE5_NUM)
+
+  if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then
+    # delete all network tuner entries
+    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
+    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
+    echo "" >>$SUNDTEK_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+    # add entries
+    echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
+    for dev in $(seq 0 $DEVICE1_NUM); do
+      echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
+    done
+    if [ -n "$DEVICE2_IP" ]; then
+      for dev in $(seq 0 $DEVICE2_NUM); do
+        echo "device=$DEVICE2_IP:$dev" >>$SUNDTEK_CONF_TMP
+      done
+      if [ -n "$DEVICE3_IP" ]; then
+        for dev in $(seq 0 $DEVICE3_NUM); do
+          echo "device=$DEVICE3_IP:$dev" >>$SUNDTEK_CONF_TMP
+        done
+        if [ -n "$DEVICE4_IP" ]; then
+          for dev in $(seq 0 $DEVICE4_NUM); do
+            echo "device=$DEVICE4_IP:$dev" >>$SUNDTEK_CONF_TMP
+          done
+          if [ -n "$DEVICE5_IP" ]; then
+            for dev in $(seq 0 $DEVICE5_NUM); do
+              echo "device=$DEVICE5_IP:$dev" >>$SUNDTEK_CONF_TMP
+            done
+          fi
+        fi
+      fi
+    fi
+  else
+    # delete all network tuner entries
+    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
+    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
+    echo "" >>$SUNDTEK_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+  fi
+
+  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
+    # get tuner serial numbers
+    SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
+    . /var/config/sundtek-addon.conf
+
+    for SERIAL in $SERIALS; do
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
+      IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
+      KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
+
+      if [ "$DVBMODE" = "DVB-T" ]; then
+        # only set DVB-T because default is DVB-C (and DVB-S is not set either)
+        DVBMODE="DVBT"
+      else
+        DVBMODE=""
+      fi
+
+      [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
+
+      [ ! -f $KEYMAP ] && KEYMAP=""
+
+      # remove setttings for this tuner
+      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
+      mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
+      echo "" >>$SUNDTEK_CONF_TMP
+      # remove empty lines at the end of file
+      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+
+      ADDNEW=true
+      if [ -n "$DVBMODE" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP
+      fi
+      if [ -n "$IRPROT" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
+      fi
+      if [ -n "$KEYMAP" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
+      fi
+
+      echo "" >>$SUNDTEK_CONF_TMP
+    done
+  fi
+
+  md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
+  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
+  if [ "$md5_1" != "$md5_2" ]; then
+    # file changed - copy to addon home
+    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
+  fi
+
+  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
+
+  # wait few seconds
+  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
+  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
+  if [ $SETTLE_TIME -gt 0 ]; then
+    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
+    sleep $SETTLE_TIME
+  fi
+
+  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
+    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
+    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
+    sh /var/run/sundtek-userscript.sh
+  fi
+(
+  # save adapter serial number in background
+  sleep 5
+  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
+  serial_number_new=$(mediaclient.bin -e | awk '/device / {print $0} /ID:/ {print $2}')
+  if [ "$serial_number_old" != "$serial_number_new" ]; then
+    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
+  fi
+)&
+fi
+
+logger -t Sundtek "### Sundtek ready ###"
+
+# unlock the lock
+unlock
--- a/packages/addons/driver/sundtek-mediatv/source/default.py
+++ b/packages/addons/driver/sundtek-mediatv/source/default.py
@@ -15,3 +15,22 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
+
+import os
+import sys
+import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
+
+__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient.bin'))
+__ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
+__mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
+
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_sundtek_tuners
+  refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
+  __settings__.openSettings()
--- a/packages/addons/driver/sundtek-mediatv/source/resources/actions.py
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/actions.py
@@ -1,45 +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/>.
-################################################################################
-
-import os
-import sys
-import subprocess
-import xbmcaddon
-
-__settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
-__cwd__           = __settings__.getAddonInfo('path')
-__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
-__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
-
-__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
-__mediaclient_e__ = __mediaclient__ + ' -e'
-__update_sh__     = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'sundtek-update-driver.sh'))
-
-if len(sys.argv) == 2:
-  if sys.argv[1] == 'refresh_tuners':
-    print "sundtek refresh tuners"
-    sys.path.append(__resources_lib__)
-    from functions import refresh_sundtek_tuners
-    refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
-    __settings__.openSettings()
-  elif sys.argv[1] == 'update_driver':
-    print "sundtek update driver"
-    proc = subprocess.Popen([__update_sh__], shell = True)
-    return_code = proc.wait()
-    print "sundtek update driver return value " + str(return_code)
-    __settings__.openSettings()
--- a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
@@ -27,8 +27,4 @@
  <string id="9010">Refresh tuners... (press me)</string>
  <string id="9020">    IR protocol</string>
  <string id="9030">    keymap filename</string>
-
-  <string id="3000">Driver</string>
-  <string id="3020">Check for new driver version at boot</string>
-  <string id="3010">Update from web... (press me)</string>
 </strings>
--- a/packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -22,7 +22,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom

-__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'

 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist
--- a/packages/addons/driver/sundtek-mediatv/source/resources/lib/xmlpp.py
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/lib/xmlpp.py
@@ -37,39 +37,36 @@ def _usage(this_file):
    return """SYNOPSIS: pretty print an XML document
 USAGE: python %s <filename> \n""" % this_file

-def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
    if line.strip():
        start = ""
        number_chars = 0
        for l in range(indent_level):
            start = start + " "
            number_chars = number_chars + 1
-        if not ignore_contents:
-            try:
-                elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
-                elem_finished = _re.findall("([?|\]\]/|\-\-]*\>)", line)[0] 
-                #should not have *
-                attrs = _re.findall("(\S*?\=\".*?\")", line)
-                output.write(start + elem_start)
-                number_chars = len(start + elem_start)
-                for attr in attrs:
-                    if (attrs.index(attr) + 1) == len(attrs):
-                        number_chars = number_chars + len(elem_finished)
-                    if (number_chars + len(attr) + 1) > width:
-                        output.write("\n")
-                        for i in range(len(start + elem_start) + 1):
-                            output.write(" ")
-                        number_chars = len(start + elem_start) + 1 
-                    else:
+        try:
+            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
+            #should not have *
+            attrs = _re.findall("(\S*?\=\".*?\")", line)
+            output.write(start + elem_start)
+            number_chars = len(start + elem_start)
+            for attr in attrs:
+                if (attrs.index(attr) + 1) == len(attrs):
+                    number_chars = number_chars + len(elem_finished)
+                if (number_chars + len(attr) + 1) > width:
+                    output.write("\n")
+                    for i in range(len(start + elem_start) + 1):
                        output.write(" ")
-                        number_chars = number_chars + 1
-                    output.write(attr)
-                    number_chars = number_chars + len(attr)
-                output.write(elem_finished + "\n")
-            except IndexError:
-                #give up pretty print this line
-                output.write(start + line + "\n")
-        else:
+                    number_chars = len(start + elem_start) + 1 
+                else:
+                    output.write(" ")
+                    number_chars = number_chars + 1
+                output.write(attr)
+                number_chars = number_chars + len(attr)
+            output.write(elem_finished + "\n")
+        except IndexError:
+            #give up pretty print this line
            output.write(start + line + "\n")
                

@@ -83,8 +80,7 @@ def _get_next_elem(data):
    start_pos = data.find("<")
    end_pos = data.find(">") + 1
    retval = data[start_pos:end_pos]
-    stopper = retval.rfind("/")
-    ignore_contents = False
+    stopper = retval.rfind("/") 
    if stopper < retval.rfind("\""):
        stopper = -1
    single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
@@ -93,19 +89,11 @@ def _get_next_elem(data):
    ignore_question =  retval.find("<?") > -1

    if ignore_excl:
-        ignore_contents = True
        cdata = retval.find("<![CDATA[") > -1
        if cdata:
            end_pos = data.find("]]>")
            if end_pos > -1:
                end_pos = end_pos + len("]]>")
-                stopper = end_pos
-        else:
-            end_pos = data.find("-->")
-            if end_pos > -1:
-                end_pos = end_pos + len("-->")
-                stopper = end_pos
-        retval = data[start_pos:end_pos]

    elif ignore_question:
        end_pos = data.find("?>") + len("?>")
@@ -113,12 +101,11 @@ def _get_next_elem(data):
    
    no_indent = ignore or single

-    
+    #print retval, end_pos, start_pos, stopper > -1, no_indent
    return start_pos, \
           end_pos, \
           stopper > -1, \
-           no_indent, \
-           ignore_contents
+           no_indent

 def get_pprint(xml, indent=4, width=80):
    """Returns the pretty printed xml """
@@ -129,8 +116,6 @@ def get_pprint(xml, indent=4, width=80):
            self.output += string
    out = out()
    pprint(xml, output=out, indent=indent, width=width)
-    
-

    return out.output

@@ -141,7 +126,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
    Use indent to select indentation level. Default is 4   """
    data = xml
    indent_level = 0
-    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
    while ((start_pos > -1 and end_pos > -1)):
        _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                             output=output)
@@ -151,8 +136,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        _pprint_line(indent_level, 
                     data[:end_pos - start_pos], 
                     width=width,
-                     output=output,
-                     ignore_contents=ignore_contents)
+                     output=output)
        data = data[end_pos - start_pos:]
        if not is_stop and not no_indent :
            indent_level = indent_level + indent
@@ -160,7 +144,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        if not data:
            break
        else:
-            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
    

 if __name__ == "__main__":
--- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
@@ -27,11 +27,6 @@
  <category label="9000">
    <setting type="sep" />
    <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" id="refresh_tuners" action="RunScript($CWD/resources/actions.py, refresh_tuners)" />
-  </category>
-  <category label="3000">
-    <setting type="sep" />
-    <setting id="CHECK_BOOT" type="bool" label="3020" default="false" />
-    <setting label="3010" option="close" type="action" id="update_driver" action="RunScript($CWD/resources/actions.py, update_driver)" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
  </category>
 </settings>
--- a/packages/addons/driver/sundtek-mediatv/source/sleep.d/99-sundtek-mediatv.power
+++ b/packages/addons/driver/sundtek-mediatv/source/sleep.d/99-sundtek-mediatv.power
@@ -25,10 +25,9 @@ oe_setup_addon driver.dvb.sundtek-mediatv
 if [ "$SUSPEND_DRIVER" = "true" ]; then
  case "$1" in
    pre)
-      systemctl stop driver.dvb.sundtek-mediatv.service
+      killall -9 mediasrv &>/dev/null
      ;;
    post)
-    	systemctl start driver.dvb.sundtek-mediatv.service
      ;;
  esac
 fi
--- a/packages/addons/driver/sundtek-mediatv/source/system.d/driver.dvb.sundtek-mediatv.service
+++ b/packages/addons/driver/sundtek-mediatv/source/system.d/driver.dvb.sundtek-mediatv.service
@@ -1,12 +0,0 @@
-[Unit]
-Description=Sundtek driver service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=-/bin/sh -c "exec sh /storage/.kodi/addons/driver.dvb.sundtek-mediatv/bin/sundtek-mediatv.start"
-ExecStop=-/bin/sh -c "exec sh /storage/.kodi/addons/driver.dvb.sundtek-mediatv/bin/sundtek-mediatv.stop"
-RemainAfterExit=yes
-
-[Install]
-WantedBy=kodi.target
--- a/packages/addons/repository/repository.unofficial.addon.pro/package.mk
+++ b/packages/addons/repository/repository.unofficial.addon.pro/package.mk
@@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.3"
-PKG_REV="4"
+PKG_VERSION="4.1.2"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"
@@ -41,9 +41,7 @@ PKG_MAINTAINER="unofficial.addon.pro"
 make_target() {
  $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
     -e "s|@PROJECT@|$PROJECT|g" \
-     -e "s|@ARCH@|$TARGET_ARCH|g" \
-     -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
-     -e "s|@PKG_REV@|$PKG_REV|g"\
+     -e "s|@ARCH@|$ARCH|g" \
  -i addon.xml
 }

--- a/packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml
+++ b/packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="repository.unofficial.addon.pro"
-                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] (@PROJECT@/@ARCH@) Add-ons"
-                version="@PKG_VERSION@.@PKG_REV@"
+                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] Mediacenter OS Add-ons"
+                version="4.1.2"
                provider-name="unofficial.addon.pro">
        <extension point="xbmc.addon.repository"
                name="Unofficial OpenELEC.tv Add-on Repository">
@@ -12,10 +12,7 @@
        <extension point="xbmc.addon.metadata">
                <summary>Unofficial addon repository for OpenELEC</summary>
                <description>
-[COLOR red]=== BIG FAT WARNING ===[/COLOR]
-Use this repository at your own risk.
-If your house gets burned, it's your fault, not ours.
-We give no guarantee. We give no support.
+[COLOR orange]Use with care. There will be NO end user support for addons in this repository[/COLOR]
                </description>
                <disclaimer>This is an unofficial addon repository. please don't ask for support in openelec forum / irc channel</disclaimer>
                <platform>all</platform>
--- a/packages/addons/repository/repository.unofficial.addon.pro/sources/changelog.txt
+++ b/packages/addons/repository/repository.unofficial.addon.pro/sources/changelog.txt
@@ -1,9 +1,3 @@
-4.3.3
- rebuild
-
-4.3.2
- rebuild for addon api bump
-
 4.1.2
 - fix typo in repository name

--- a/packages/addons/repository/repository.unofficial.addon.pro/sources/icon.png
+++ b/packages/addons/repository/repository.unofficial.addon.pro/sources/icon.png
--- a/packages/addons/service/multimedia/boblightd/changelog.txt
+++ b/packages/addons/service/multimedia/boblightd/changelog.txt
@@ -1,12 +1,3 @@
-4.3.5
- added boblight-aml
-
-4.3.4
- update to kodi
-
-4.3.0
- rebuild for addon api bump
-
 4.1.2
 - rebuild for xlib changes

--- a/packages/addons/service/multimedia/boblightd/package.mk
+++ b/packages/addons/service/multimedia/boblightd/package.mk
@@ -18,7 +18,7 @@

 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="5"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
@@ -42,7 +42,7 @@ if [ "$OPENGL_SUPPORT" = "yes" ] ; then
  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu"
 fi

-if [ "$OPENGL" = "no" ]; then
+if [ ! "$OPENGL" = "Mesa" ]; then
  EXTRAOPTS="--without-opengl"
 fi

@@ -63,7 +63,6 @@ addon() {
  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-aml $ADDON_BUILD/$PKG_ADDON_ID/bin
  if [ "$DISPLAYSERVER" = "x11" ] ; then
    cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
  fi
--- a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-add_aml_client.patch
+++ b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-add_aml_client.patch
@@ -1,632 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9ba5381..c5a4dc6 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -7,6 +7,7 @@ AM_CFLAGS =\
- 	 -g
- 
- bin_PROGRAMS = boblightd \
-+	boblight-aml \
- 	boblight-constant
-         
- 
-@@ -19,6 +20,11 @@ endif
- 
- endif
- 
-+boblight_aml_SOURCES  = clients/boblight-aml/boblight-aml.cpp
-+boblight_aml_SOURCES += clients/boblight-aml/flagmanager-aml.cpp
-+boblight_aml_SOURCES += clients/flagmanager.cpp
-+boblight_aml_SOURCES += util/misc.cpp
-+
- boblight_v4l_SOURCES = \
- 	clients/boblight-v4l/boblight-v4l.cpp \
- 	clients/boblight-v4l/flagmanager-v4l.cpp \
-diff -urPp src/clients/boblight-aml.cpp src/clients/boblight-aml/boblight-aml.cpp
--- /dev/null	Thu Jan  1 00:00:00 1970
-+++ b/src/clients/boblight-aml/boblight-aml.cpp	Thu Jan 15 10:24:16 2015
-@@ -0,0 +1,491 @@
-+/*
-+ * boblight
-+ * Copyright (C) Bob  2009 
-+ * 
-+ * boblight 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 3 of the License, or
-+ * (at your option) any later version.
-+ * 
-+ * boblight 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define BOBLIGHT_DLOPEN
-+#include "lib/boblight.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <signal.h>
-+#include <algorithm>
-+
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <sys/stat.h>
-+#include <sys/poll.h>
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/ioctl.h>
-+
-+#include "config.h"
-+#include "util/misc.h"
-+#include "util/timeutils.h"
-+#include "flagmanager-aml.h"
-+
-+using namespace std;
-+
-+//from linux/amlogic/amports/amvideocap.h
-+#define AMVIDEOCAP_IOC_MAGIC 'V'
-+#define AMVIDEOCAP_IOW_SET_WANTFRAME_WIDTH      _IOW(AMVIDEOCAP_IOC_MAGIC, 0x02, int)
-+#define AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT     _IOW(AMVIDEOCAP_IOC_MAGIC, 0x03, int)
-+
-+
-+// helper class - tries to load the "movie" settings from the script.xbmc.boblight addon
-+// and pass them to the boblight-aml client
-+class CBoblightAddonSettings
-+{
-+  public:
-+    CBoblightAddonSettings() : m_bobdisable(false), m_settingsLoaded(false)
-+    { 
-+      m_settingsLoaded = loadBoblightAddonSettings();
-+    }
-+
-+    std::string getBoblightClientCmdLine()
-+    {
-+      std::string cmdLine = "";
-+      //convert bool string to lowercase
-+      transform(m_interpolation.begin(), m_interpolation.end(), m_interpolation.begin(), ::tolower);
-+
-+      cmdLine += "-s " + m_ip + ":" + m_port;
-+      cmdLine += " -o autospeed=" + m_autospeed;
-+      cmdLine += " -o interpolation=" + m_interpolation;
-+      cmdLine += " -o saturation=" + m_saturation;
-+      cmdLine += " -o speed=" + m_speed;
-+      cmdLine += " -o threshold=" + m_threshold;
-+      cmdLine += " -o value=" + m_value;
-+      return cmdLine;
-+    }
-+
-+    bool m_bobdisable;
-+    bool m_settingsLoaded;
-+    std::string m_ip;
-+    std::string m_port;
-+    std::string m_autospeed;
-+    std::string m_interpolation;
-+    std::string m_saturation;
-+    std::string m_speed;
-+    std::string m_threshold;
-+    std::string m_value;
-+
-+  private:
-+    #define SETTINGS_ATTR_BOBDISABLE     "bobdisable"
-+    #define SETTINGS_ATTR_IP             "hostip"
-+    #define SETTINGS_ATTR_PORT           "hostport"
-+    #define SETTINGS_ATTR_AUTOSPEED      "movie_autospeed"
-+    #define SETTINGS_ATTR_INTERPOLATION  "movie_interpolation"
-+    #define SETTINGS_ATTR_SATURATION     "movie_saturation"
-+    #define SETTINGS_ATTR_SPEED          "movie_speed"
-+    #define SETTINGS_ATTR_THRESHOLD      "movie_threshold"
-+    #define SETTINGS_ATTR_VALUE          "movie_value"
-+    #define KODI_HOME_ENV_VAR            "HOME"
-+
-+    bool loadBoblightAddonSettings()
-+    {
-+      bool ret = false;
-+      char *kodiHome = getenv(KODI_HOME_ENV_VAR);
-+      //fallback to custom settings file in case boblight addon is not installed
-+      std::string settingsFile = "/storage/boblight-aml.xml";
-+
-+      if (kodiHome != NULL)
-+      {
-+        settingsFile = std::string(kodiHome) + "/.kodi/userdata/addon_data/script.xbmc.boblight/settings.xml";
-+      }
-+
-+      FILE *fd = fopen(settingsFile.c_str(), "r");
-+
-+      if (fd != NULL)
-+      {
-+        fseek(fd, 0, SEEK_END);
-+        size_t fileSize = ftell(fd);
-+        fseek(fd, 0, SEEK_SET);
-+        if (fileSize > 0)
-+        {
-+          if (fileSize > 32000)//read 16k max - there shouldn't be a bigger settings.xml from boblight [tm]
-+            fileSize = 32000;
-+          char *xmlBuffer = new char[fileSize];
-+          size_t readCount = fread(xmlBuffer, fileSize, 1, fd);
-+          fclose(fd);
-+
-+          if (readCount == 1)
-+          {
-+            parseBoblightSettings(std::string(xmlBuffer));
-+            ret = true;
-+          }
-+          else
-+          {
-+            fprintf(stderr, "Failed reading boblight addon settings.xml");
-+          }
-+          delete[] xmlBuffer;
-+        }
-+      }
-+      return ret;
-+    }
-+
-+    void parseBoblightSettings(std::string xmlBuffer)
-+    {
-+      std::string settings_bobdisable_str;
-+      settings_bobdisable_str = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_BOBDISABLE);
-+      if (settings_bobdisable_str == "true" || settings_bobdisable_str == "True")
-+        m_bobdisable = true;
-+
-+      m_ip = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_IP);
-+      m_port = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_PORT);
-+      m_autospeed = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_AUTOSPEED);
-+      m_interpolation = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_INTERPOLATION);
-+      m_saturation = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_SATURATION);
-+      m_speed = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_SPEED);
-+      m_threshold = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_THRESHOLD);
-+      m_value = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_VALUE);
-+    }
-+
-+    std::string getValueFromXmlBuffer(const std::string &xmlBuffer, const char* xmlAttribute)
-+    {
-+      size_t strPos = 0;
-+      std::string valueStr;
-+
-+      // each line in the xml looks like this:
-+      // <setting id="movie_value" value="1.000006" />
-+      // find the attribute
-+      if ((strPos = xmlBuffer.find(xmlAttribute)) != std::string::npos)
-+      {
-+        size_t strPos2 = 0;
-+        // from movie_value" value="1.000006" /> look for "value"
-+        if ((strPos2 = xmlBuffer.find("value", strPos)) != std::string::npos)
-+        {
-+          size_t strPos3 = 0;
-+          // from value="1.000006" /> look for "="
-+          if ((strPos3 = xmlBuffer.find("=", strPos2)) != std::string::npos)
-+          {
-+            //extract the value - strPos3 points to ="1.000006"
-+            int valueOffset = 1; //skip the "="
-+            if (xmlBuffer[strPos3 + valueOffset] == '"')
-+              valueOffset++;//skip " if needed
-+            int strLen = 0;
-+            do
-+            {
-+              // value stops with " or space
-+              if (xmlBuffer[strPos3 + valueOffset + strLen] == '"' ||
-+                xmlBuffer[strPos3 + valueOffset + strLen] == ' ')
-+                break;
-+              strLen++;
-+            } while (strLen < 20);// no insane xml garbage ...
-+
-+            valueStr = xmlBuffer.substr(strPos3 + valueOffset, strLen);
-+          }
-+        }
-+      }
-+      return valueStr;
-+    }
-+};
-+
-+struct aml_snapshot_t {
-+  unsigned int  dst_width;
-+  unsigned int  dst_height;
-+  unsigned int  dst_stride;
-+  unsigned int  dst_size;
-+  void         *dst_vaddr;
-+};
-+
-+volatile bool g_stop = false;
-+CFlagManagerAML g_flagmanager;
-+/*********************************************************
-+ *********************************************************/
-+static void SignalHandler(int signum)
-+{
-+  if (signum == SIGTERM)
-+  {
-+    fprintf(stderr, "caught SIGTERM\n");
-+    g_stop = true;
-+  }
-+  else if (signum == SIGINT)
-+  {
-+    fprintf(stderr, "caught SIGTERM\n");
-+    g_stop = true;
-+  }
-+}
-+
-+#define VIDEO_PATH       "/dev/amvideo"
-+#define AMSTREAM_IOC_MAGIC  'S'
-+#define AMSTREAM_IOC_GET_VIDEO_DISABLE  _IOR(AMSTREAM_IOC_MAGIC, 0x48, unsigned long)
-+static int amvideo_utils_video_playing()
-+{
-+  int video_fd;
-+  int video_disable;
-+
-+  video_fd = open(VIDEO_PATH, O_RDWR);
-+  if (video_fd < 0) {
-+    return -1;
-+  }
-+
-+  ioctl(video_fd, AMSTREAM_IOC_GET_VIDEO_DISABLE, &video_disable);
-+  if (video_disable)
-+  {
-+    close(video_fd);
-+    return 1;
-+  }
-+
-+  close(video_fd);
-+
-+//  fprintf(stderr, "pos x %d y %d w %d h %d\n",snapshot.src_x, snapshot.src_y,snapshot.src_width,snapshot.src_height);
-+  return 0;
-+}
-+
-+static int capture_frame(int fd, aml_snapshot_t &snapshot)
-+{
-+  int ret = 0;
-+  
-+  ssize_t readResult = pread(fd, snapshot.dst_vaddr, snapshot.dst_size, 0);
-+
-+  if (readResult < snapshot.dst_size)
-+  {
-+    fprintf(stderr, "frame read returned %d\n", readResult);
-+  }
-+  //fprintf(stderr, "requ: %d read %d \n", snapshot.dst_size, readResult);
-+  fprintf(stderr, ".");
-+  return ret;
-+}
-+
-+static int configure_capture(int fd, aml_snapshot_t &snapshot)
-+{
-+  int ret = 0;
-+  int ioctlret = 0;
-+
-+  if ((ioctlret = ioctl(fd, AMVIDEOCAP_IOW_SET_WANTFRAME_WIDTH, snapshot.dst_width)) != 0)
-+  {
-+    ret = 2;
-+    fprintf(stderr, "Error setting frame width (ret: %d errno: %d)\n", ioctlret, errno);
-+  }
-+    
-+  
-+  if ((ioctlret = ioctl(fd, AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT, snapshot.dst_height)) != 0)
-+  {
-+    ret = 3;
-+    fprintf(stderr, "Error setting frame height (ret: %d errno: %d)\n", ioctlret, errno);
-+  }
-+
-+  return ret;
-+}
-+
-+static void frameToboblight(void *boblight, uint8_t* outputptr, int w, int h, int stride)
-+{
-+  if (!boblight)
-+  {
-+    fprintf(stderr, "no boblight\n");
-+    return;
-+  }
-+  if (!outputptr)
-+  {
-+    fprintf(stderr, "no outputptr\n");
-+    return;
-+  }
-+  //read out pixels and hand them to libboblight
-+  uint8_t* buffptr;
-+  for (int y = h; y > 0; y--) {
-+    buffptr = outputptr + stride * y;
-+    for (int x = 0; x < w; x++) {
-+      int rgb[3];
-+      rgb[2] = *(buffptr++);
-+      rgb[1] = *(buffptr++);
-+      rgb[0] = *(buffptr++);
-+
-+      //fprintf(stdout, "frameToboblight: x(%d), y(%d)\n", x, y);
-+
-+      boblight_addpixelxy(boblight, x, y, rgb);
-+    }
-+  }
-+}
-+
-+static int Run(void* boblight)
-+{
-+  int snapshot_fd = -1;               
-+  aml_snapshot_t aml_snapshot = {0};
-+  int lastPriority = 255;
-+
-+  aml_snapshot.dst_width  = 160;
-+  aml_snapshot.dst_height = 160;
-+
-+  // calc stride, size and alloc mem
-+  aml_snapshot.dst_stride = aml_snapshot.dst_width  * 3;
-+  aml_snapshot.dst_size   = aml_snapshot.dst_stride * aml_snapshot.dst_height;
-+  aml_snapshot.dst_vaddr  = calloc(aml_snapshot.dst_size, 1);
-+
-+  fprintf(stdout, "Connection to boblightd config: width(%d), height(%d)\n",
-+    aml_snapshot.dst_width, aml_snapshot.dst_height);
-+  //tell libboblight how big our image is
-+  boblight_setscanrange(boblight, (int)aml_snapshot.dst_width, (int)aml_snapshot.dst_height);
-+
-+  while(!g_stop)
-+  {
-+    int64_t bgn = GetTimeUs();
-+
-+    if (snapshot_fd == -1) {
-+      snapshot_fd = open(g_flagmanager.m_device.c_str(), O_RDWR, 0);
-+
-+      if (snapshot_fd == -1) {
-+        sleep(1);
-+        continue;
-+      } else {
-+        fprintf(stdout, "snapshot_fd(%d) \n", snapshot_fd);
-+      }
-+    }
-+
-+    // match source ratio if possible
-+    if (amvideo_utils_video_playing() != 0) {
-+      if ( lastPriority != 255)
-+      {
-+        boblight_setpriority(boblight, 255);
-+        lastPriority = 255;
-+      }
-+      sleep(1);
-+      continue;
-+    }
-+
-+    if (configure_capture(snapshot_fd, aml_snapshot) == 0)
-+    {
-+      if (capture_frame(snapshot_fd, aml_snapshot) == 0)
-+      {
-+        // image to boblight convert.
-+        frameToboblight(boblight, (uint8_t*)aml_snapshot.dst_vaddr,
-+        aml_snapshot.dst_width, aml_snapshot.dst_height, aml_snapshot.dst_stride);
-+  
-+        if (lastPriority != g_flagmanager.m_priority)
-+        {
-+          boblight_setpriority(boblight, g_flagmanager.m_priority);
-+          lastPriority = g_flagmanager.m_priority;
-+        }
-+        if (!boblight_sendrgb(boblight, 1, NULL))
-+        {
-+          // some error happened, probably connection broken, so bitch and try again
-+          PrintError(boblight_geterror(boblight));
-+          boblight_destroy(boblight);
-+          continue;
-+        }
-+      }
-+      else
-+      {
-+        fprintf(stdout, "nap time\n");
-+        sleep(1);
-+      }
-+    }
-+    int64_t end = GetTimeUs();
-+    float calc_time_ms = (float)(end - bgn) / 1000.0;
-+    // throttle to 100ms max cycle rate
-+    calc_time_ms -= 100.0;
-+    if ((int)calc_time_ms < 0)
-+      usleep((int)(-calc_time_ms * 1000));
-+  }
-+
-+  // last image is black
-+  boblight_setpriority(boblight, 255);
-+  boblight_destroy(boblight);
-+  close(snapshot_fd);
-+  return 0;
-+}
-+
-+/*********************************************************
-+ *********************************************************/
-+int main(int argc, char *argv[])
-+{
-+  //load the boblight lib, if it fails we get a char* from dlerror()
-+  const char* boblight_error = boblight_loadlibrary(NULL);
-+  if (boblight_error)
-+  {
-+    PrintError(boblight_error);
-+    return 1;
-+  }
-+
-+  //try to parse the flags and bitch to stderr if there's an error
-+  try {
-+    g_flagmanager.ParseFlags(argc, argv);
-+  }
-+  catch (string error) {
-+    PrintError(error);
-+    g_flagmanager.PrintHelpMessage();
-+    return 1;
-+  }
-+  
-+  if (g_flagmanager.m_printhelp) {
-+    g_flagmanager.PrintHelpMessage();
-+    return 1;
-+  }
-+
-+  if (g_flagmanager.m_printboblightoptions) {
-+    g_flagmanager.PrintBoblightOptions();
-+    return 1;
-+  }
-+  
-+  // check if we only should generate a cmdline based
-+  // on settings from possible found boblight addon
-+  if (g_flagmanager.generateCmdLine)
-+  {
-+    CBoblightAddonSettings settings;
-+    string cmdLine = "-p 100"; //default cmdline just contains priority 100
-+
-+    if (settings.m_settingsLoaded)
-+      cmdLine += " " + settings.getBoblightClientCmdLine();
-+    fprintf(stdout, "%s", cmdLine.c_str());
-+    return 0;//exit
-+  }
-+
-+  fprintf(stderr, "Using device: %s \n", g_flagmanager.m_device.c_str());
-+
-+  //set up signal handlers
-+  signal(SIGINT,  SignalHandler);
-+  signal(SIGTERM, SignalHandler);
-+
-+  //keep running until we want to quit
-+  while(!g_stop) {
-+    //init boblight
-+    void* boblight = boblight_init();
-+
-+    fprintf(stdout, "Connecting to boblightd(%p)\n", boblight);
-+    
-+    //try to connect, if we can't then bitch to stderr and destroy boblight
-+    if (!boblight_connect(boblight, g_flagmanager.m_address, g_flagmanager.m_port, 5000000) ||
-+        !boblight_setpriority(boblight, 255)) {
-+      PrintError(boblight_geterror(boblight));
-+      fprintf(stdout, "Waiting 10 seconds before trying again\n");
-+      boblight_destroy(boblight);
-+      sleep(2);
-+      continue;
-+    }
-+
-+    fprintf(stdout, "Connection to boblightd opened\n");
-+
-+    //try to parse the boblight flags and bitch to stderr if we can't
-+    try {
-+      g_flagmanager.ParseBoblightOptions(boblight);
-+    }
-+    catch (string error) {
-+      PrintError(error);
-+      return 1;
-+    }
-+
-+    try {
-+      Run(boblight);
-+    }
-+    catch (string error) {
-+      PrintError(error);
-+      boblight_destroy(boblight);
-+      return 1;
-+    }
-+  }
-+  fprintf(stdout, "Exiting\n");
-+}
-diff -urPp src/clients/flagmanager-aml.cpp src/clients/boblight-aml/flagmanager-aml.cpp
--- /dev/null	Thu Jan  1 00:00:00 1970
-+++ b/src/clients/boblight-aml/flagmanager-aml.cpp	Thu Jan 15 10:21:40 2015
-@@ -0,0 +1,68 @@
-+/*
-+ * boblight
-+ * Copyright (C) Bob  2009 
-+ * 
-+ * boblight 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 3 of the License, or
-+ * (at your option) any later version.
-+ * 
-+ * boblight 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <iostream>
-+
-+#include "flagmanager-aml.h"
-+#include "util/misc.h"
-+#include "config.h"
-+
-+#define DEFAULT_CAPTURE_DEVICE "/dev/amvideocap0"
-+
-+using namespace std;
-+
-+CFlagManagerAML::CFlagManagerAML()
-+{
-+  // extend the flags -d -> device
-+  // -g -> only generate cmdline from possible found boblight addon settings.xml
-+  m_flags += "d:g";
-+  m_device = DEFAULT_CAPTURE_DEVICE;
-+  generateCmdLine = false;
-+}
-+
-+void CFlagManagerAML::ParseFlagsExtended(int& argc, char**& argv, int& c, char*& optarg)
-+{
-+  if (c == 'd') //devicename
-+  {
-+    if (optarg) //optional device
-+    {
-+      m_device = optarg;
-+    }
-+  }
-+  
-+  if (c == 'g') //generate cmdline
-+  {
-+    generateCmdLine = true;
-+  }
-+}
-+
-+void CFlagManagerAML::PrintHelpMessage()
-+{
-+  cout << "Usage: boblight-aml\n";
-+  cout << "\n";
-+  cout << "  options:\n";
-+  cout << "\n";
-+  cout << "  -p  priority, from 0 to 255, default is 128\n";
-+  cout << "  -s  address[:port], set the address and optional port to connect to\n";
-+  cout << "  -o  add libboblight option, syntax: [light:]option=value\n";
-+  cout << "  -l  list libboblight options\n";
-+  cout << "  -f  fork\n";
-+  cout << "  -d  <device> (defaults to " << m_device << ")\n";
-+  cout << "  -g  try to find the settings.xml file from boblight addon and return the cmdline to use its options\n";
-+  cout << "\n";
-+}
-diff -urPp src/clients/flagmanager-aml.h src/clients/boblight-aml/flagmanager-aml.h
--- /dev/null	Thu Jan  1 00:00:00 1970
-+++ b/src/clients/boblight-aml/flagmanager-aml.h	Thu Jan 15 10:20:15 2015
-@@ -0,0 +1,36 @@
-+/*
-+ * boblight
-+ * Copyright (C) Bob  2009 
-+ * 
-+ * boblight 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 3 of the License, or
-+ * (at your option) any later version.
-+ * 
-+ * boblight 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef FLAGMANAGERAML
-+#define FLAGMANAGERAML
-+
-+#include "clients/flagmanager.h"
-+
-+class CFlagManagerAML : public CFlagManager
-+{
-+  public:
-+    CFlagManagerAML();
-+    void ParseFlagsExtended(int& argc, char**& argv, int& c, char*& optarg);
-+
-+    void PrintHelpMessage();
-+    std::string m_device;           //device to open for amvideocap
-+    bool generateCmdLine;
-+
-+};
-+
-+#endif //FLAGMANAGERAML
-\ No newline at end of file
--- a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.start
+++ b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.start
@@ -35,10 +35,4 @@ if [ -x $ADDON_DIR/bin/boblight-X11 -a -e $ADDON_HOME/boblight.X11 ] ; then
  boblight-X11 -f >/dev/null 2>&1
 fi

-if [ -x $ADDON_DIR/bin/boblight-aml -a -e /dev/amvideocap0 ] ; then
-  #generates cmdline from boblight addon settings
-  CMDLINE=`boblight-aml -g`
-  boblight-aml $CMDLINE >/dev/null 2>&1 &
-fi
-
 exec boblightd -c $ADDON_HOME/boblight.conf > $ADDON_LOG_FILE 2>&1
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stephan Raue	1eb6601b01	config/version: set version to 4.1.1, set OS version to 4.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-16 23:41:25 +02:00
Stefan Saraev	ee8f958b24	nano: disable build of locales	2014-07-15 19:10:31 +02:00
Stephan Raue	5cfc0970e6	nano: disable utf8 support to fix buildissue if libncursesw is installed on hostsystem Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-15 07:56:59 +02:00
Stefan Saraev	2cb4263e1d	gputemp: fix nvidia/gputemp after `58a4990` thanks @ozolli	2014-07-14 19:20:26 +03:00
Stephan Raue	9f6d775373	tvheadend: add patch to remove -Werror from CFLAGS Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-14 18:17:09 +02:00
Stephan Raue	c24352bb9c	autoconf: add patch to support excluding of autoreconf steps, taken from openembedded Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-14 18:17:09 +02:00
Stephan Raue	f226045711	nano: update to nano-2.3.5 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-14 18:17:09 +02:00
Stephan Raue	af0a6a5a74	libssh: build without server support Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-14 18:17:09 +02:00
Stephan Raue	209537a1f4	libssh: add patch to support libgcrypt-1.6 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-13 01:39:45 +02:00
Stephan Raue	92fece8863	libgcrypt: update to libgcrypt-1.6.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-13 01:39:20 +02:00
Stephan Raue	46f29bef6a	xf86-video-nvidia: update to xf86-video-nvidia-340.24 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-12 07:26:58 +02:00
Stephan Raue	6ee540c9db	gpu-viv-bin-mx6q: update to gpu-viv-bin-mx6q-3.10.17-1.0.0-1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:36:02 +02:00
Stephan Raue	4ddeaf0de1	firmware-imx: update to firmware-imx-3.10.17-1.0.0 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:35:43 +02:00
Stephan Raue	a89f249e34	imx-vpu: update to imx-vpu-3.10.17-1.0.0 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:35:29 +02:00
Stephan Raue	65c853310c	libfslvpuwrap: update to libfslvpuwrap-1.0.46 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:35:06 +02:00
Stephan Raue	2cc1d17acf	projects/RPi/patches/xbmc: update RPi support patch Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:33:02 +02:00
Stephan Raue	8a683d20d4	projects/RPi/patches/linux: update RPi support patch Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:32:42 +02:00
Stephan Raue	f8ba96e15a	xbmc: update to xbmc-13-450924a Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:32:28 +02:00
Stephan Raue	076d2b7b7a	xf86-video-nvidia-legacy: update to xf86-video-nvidia-legacy-304.123 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:32:13 +02:00
Stephan Raue	cb00f7766f	remove package 'glamor-egl' Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:32:00 +02:00
Stephan Raue	fd9b716fb1	xf86-video-ati: depends now on package 'xorg-server' with GLAMOUR support Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:31:45 +02:00
Stephan Raue	9aef8656e5	xorg-server: build with internal GLAMOR support, depends on package 'libepoxy' Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:31:27 +02:00
Stephan Raue	cb6263f47b	new package: add package 'libepoxy' Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:31:12 +02:00
Stephan Raue	9aa5c09a99	xorg-server: update to xorg-server-1.15.99.904 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:30:57 +02:00
Stephan Raue	775d772283	e2fsprogs: update to e2fsprogs-1.42.11 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:30:43 +02:00
Stephan Raue	bcfb16d36f	libXi: update to libXi-1.7.3 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:30:12 +02:00
CvH	d55bdc60e5	tbs drivers: update to 140707 just to make the self builders happy	2014-07-11 21:29:48 +02:00
Stephan Raue	40ae7452c5	linux: update to linux-3.15.5 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-11 21:29:27 +02:00
Stefan Saraev	31e2e27e5b	projects/*/options: cleanup COREBOOT leftover	2014-07-11 21:27:22 +02:00
Stefan Saraev	5e43423610	service.openelec.settings: update to 0.3.19	2014-07-09 20:58:01 +03:00
Stephan Raue	13d358f2ec	xf86-input-evdev: update to xf86-input-evdev-2.9.0, depends now on 'inputproto', 'libevdev' and 'systemd' Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Stephan Raue	b0d5cd06bd	new package: add package 'libevdev' Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Stephan Raue	c4613084ae	pixman: update to pixman-0.32.6 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Stephan Raue	e71d24f1e7	xtrans: update to xtrans-1.3.4 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Stephan Raue	c5b3f6bede	libXfont: update to libXfont-1.4.99.901 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Stephan Raue	9ce6eaa52d	fontsproto: update to fontsproto-2.1.3 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Stephan Raue	3e892bf04f	Mesa: update to Mesa-10.2.3 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-08 16:54:37 +02:00
Frank van Klaveren	48fbb5d965	Update libhdhomerun to 20140604	2014-07-08 16:43:51 +02:00
Christian Hewitt	871cddef86	connman: allow user editable main.conf In recent months I have seen a number of cases where users need to change ‘prefer ethernet’ to ‘prefer wifi’ or where users are trying to enable tethering for ethernet or are running other daemons that add network interfaces that should not be auto-managed by comman. All of these require user editing of main.conf so this change moves main.conf to /storage where it can be tweaked under-the-hood if needed.	2014-07-07 22:57:22 +02:00
Stephan Raue	f87f66f043	linux: update to linux-3.15.4 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-07 22:03:45 +02:00
Stephan Raue	75e766144f	bcm2835-bootloader: update to bcm2835-bootloader-1e7d3d9 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-07 15:52:13 +02:00
Stephan Raue	d3b29a818a	bcm2835-driver: update to bcm2835-driver-1e7d3d9 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-07 15:52:04 +02:00
Stephan Raue	d626037681	ffmpeg: change to official release Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-06 20:25:27 +02:00
Stephan Raue	e7ee3388b3	bluez: update to bluez-5.21 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-05 17:50:42 +02:00
Stephan Raue	170904e48f	xf86-video-nvidia: update to xf86-video-nvidia-331.89 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-05 17:50:42 +02:00
Stephan Raue	f85aebd5a9	dbus: update to dbus-1.8.6 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-05 16:32:11 +02:00
Stephan Raue	7d8b588847	libffi: update to libffi-3.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-05 16:32:11 +02:00
Stephan Raue	c1e6aedfff	dbus-glib: update to dbus-glib-0.102 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-05 16:32:10 +02:00
Stefan Saraev	14116ea19e	systemd: update to systemd-215	2014-07-05 16:32:10 +02:00
Stefan Saraev	f1ca57d51e	systemd: drop double gcrypt depend	2014-07-05 16:32:10 +02:00
Stephan Raue	c5c1a71db4	eglibc: add package 'glibc, remove package 'eglibc', switch to 'glibc' as default libc Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-05 16:32:01 +02:00
Stefan Saraev	8f15030d77	xbmc: oe_setup_addon: create missing folder (early)	2014-07-04 19:07:31 +03:00
vpeter4	3128985ed4	oe_setup_addon: create missing folder	2014-07-03 23:08:22 +03:00
Stephan Raue	5da2a9f554	libvdpau: update to libvdpau-0.8 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-03 14:17:26 +02:00
Stephan Raue	0a76243f0e	linux: remove unneeded patch Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-01 19:06:22 +02:00
Stephan Raue	04389378f0	simplejson: update to simplejson-3.5.3 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-01 19:01:39 +02:00
Stephan Raue	27cf5545c9	busybox: add upstream patches Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-01 19:01:24 +02:00
Stephan Raue	43a73ab120	alsa-utils: dont install default ALSA restore rule, to avoid overwriting our own mixer settings with default values. rename our udev rule to start after other default sound config rules. this should fix #3350 , this should fix #3346 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-01 19:01:11 +02:00
Prashant Somashekar	4660e853e3	linux: update to linux-3.15.3	2014-07-01 19:00:52 +02:00
Stefan Saraev	92afbe408d	propects/Generic/options: lcdproc: enable serialVFD closes #3341	2014-07-01 18:59:35 +02:00
Stephan Raue	496a6af108	lzo: update to lzo-2.08 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-07-01 18:57:53 +02:00
fritsch	e0a6575dac	libva-intel-driver: remove green artifacts patch - was included upstream	2014-06-29 08:26:52 +02:00
Stephan Raue	06490ccc0e	lzo: add patch to fix build on i386 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-29 08:26:04 +02:00
Stephan Raue	3f558700a9	Revert "Revert "lzo: update to lzo-2.07"" This reverts commit `ef9a0958f7`.	2014-06-29 08:25:31 +02:00
Stephan Raue	cd1cdc5043	busybox: fix issue with not removing *.md5 files after update Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-28 21:44:53 +02:00
Stephan Raue	506767a43d	xorg-server: update to xorg-server-1.15.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-28 21:44:39 +02:00
Stephan Raue	07b5364c3c	xf86-video-ati: update to xf86-video-ati-7.4.0 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-28 21:44:28 +02:00
Stephan Raue	ef9a0958f7	Revert "lzo: update to lzo-2.07" This reverts commit `3845d69ccd`.	2014-06-28 14:26:57 +02:00
Stephan Raue	e82f81152a	linux: update to linux-3.15.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-27 06:04:42 +02:00
Stephan Raue	3845d69ccd	lzo: update to lzo-2.07 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-27 05:59:59 +02:00
Stephan Raue	d43e8d38ba	libbluray: update to libbluray-0.6.0 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-26 18:54:38 +02:00
Stephan Raue	e66c011dfa	gettext: force disabling of csharp support, this should fix #3344 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-26 18:53:24 +02:00
Stephan Raue	385153c910	service.openelec.settings: update to service.openelec.settings-0.3.18 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-25 18:35:36 +02:00
Stephan Raue	913fbe95d3	Mesa: update to Mesa-10.2.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-25 18:01:17 +02:00
Stephan Raue	a086e2f2ba	gettext: add patch to dont build docs and examples Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-23 19:01:16 +02:00
Stephan Raue	3483388399	gettext: build 'gettext-tools' only for host build Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-23 19:00:49 +02:00
Stephan Raue	a551da6a75	samba: update to samba-3.6.24 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-23 15:08:39 +02:00
Stefan Saraev	a47e4a1073	busybox: double pciutils in depends	2014-06-23 03:29:00 +02:00
Stephan Raue	06f2450d99	gcc: update configure options (inspired by CLFS) Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-23 03:28:05 +02:00
Stephan Raue	7ab03ced29	cloog: update to cloog-0.18.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-23 03:26:48 +02:00
Stephan Raue	ae3d38654f	mpc: update to mpc-1.0.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-23 03:26:19 +02:00
Stephan Raue	911c0754ec	bcm2835-bootloader: update to bcm2835-bootloader-462f3e3 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 17:04:04 +02:00
Stephan Raue	ad1b59ce32	bcm2835-driver: update to bcm2835-driver-462f3e3 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 17:04:04 +02:00
Stephan Raue	8159a923a3	projects/RPi/patches/xbmc: update RPi support patch Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 16:55:14 +02:00
Stephan Raue	d9a11a1404	libva-intel-driver: update to libva-intel-driver-1.3.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 14:56:14 +02:00
Stephan Raue	6f8690405c	libaacs: update to libaacs-0.7.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 14:55:43 +02:00
Stephan Raue	920be6b9d0	llvm: update to llvm-3.4.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 14:55:10 +02:00
Stephan Raue	bd1579e83d	ffmpeg: update to ffmpeg-xbmc-717a0b5 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 14:54:40 +02:00
Stephan Raue	7f9a69a81e	alsa-utils: update to alsa-utils-1.0.28 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 14:53:58 +02:00
Stephan Raue	9312c0b67e	alsa-lib: update to alsa-lib-1.0.28 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-22 14:53:41 +02:00
Stephan Raue	685784fb67	linux: add patch to fix FD72921 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-21 16:08:17 +02:00
Stephan Raue	5a955eb707	misc-firmware: update to misc-firmware-0.0.11 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-19 22:20:28 +02:00
Stephan Raue	c54b308c62	kmod: update to kmod-18 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-19 22:20:27 +02:00
Stephan Raue	35acb282ca	cmake: update to cmake-3.0.0, fix installation Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-19 22:20:27 +02:00
Stephan Raue	3209febb3b	gcc: add patches to fix GCC-60902, this should fix #3323 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-18 14:54:58 +02:00
Stephan Raue	031e2ca65d	libusb: update to libusb-1.0.19 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-18 14:54:58 +02:00
Stephan Raue	8e5652a050	dbus: update to dbus-1.8.4 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-18 14:54:58 +02:00
Stephan Raue	30a178b4f9	libpng: update to libpng-1.6.12 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-18 14:54:58 +02:00
Stephan Raue	46123b6549	file: update to file-5.19 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-18 14:54:58 +02:00
Stephan Raue	6660fb7ed9	misc-firmware: update to misc-firmware-0.0.10 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-17 21:26:25 +02:00
Stephan Raue	7946ce6276	gettext: update to gettext-0.19.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-17 21:26:25 +02:00
Stephan Raue	3b285d9533	linux: update Radeon firmwares Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-17 21:26:25 +02:00
Stephan Raue	aa9ebaa622	linux: update to linux-3.15.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-17 03:54:41 +02:00
Stefan Saraev	02028afddf	scripts/create_addon: cosmetics	2014-06-16 23:43:46 +02:00
Stefan Saraev	6a70e0b102	scripts/build: cosmetics	2014-06-16 23:43:46 +02:00
Stefan Saraev	a17cfdc0cc	fluxbox: hide useless errors	2014-06-16 23:43:46 +02:00
Stefan Saraev	de1015f2f0	service.openelec.settings: remove unused 'addon' script	2014-06-16 18:16:48 +02:00
Stefan Saraev	edc6475c96	init: remove unused ssh check	2014-06-16 02:34:12 +02:00
Stefan Saraev	7d9a751d01	xbmc: merge tmpfiles	2014-06-16 02:31:44 +02:00
Stephan Raue	cb0fc0c0db	xbmc: update to xbmc-13-741d614 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 18:10:14 +02:00
Stephan Raue	93be8687a1	wlan-firmware: update to wlan-firmware-0.0.23 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 18:09:41 +02:00
Stephan Raue	b5a5a0957b	projects/*/linux: enable CONFIG_VIDEO_USBTV support, this fixes #3140 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 16:00:54 +02:00
Stephan Raue	86d3313777	projects/*/linux: sync kernel config Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 15:52:41 +02:00
Stephan Raue	ef31644a44	projects/*/linux: enable CONFIG_HID_XINMO Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 15:44:32 +02:00
Stephan Raue	429b6d3c42	openssl: enable 'ec', 'ecdh' and 'ecdsa' support Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 15:30:44 +02:00
Stephan Raue	da08433dd2	wlan-firmware: update to wlan-firmware-0.0.22 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 13:58:42 +02:00
Stephan Raue	dd2c71f020	xbmc: update to xbmc-13-0796f0e Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 04:10:48 +02:00
Stephan Raue	39c7ba1576	tools/mkpkg: add script to get and pack 'xbmc-pvr-addons' for gotham Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 04:08:34 +02:00
Stephan Raue	ad417fd516	xbmc-pvr-addons: update to xbmc-pvr-addons-18c52bb Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-15 04:08:17 +02:00
Stephan Raue	ae007d0a2b	projects/RPi/patches/xbmc: update RPi support patch Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-14 04:20:57 +02:00
Stephan Raue	b6a759a39b	bcm2835-bootloader: update to bcm2835-bootloader-e45a4a2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-14 00:49:03 +02:00
Stephan Raue	01c8ec5d5d	bcm2835-driver: update to bcm2835-driver-e45a4a2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-14 00:49:03 +02:00
Stephan Raue	a05667ee23	remove XBMC master support for OpenELEC-4.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-12 20:39:11 +02:00
Stephan Raue	876ca6a481	remove project 'Cuboxi' for OpenELEC-4.2 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2014-06-12 20:37:54 +02:00