Add glsl shaders package

Add wifi module for Cubietruck
Update mupen64plus
2026-11-07 18:33:57 -10:00 · 2015-01-22 18:55:20 +01:00 · 2015-01-22 00:49:51 +01:00 · 2015-01-21 15:13:16 +01:00 · 2015-01-21 15:13:00 +01:00 · 2015-01-20 17:34:20 +01:00
1157 changed files with 459743 additions and 210783 deletions
@@ -35,6 +35,12 @@ 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
@@ -11,7 +11,7 @@ Lakka is a lightweight Linux distribution that transforms a small computer into

 ## Installation instructions

-Please refer to our website http://www.lakka.tv/getlakka on how to setup Lakka.
+Please refer to our website http://www.lakka.tv/get on how to setup Lakka.

 ## Support

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@PKG_NAME@"
+       name="@ADDON_NAME@"
       version="@ADDON_VERSION@"
       provider-name="@PROVIDER_NAME@">
  <requires>
@@ -8,9 +8,7 @@
    <import addon="xbmc.python" version="2.1.0"/>
@REQUIRES@
  </requires>
-  <extension point="@PKG_ADDON_TYPE@"
-             library="default.py">
-        <provides>executable</provides>
+  <extension point="xbmc.python.module" library="lib/">
  </extension>
  <extension point="xbmc.addon.metadata">
    <summary>@PKG_SHORTDESC@</summary>
@@ -0,0 +1,24 @@
+<?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>
@@ -0,0 +1,24 @@
+<?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>
@@ -1,12 +1,9 @@
 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
@@ -31,6 +28,8 @@ setup_toolchain() {
  elif [ "$1" = host ]; then
    export DESTIMAGE="host"

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

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

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

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

 strip_lto() {
  # strip out LTO optimization from *FLAGS
-  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"`
+  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
 }

 strip_gold() {
@@ -263,6 +277,9 @@ 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"))"
@@ -290,24 +307,22 @@ show_config() {
  config_message="$config_message\n\n Graphic configuration:"
  config_message="$config_message\n $dashes$dashes"

-  config_message="$config_message\n - XORG support:\t\t\t $XORG_SUPPORT"
  config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-  config_message="$config_message\n - XORG Xinerama support:\t\t $XINERAMA_SUPPORT"
  config_message="$config_message\n - SDL support:\t\t\t\t $SDL_SUPPORT"
  config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
  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 - 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"
+  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"

  # Input device configuration

@@ -318,7 +333,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 - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"

  # Misc. hardware configuration

@@ -326,10 +341,7 @@ show_config() {
  config_message="$config_message\n $dashes$dashes"

  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"

  for config_driver in $ADDITIONAL_DRIVERS; do
@@ -340,22 +352,20 @@ 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

@@ -365,10 +375,10 @@ show_config() {
  config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
  config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
  config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-if [ "$BOOTLOADER" = "u-boot" ]; then
-  config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
-  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
-fi
+  if [ "$BOOTLOADER" = "u-boot" ]; then
+    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
+    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
+  fi
  config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
  config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"

@@ -378,31 +388,47 @@ fi
  config_message="$config_message\n $dashes$dashes"

  config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-if [ "$SWAP_SUPPORT" = "yes" ]; then
-  config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
-fi
+  if [ "$SWAP_SUPPORT" = "yes" ]; then
+    config_message="$config_message\n   - Swapfile default size:\t\t $SWAPFILESIZE"
+  fi
  config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT"
  config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
  config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"

-  # XBMC configuration
+  # Kodi configuration

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

-  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"
+  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"
+  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
+    config_message="$config_message\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
+    config_message="$config_message\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+  fi
+  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 AFP support:\t\t\t $KODI_AFP_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"
+

  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 $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 - 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"
  config_message="$config_message\n $dashes$dashes$dashes"
@@ -410,5 +436,5 @@ fi
  config_message="$config_message\n $dashes$dashes$dashes"
  config_message="$config_message\n\n\n"

-  echo -e $config_message
+  echo -e "$config_message"
 }
@@ -21,9 +21,9 @@ if [ "$SDL_SUPPORT" = no ]; then
 fi

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

 get_graphicdrivers() {
@@ -40,14 +40,14 @@ get_graphicdrivers() {
      DRI_DRIVERS="$DRI_DRIVERS,i915"
      XORG_DRIVERS="$XORG_DRIVERS intel"
      COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-intel-driver"
+      VAAPI_SUPPORT="yes"
    fi

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

    if [ "$drv" = "nouveau" ]; then
@@ -58,15 +58,16 @@ 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
@@ -80,6 +81,7 @@ get_graphicdrivers() {
      XORG_DRIVERS="$XORG_DRIVERS ati"
      LLVM_SUPPORT="yes"
      COMPOSITE_SUPPORT="yes"
+      VDPAU_SUPPORT="yes"
    fi

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

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

  done
@@ -1,7 +1,7 @@
 {
  "partitions": [
    {
-      "label":                     "System",
+      "label":                     "@DISTRONAME@System",
      "filesystem_type":           "FAT",
      "partition_size_nominal":    160,
      "want_maximised":            false,
@@ -9,7 +9,7 @@
      "mkfs_options":              ""
    },
    {
-      "label":                     "Storage",
+      "label":                     "@DISTRONAME@Storage",
      "filesystem_type":           "ext4",
      "partition_size_nominal":    864,
      "want_maximised":            true,
@@ -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 $GCC_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"

@@ -1,6 +1,14 @@
 # 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
@@ -18,23 +26,28 @@ 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`
@@ -52,7 +65,9 @@ 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)
-  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
+  if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
+    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
+  fi

 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
@@ -77,5 +92,10 @@ 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
@@ -20,6 +20,10 @@ 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"
@@ -64,26 +68,46 @@ SED="sed -i"
  PKG_IS_ADDON="no"

  if [ -n "$1" ]; then
-    FOUND=0
-    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
-      # 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_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
        PKG_DIR="$DIR"
-        if [ $FOUND -gt 1 ] ; then
-          # found more ? fail
+        # 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"
+          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
@@ -108,6 +132,8 @@ 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
@@ -125,6 +151,8 @@ 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++
@@ -2,8 +2,8 @@
  OPENELEC_VERSION="devel"

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

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

@@ -0,0 +1,241 @@
+# Name of the Distro to build (full name, without special characters)
+  DISTRONAME="Lakka"
+
+# short project description
+  DESCRIPTION="The DIY retro emulation console"
+
+# Welcome Message for e.g. SSH Server (up to 5 Lines)
+  GREETING0="###########################################"
+  GREETING1="# Lakka - The DIY retro emulation console #"
+  GREETING2="# ...... visit http://www.lakka.tv ...... #"
+  GREETING3="###########################################"
+  GREETING4=""
+
+# Root password to integrate in the target system
+  ROOT_PASSWORD="root"
+
+# Mediacenter to use (kodi / no)
+  MEDIACENTER="no"
+
+# 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 afpfs-ng support (mounting AFP shares with KODI) (yes / no)
+  KODI_AFP_SUPPORT="no"
+
+# 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="none"
+
+# 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 nouveau"
+  elif [ "$TARGET_ARCH" = "x86_64" ]; then
+    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nouveau"
+  fi
+
+# build and install remote support (yes / no)
+  REMOTE_SUPPORT="no"
+
+# build and install ATV IR remote support (yes / no)
+  ATVCLIENT_SUPPORT="no"
+
+# build and install IRServer IR/LCD support (yes / no)
+  IRSERVER_SUPPORT="no"
+
+# 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="yes"
+
+# 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"
+
+  LAKKA_MIRROR="http://sources.lakka.tv"
@@ -0,0 +1,230 @@
+# 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 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 afpfs-ng support (mounting AFP shares with KODI) (yes / no)
+  KODI_AFP_SUPPORT="no"
+
+# 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 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"
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="cxxtools"
-PKG_VERSION="2.2"
+PKG_VERSION="2.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -1,12 +0,0 @@
-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()) {
@@ -1,3 +1,9 @@
+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
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="hdhomerun"
-PKG_VERSION="4.1"
+PKG_VERSION="4.3"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -32,8 +32,8 @@ unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFIL
 # exclusive lock
 exlock

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

 # modules are not automatically loaded
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue ([email protected])
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
 #
 #  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,18 +15,3 @@
 #  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()
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue ([email protected])
@@ -18,29 +16,17 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################

-. /etc/profile
+import os
+import sys
+import xbmcaddon

-run_scripts()
-{
-    list_scripts $1
-    for script in $SCRIPTS ; do
-        progress "running sleep script $script ($1)..."
-        sh /usr/lib/systemd/system-sleep.serial/$script $1
-    done
-}
+__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'))

-list_scripts()
-{
-    case $1 in
-        pre)
-            SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort)
-        ;;
-        post)
-            SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort -r)
-        ;;
-    esac
-}
-
-run_scripts $1
-
-exit 0
+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()
@@ -24,7 +24,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom

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

 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist
@@ -37,36 +37,39 @@ 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):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
    if line.strip():
        start = ""
        number_chars = 0
        for l in range(indent_level):
            start = start + " "
            number_chars = number_chars + 1
-        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):
+        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:
                        output.write(" ")
-                    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
+                        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:
            output.write(start + line + "\n")
                

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

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

    return out.output

@@ -126,7 +141,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  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
    while ((start_pos > -1 and end_pos > -1)):
        _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                             output=output)
@@ -136,7 +151,8 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        _pprint_line(indent_level, 
                     data[:end_pos - start_pos], 
                     width=width,
-                     output=output)
+                     output=output,
+                     ignore_contents=ignore_contents)
        data = data[end_pos - start_pos:]
        if not is_stop and not no_indent :
            indent_level = indent_level + indent
@@ -144,7 +160,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        if not data:
            break
        else:
-            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
    

 if __name__ == "__main__":
@@ -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" action="RunScript($ID, refresh_tuners)" />
+    <setting label="9010" option="close" type="action" id="refresh_tuners" action="RunScript($CWD/resources/actions.py, refresh_tuners)" />
  </category>
 </settings>
@@ -1,11 +1,21 @@
+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

@@ -17,8 +17,8 @@
 ################################################################################

 PKG_NAME="imon-mce"
-PKG_VERSION="4.1"
-PKG_REV="0"
+PKG_VERSION="4.3"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"
@@ -21,4 +21,4 @@
 . /etc/profile

 sleep 1 && \
-ir-keytable -p rc6 -w /etc/rc_keymaps/imon_mce &
+ir-keytable -p rc6 -w /usr/lib/udev/rc_keymaps/imon_mce &
@@ -1,3 +1,15 @@
+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
@@ -17,19 +17,19 @@
 ################################################################################

 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="4.1"
-PKG_REV="5"
+PKG_VERSION="4.3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET=""
 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.python.script"
+PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"

 make_target() {
@@ -47,11 +47,18 @@ 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
-  # we run this via wrapper
-  mv opt/bin/mediaclient opt/bin/mediaclient.bin
-  chmod 755 opt/bin/*
+  
+  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
 }

 makeinstall_target() {
@@ -64,4 +71,5 @@ 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/
 }
@@ -17,4 +17,5 @@
  <setting id="DEVICE4_NUM" value="1" />
  <setting id="DEVICE5_IP"  value="" />
  <setting id="DEVICE5_NUM" value="1" />
+  <setting id="CHECK_BOOT" value="false" />
 </settings>
@@ -1,2 +0,0 @@
-#!/bin/sh
-LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so exec mediaclient.bin "$@"
@@ -0,0 +1,247 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
+#
+#  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 ###"
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue ([email protected])
@@ -17,10 +18,9 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################

-if [ -e /run/lirc/lircd.irtrans ]; then
-  XBMC_ARGS="--lircdev /run/lirc/lircd.irtrans"
-else
-  XBMC_ARGS="--lircdev /run/lirc/lircd"
-fi
+. /etc/profile

-echo "XBMC_ARGS=\"$XBMC_ARGS\"" > /run/openelec/xbmc.conf
+ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
+
+logger -t Sundtek "### Sundtek driver stop ###"
+mediaclient --shutdown
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
+#
+#  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
@@ -2,7 +2,7 @@

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

 . /etc/profile

-# 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
+SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"

-# 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/
+if [ -f $SUNDTEK_ADDON_DIR/lib/libmediaclient.so ]; then
+  logger -t Sundtek "### Preloading library ###"
+  export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
 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
+  logger -t Sundtek "### Preloading library doesn't exist ###"
 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
@@ -15,22 +15,3 @@
 #  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()
@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
+#
+#  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()
@@ -27,4 +27,8 @@
  <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>
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue ([email protected])
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
 #
 #  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/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'

 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist
@@ -37,36 +37,39 @@ 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):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
    if line.strip():
        start = ""
        number_chars = 0
        for l in range(indent_level):
            start = start + " "
            number_chars = number_chars + 1
-        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):
+        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:
                        output.write(" ")
-                    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
+                        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:
            output.write(start + line + "\n")
                

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

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

    return out.output

@@ -126,7 +141,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  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
    while ((start_pos > -1 and end_pos > -1)):
        _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                             output=output)
@@ -136,7 +151,8 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        _pprint_line(indent_level, 
                     data[:end_pos - start_pos], 
                     width=width,
-                     output=output)
+                     output=output,
+                     ignore_contents=ignore_contents)
        data = data[end_pos - start_pos:]
        if not is_stop and not no_indent :
            indent_level = indent_level + indent
@@ -144,7 +160,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
        if not data:
            break
        else:
-            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
    

 if __name__ == "__main__":
@@ -27,6 +27,11 @@
  <category label="9000">
    <setting type="sep" />
    <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
+    <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)" />
  </category>
 </settings>
@@ -25,9 +25,10 @@ oe_setup_addon driver.dvb.sundtek-mediatv
 if [ "$SUSPEND_DRIVER" = "true" ]; then
  case "$1" in
    pre)
-      killall -9 mediasrv &>/dev/null
+      systemctl stop driver.dvb.sundtek-mediatv.service
      ;;
    post)
+    	systemctl start driver.dvb.sundtek-mediatv.service
      ;;
  esac
 fi
@@ -0,0 +1,12 @@
+[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
@@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.1.2"
-PKG_REV="2"
+PKG_VERSION="4.3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"
@@ -41,7 +41,9 @@ PKG_MAINTAINER="unofficial.addon.pro"
 make_target() {
  $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
     -e "s|@PROJECT@|$PROJECT|g" \
-     -e "s|@ARCH@|$ARCH|g" \
+     -e "s|@ARCH@|$TARGET_ARCH|g" \
+     -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
+     -e "s|@PKG_REV@|$PKG_REV|g"\
  -i 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] Mediacenter OS Add-ons"
-                version="4.1.2"
+                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] (@PROJECT@/@ARCH@) Add-ons"
+                version="@PKG_VERSION@.@PKG_REV@"
                provider-name="unofficial.addon.pro">
        <extension point="xbmc.addon.repository"
                name="Unofficial OpenELEC.tv Add-on Repository">
@@ -12,7 +12,10 @@
        <extension point="xbmc.addon.metadata">
                <summary>Unofficial addon repository for OpenELEC</summary>
                <description>
-[COLOR orange]Use with care. There will be NO end user support for addons in this repository[/COLOR]
+[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.
                </description>
                <disclaimer>This is an unofficial addon repository. please don't ask for support in openelec forum / irc channel</disclaimer>
                <platform>all</platform>
@@ -1,3 +1,9 @@
+4.3.3
+- rebuild
+
+4.3.2
+- rebuild for addon api bump
+
 4.1.2
 - fix typo in repository name

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

@@ -18,7 +18,7 @@

 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="2"
+PKG_REV="5"
 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" = "Mesa" ]; then
+if [ "$OPENGL" = "no" ]; then
  EXTRAOPTS="--without-opengl"
 fi

@@ -63,6 +63,7 @@ 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
@@ -0,0 +1,632 @@
+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
@@ -35,4 +35,10 @@ 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
@@ -3,12 +3,11 @@ Description=boblightd
 After=graphical.target

 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.boblightd/bin/boblightd.start"
-ExecStopPost=-/bin/sh -c "pidof boblight-X11 && killall -q -9 boblight-X11"
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.boblightd/bin/boblightd.start"
 TimeoutStopSec=1
 Restart=always
 RestartSec=10
 StartLimitInterval=0

 [Install]
-WantedBy=xbmc.target
+WantedBy=kodi.target
@@ -1,3 +1,28 @@
+4.3.6
+- fix tv_grab_file with --quiet (again!)
+- fix crash on imx6
+
+4.3.5
+- fix crash on imx6
+
+4.3.4
+- update to tvheadend-3.9.2182
+- fix xmltv grab issue
+
+4.3.3
+- update to tvheadend-3.9.2168
+
+4.3.2
+- update to kodi
+
+4.3.1
+- update to tvheadend-3.9.1847
+- tvheadend now has native support for hdhomerun devices
+
+4.3.0
+- rebuild for addon api bump
+- update to tvheadend-3.9.1083
+
 4.1.2
 - fix issues with "wait for frontend init". thanks @sraue

@@ -17,14 +17,13 @@
 ################################################################################

 PKG_NAME="tvheadend"
-PKG_VERSION="3.9.1050"
-PKG_REV="2"
+PKG_VERSION="3.9.2182"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-#PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="http://www.tvheadend.org"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain openssl curl"
+PKG_DEPENDS_TARGET="toolchain libressl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
@@ -36,6 +35,11 @@ PKG_AUTORECONF="no"
 pre_build_target() {
  mkdir -p $PKG_BUILD/.$TARGET_NAME
  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  export CROSS_COMPILE=$TARGET_PREFIX
+  # meh imx6..
+  if [ "$TARGET_ARCH" == "arm" ] ; then
+    export CFLAGS="$CFLAGS -mno-unaligned-access"
+  fi
 }

 configure_target() {
@@ -43,12 +47,17 @@ configure_target() {
            --arch=$TARGET_ARCH \
            --cpu=$TARGET_CPU \
            --cc=$TARGET_CC \
-            --enable-timeshift \
-            --disable-libav \
+            --enable-hdhomerun_client \
+            --enable-hdhomerun_static \
            --disable-avahi \
-            --python=$ROOT/$TOOLCHAIN/bin/python \
+            --disable-libav \
+            --enable-inotify \
+            --enable-epoll \
            --disable-uriparser \
-            --enable-bundle
+            --enable-tvhcsa \
+            --enable-bundle \
+            --disable-dbus_1 \
+            --python=$ROOT/$TOOLCHAIN/bin/python
 }

 post_make_target() {
@@ -0,0 +1,17 @@
+diff --git a/Makefile.hdhomerun b/Makefile.hdhomerun
+index 094a375..7916c14 100644
+--- a/Makefile.hdhomerun
+++ b/Makefile.hdhomerun
+@@ -45,10 +45,10 @@ LIBHDHRDIR = $(ROOTDIR)/libhdhomerun_static
+ 
+ export PATH := $(LIBHDHRDIR)/build/bin:$(PATH)
+ 
+-LIBHDHR         = libhdhomerun_20140604
+LIBHDHR         = libhdhomerun_20141210
+ LIBHDHR_TB      = $(LIBHDHR).tgz
+ LIBHDHR_URL     = http://download.silicondust.com/hdhomerun/$(LIBHDHR_TB)
+-LIBHDHR_SHA1    = b8d910a5721c484a30b81662fd6991e3546ed67c
+LIBHDHR_SHA1    = 4f6827e17f8f79401f272f62089352fe01eae740
+ 
+ .PHONY: build
+ build: $(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build
@@ -0,0 +1,25 @@
+From 67e38551bc3acadf27b3ed4922e897348a612fdb Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <[email protected]>
+Date: Wed, 15 Oct 2014 13:35:09 +0300
+Subject: [PATCH] remove werror
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ddcc47e..0087a6c 100644
+--- a/Makefile
+++ b/Makefile
+@@ -28,7 +28,7 @@ PROG    := $(BUILDDIR)/tvheadend
+ #
+ 
+ CFLAGS  += -g -O2 -Wunused-result
+-CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
+CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
+ CFLAGS  += -Wmissing-prototypes
+ CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
+ CFLAGS  += -D_FILE_OFFSET_BITS=64
+-- 
+1.7.2.5
+
@@ -20,65 +20,21 @@

 . /etc/profile

-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
+ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`

-dflag=
-vflag=
-cflag=
-
-if [[ $# -lt 1 ]]; then
-  if [ "$XMLTV_TYPE" = "FILE" ]; then
-    cat "$XMLTV_LOCATION_FILE"
-    exit 0
-  elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
-    if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
-      exec "$XMLTV_LOCATION_SCRIPT"
-    fi
-  elif [ "$XMLTV_TYPE" = "WEB" ]; then
-    wget -qO - "$XMLTV_LOCATION_WEB"
-    exit 0
+if [ "$XMLTV_TYPE" = "FILE" ]; then
+  cat "$XMLTV_LOCATION_FILE"
+  exit 0
+elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
+  if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
+    exec "$XMLTV_LOCATION_SCRIPT"
  fi
-fi
-
-for arg; do
-    delim=""
-    case "$arg" in
-    #translate --gnu-long-options to -g (short options)
-       --description) args="${args}-d ";;
-       --version) args="${args}-v ";;
-       --capabilities) args="${args}-c ";;
-       #pass through anything else
-       *) [[ "${arg:0:1}" == "-" ]] || delim="\""
-           args="${args}${delim}${arg}${delim} ";;
-    esac
-done
-
-#Reset the positional parameters to the short options
-eval set -- $args
-
-while getopts "dvc" option; do
-    case $option in
-        d)  dflag=1;;
-        v)  vflag=1;;
-        c)  cflag=1;;
-        \?) printf "unknown option: -%s\n" $OPTARG
-            printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
-            exit 2
-            ;;
-    esac >&2
-done
-
-if [ "$dflag" ]; then
-   printf "tv_grab_file is a simple grabber that just read the local or web XMLTV formated file\n"
-fi
-if [ "$vflag" ]; then
-   printf "0.1\n"
-fi
-if [ "$cflag" ]; then
-   printf "baseline\n"
+elif [ "$XMLTV_TYPE" = "WEB" ]; then
+  wget -qO - "$XMLTV_LOCATION_WEB"
+  exit 0
 fi
@@ -59,13 +59,13 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
 fi

 if [ "$DEBUG" = "yes" ]; then
-  TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
 else
-  TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
 fi

 # start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
  driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
  logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
  # use ". " because of variable export
@@ -3,11 +3,11 @@ Description=TVHeadend Service
 After=graphical.target

 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.tvheadend/bin/tvheadend.start"
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.tvheadend/bin/tvheadend.start"
 TimeoutStopSec=2
 Restart=always
 RestartSec=2
 StartLimitInterval=0

 [Install]
-WantedBy=xbmc.target
+WantedBy=kodi.target
@@ -1,7 +1,7 @@
 {
 	"enabled": 0,
 	"ondemand": 0,
-	"path": "/storage/.xbmc/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
+	"path": "/storage/.kodi/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
 	"unlimited_period": 0,
 	"max_period": 3600,
 	"unlimited_size": 0,
@@ -1,7 +1,7 @@
 {
 	"grabbers": [
 		{
-			"path": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file",
+			"path": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file",
 			"description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
 			"version": "0.1\n",
 			"mtime": 1318774706,
@@ -10,5 +10,5 @@
 	],
 	"grab-interval": 12,
 	"grab-enabled": 1,
-	"current-grabber": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file"
+	"current-grabber": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file"
 }
@@ -1,3 +1,25 @@
+4.3.5
+- add plugin 'vdr-plugin-restfulapi'
+- update to vdr-plugin-xvdr-b300fc3
+
+4.3.4
+- update to vdr-plugin-vnsiserver-a48edf1
+- update to vdr-plugin-dvbapi-36a6b1d
+
+4.3.3
+- add plugin 'vdr-plugin-epgfixer'
+- update to vdr-satip-1.0.1
+
+4.3.2
+- update to kodi
+
+4.3.1
+- update to vdr-plugin-vnsiserver-a7cb405
+- update to vdr-plugin-dvbapi-2617a7f
+
+4.3.0
+- rebuild for addon api bump
+
 4.1.7
 - add option to override epg charset
 - update to vdr-plugin-vnsiserver-7d4aa81
@@ -18,13 +18,13 @@
 ################################################################################

 PKG_NAME="vdr-addon"
-PKG_VERSION="4.1"
-PKG_REV="7"
+PKG_VERSION="4.3"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -48,9 +48,11 @@ addon() {
  VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
  VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
  VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
+  VDR_PLUGIN_EPGFIXER_DIR="$(get_build_dir vdr-plugin-epgfixer)"
+  VDR_PLUGIN_RESTFULAPI_DIR="$(get_build_dir vdr-plugin-restfulapi)"

  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp $VDR_DIR/channels.conf $ADDON_BUILD/$PKG_ADDON_ID/config
+  touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf
  cp $VDR_DIR/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config
  cp $VDR_DIR/keymacros.conf $ADDON_BUILD/$PKG_ADDON_ID/config
  cp $VDR_DIR/scr.conf $ADDON_BUILD/$PKG_ADDON_ID/config
@@ -84,6 +86,8 @@ addon() {
  cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $(get_build_dir vdr-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $VDR_PLUGIN_RESTFULAPI_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin

  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg

@@ -103,4 +107,11 @@ addon() {

  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
  cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
+  cp -PR $VDR_PLUGIN_EPGFIXER_DIR/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+  cp -P $VDR_PLUGIN_RESTFULAPI_DIR/web/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+  cp -P $VDR_PLUGIN_RESTFULAPI_DIR/API.html $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
 }
@@ -45,9 +45,7 @@ ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
 chmod a+x $ADDON_DIR/bin/*

 ADDON_CACHE_DIR="$ADDON_HOME/cache"
-if [ ! -f "$ADDON_CACHE_DIR" ]; then
-  mkdir -p $ADDON_CACHE_DIR
-fi
+mkdir -p $ADDON_CACHE_DIR

 VDR_ARG="-g /tmp --no-kbd"
 if [ "$DEBUG" = "yes" ]; then
@@ -105,6 +103,9 @@ fi
 if [ "$ENABLE_EEPG" == "true" ] ; then
  VDR_ARG="$VDR_ARG -P eepg"
 fi
+if [ "$ENABLE_EPGFIXER" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P epgfixer"
+fi
 if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
  VDR_ARG="$VDR_ARG -P epgsearch"
 fi
@@ -130,6 +131,20 @@ if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
    cp $source /var/lib/epgsources
  done
 fi
+
+if [ "$ENABLE_RESTFULAPI" == "true" ] ; then
+  RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT"
+  if [ ! -z "$RESTFULAPI_EPGIMAGES" ]; then
+    mkdir -p "$RESTFULAPI_EPGIMAGES"
+    RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$RESTFULAPI_EPGIMAGES\""
+  fi
+  if [ ! -z "$RESTFULAPI_CHANNELLOGOS" ]; then
+    mkdir -p "$RESTFULAPI_CHANNELLOGOS"
+    RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$RESTFULAPI_CHANNELLOGOS\""
+  fi
+  VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'"
+fi
+
 # vnsi/xvdr last
 VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"

@@ -148,7 +163,7 @@ for config in `find . -type f`; do
 done

 # start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
  driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
  logger -t VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
  # use ". " because of variable export
@@ -24,10 +24,16 @@
 	<string id="1046">Enable plugin: extended EPG</string>
 	<string id="1047">Enable plugin: dummydevice</string>
 	<string id="1048">Enable plugin: satip</string>
+	<string id="1049">Enable plugin: epgfixer</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
 	<string id="1053">PVR plugin</string>
        <string id="1056">Enable external recdmd</string>
        <string id="1057">External recdmd path</string>
        <string id="1058">- number of devices</string>
+	<string id="1070">Enable plugin: restfulapi</string>
+	<string id="1071">- listen on ip</string>
+	<string id="1072">- listen on port</string>
+	<string id="1073">- Path to the epgimages</string>
+	<string id="1074">- Path to the channellogos</string>
 </strings>
@@ -35,6 +35,12 @@
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting id="ENABLE_DUMMYDEVICE" type="bool" label="1047" default="false" />
 		<setting id="ENABLE_SATIP" type="bool" label="1048" default="false" />
+		<setting id="ENABLE_EPGFIXER" type="bool" label="1049" default="false" />
+		<setting id="ENABLE_RESTFULAPI" type="bool" label="1070" default="false" />
+		<setting id="RESTFULAPI_IP" type="ipaddress" label="1071" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
+		<setting id="RESTFULAPI_PORT" type="number" label="1072" values="" visible="!eq(-2,false)"  default="8002"/>
+		<setting id="RESTFULAPI_EPGIMAGES" type="file" label="1073" values="" visible="!eq(-3,false)"  default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages"/>
+		<setting id="RESTFULAPI_CHANNELLOGOS" type="file" label="1074" values="" visible="!eq(-4,false)"  default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos"/>
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
    </category>
@@ -14,13 +14,19 @@
    <setting id="ENABLE_CONTROL" value="false" />
    <setting id="CONTROL_PORT" value="2002" />
    <setting id="ENABLE_EEPG" value="false" />
+    <setting id="ENABLE_EPGFIXER" value="false" />
    <setting id="ENABLE_EPGSEARCH" value="false" />
    <setting id="ENABLE_XMLTV2VDR" value="false" />
    <setting id="ENABLE_DUMMYDEVICE" value="false" />
    <setting id="ENABLE_SATIP" value="false" />
    <setting id="ENABLE_EXTERNAL_RECCMD" value="false" />
+    <setting id="ENABLE_RESTFULAPI" value="false" />
    <setting id="EXTERNAL_RECCMD_PATH" value="" />
    <setting id="ENABLE_CHARSET_OVERRIDE" value="false" />
    <setting id="CHARSET_OVERRIDE_STR" value="" />
    <setting id="IPTV_NUM_DEVICES" value="1" />
+    <setting id="RESTFULAPI_IP" value="0.0.0.0" />
+    <setting id="RESTFULAPI_PORT" value="8002" />
+    <setting id="RESTFULAPI_EPGIMAGES" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages" />
+    <setting id="RESTFULAPI_CHANNELLOGOS" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos" />
 </settings>
@@ -3,11 +3,11 @@ Description=vdr
 After=graphical.target

 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.vdr-addon/bin/vdr.start"
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.vdr-addon/bin/vdr.start"
 TimeoutStopSec=2
 Restart=always
 RestartSec=2
 StartLimitInterval=0

 [Install]
-WantedBy=xbmc.target
+WantedBy=kodi.target
@@ -58,8 +58,6 @@ post_configure_target() {
 post_makeinstall_target() {
  rm -rf $INSTALL/usr/bin

-  mkdir -p $INSTALL/etc/modprobe.d
-    cp -PR $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
  mkdir -p $INSTALL/usr/config
    cp -PR $PKG_DIR/config/modprobe.d $INSTALL/usr/config
 }
@@ -0,0 +1,69 @@
+From 01b686cf032d523642c5ab33f455d814ef468925 Mon Sep 17 00:00:00 2001
+From: fritsch <[email protected]>
+Date: Sat, 10 Jan 2015 23:47:58 +0100
+Subject: [PATCH] Support PHIREE U2 and Sound blaster F-Xi HD (done by Anssih)
+
+---
+ src/conf/cards/USB-Audio.conf | 41 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
+index ce3ae01..107d6fa 100644
+--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
+@@ -52,6 +52,10 @@ USB-Audio.pcm.iec958_device {
+ 	"USB Device 0x46d:0x992" 999
+ }
+ 
+USB-Audio.pcm.iec958_2_device {
+	"PHIREE U2" 1
+	"USB Sound Blaster HD" 1
+}
+ 
+ # If a device requires non-standard definitions for front, surround40,
+ # surround51, surround71 or iec958, they can be defined here.
+@@ -422,4 +426,39 @@ USB-Audio.pcm.iec958.0 {
+ 	}
+ }
+ 
+-# vim: ft=alsaconf
+USB-Audio.pcm.iec958.1 {
+	@args [ CARD AES0 AES1 AES2 AES3 ]
+	@args.CARD { type string }
+	@args.AES0 { type integer }
+	@args.AES1 { type integer }
+	@args.AES2 { type integer }
+	@args.AES3 { type integer }
+	@func refer
+	name {
+		@func concat
+		strings [
+			"cards.USB-Audio."
+			{ @func card_name card $CARD }
+			".pcm.iec958_2:CARD=" $CARD
+			",AES0=" $AES0 ",AES1=" $AES1 ",AES2=" $AES2 ",AES3=" $AES3
+		]
+	}
+	default {
+		# FIXME: we cannot set the AES parameters
+		type hw
+		card $CARD
+		device {
+			@func refer
+			name {
+				@func concat
+				strings [
+					"cards.USB-Audio.pcm.iec958_2_device."
+					{ @func card_name card $CARD }
+				]
+			}
+			default 999
+		}
+	}
+}
+
+# vim: ft=alsaconf
+\ No newline at end of file
+-- 
+1.9.1
+
@@ -126,8 +126,10 @@ else

 # and this for various Fusion devices like Zotac ZBOX
  mixer $card 'Front',0 100% on
+
+# NVidia CK804 sound devices
+  mixer $card 'IEC958 Playback AC97-SPSA' 100%
 fi

 exit 0
 )&
-
@@ -1,12 +0,0 @@
-diff -Naur faad2-2.7-old/configure.in faad2-2.7-new/configure.in
--- faad2-2.7-old/configure.in	2009-02-04 16:51:03.000000000 -0800
-+++ faad2-2.7-new/configure.in	2012-12-30 14:58:33.000000000 -0800
-@@ -25,7 +25,7 @@
- AC_PROG_MAKE_SET
- AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
- 
-AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)
@@ -1,28 +0,0 @@
-diff -Naur faad2-2.7-old/common/mp4ff/Makefile.am faad2-2.7-new/common/mp4ff/Makefile.am
--- faad2-2.7-old/common/mp4ff/Makefile.am	2009-02-06 06:24:21.000000000 -0800
-+++ faad2-2.7-new/common/mp4ff/Makefile.am	2009-02-11 05:36:14.000000000 -0800
-@@ -1,7 +1,7 @@
-lib_LIBRARIES = libmp4ff.a
-include_HEADERS = mp4ff.h mp4ffint.h
-+lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
- 
-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
- 
-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+                      mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
-diff -Naur faad2-2.7-old/frontend/Makefile.am faad2-2.7-new/frontend/Makefile.am
--- faad2-2.7-old/frontend/Makefile.am	2009-02-06 08:03:37.000000000 -0800
-+++ faad2-2.7-new/frontend/Makefile.am	2009-02-11 05:35:52.000000000 -0800
-@@ -5,7 +5,7 @@
- 	   -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
-	     $(top_builddir)/common/mp4ff/libmp4ff.a
-+	     $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c \
- 	       audio.c audio.h \
@@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="flac"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
@@ -33,7 +33,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --disable-rpath \
                           --disable-altivec \
                           --disable-doxygen-docs \
                           --disable-thorough-tests \
@@ -49,6 +51,13 @@ else
  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
 fi

+pre_configure_target() {
+  # flac-1.3.1 dont build with LTO support
+  strip_lto
+
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}
+
 post_makeinstall_target() {
  rm -rf $INSTALL/usr/bin
 }
@@ -33,7 +33,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-nasm \
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --disable-nasm \
                           --disable-rpath \
                           --disable-cpml \
                           --disable-gtktest \
@@ -44,11 +44,11 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \
                           --disable-vcd-info \
                           --without-cd-drive \
                           --without-cd-info \
-                           --with-cd-paranoia \
                           --without-cdda-player \
                           --without-cd-read \
                           --without-iso-info \
                           --without-iso-read \
+                           --without-libiconv-prefix \
                           --with-gnu-ld"

 pre_configure_target() {
@@ -33,8 +33,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 # package specific configure options
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
 if [ $TARGET_ARCH == "x86_64" ] ; then
-  PKG_CONFIGURE_OPTS_TARGET="--enable-accuracy --enable-fpm=64bit"
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-accuracy --enable-fpm=64bit"
 fi

 post_makeinstall_target() {
@@ -1,50 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libsndfile"
-PKG_VERSION="1.0.25"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.mega-nerd.com/libsndfile/"
-PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
-PKG_LONGDESC="libsndfile is a C library for reading and writing sound files such as AIFF, AU, WAV, and others through one standard interface. It can currently read/write 8, 16, 24 and 32-bit PCM files as well as 32 and 64-bit floating point WAV files and a number of compressed formats. It compiles and runs on *nix, MacOS, and Win32."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
-                           --disable-silent-rules \
-                           --disable-sqlite \
-                           --enable-alsa \
-                           --enable-external-libs \
-                           --disable-experimental \
-                           --disable-test-coverage \
-                           --enable-largefile \
-                           --with-gnu-ld"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}
@@ -1,25 +0,0 @@
-diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
--- libsndfile-1.0.25-old/configure.ac	2011-07-13 01:59:57.000000000 -0700
-+++ libsndfile-1.0.25-new/configure.ac	2011-07-13 17:04:14.000000000 -0700
-@@ -18,9 +18,6 @@
- AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
- AM_SILENT_RULES([yes])
- 
-dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
-
- AC_LANG([C])
- 
- AC_PROG_CC
-diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
--- libsndfile-1.0.25-old/Makefile.am	2011-07-07 02:47:24.000000000 -0700
-+++ libsndfile-1.0.25-new/Makefile.am	2011-07-13 17:04:14.000000000 -0700
-@@ -2,6 +2,8 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
- 
-+ACLOCAL_AMFLAGS = -I M4
-+
- if BUILD_OCTAVE_MOD
- octave_dir = Octave
- endif
@@ -1,119 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pulseaudio"
-PKG_VERSION="5.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://pulseaudio.org/"
-PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"
-PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc"
-  PULSEAUDIO_BLUETOOTH="--enable-bluez5"
-else
-  PULSEAUDIO_BLUETOOTH="--disable-bluez5"
-fi
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           --disable-nls \
-                           --enable-largefile \
-                           --disable-rpath \
-                           --disable-x11 \
-                           --disable-tests \
-                           --enable-samplerate \
-                           --disable-oss-output \
-                           --disable-oss-wrapper \
-                           --disable-coreaudio-output \
-                           --enable-alsa \
-                           --disable-esound \
-                           --disable-solaris \
-                           --disable-waveout \
-                           --disable-glib2 \
-                           --disable-gtk3 \
-                           --disable-gconf \
-                           --disable-avahi \
-                           --disable-jack \
-                           --disable-asyncns \
-                           --disable-tcpwrap \
-                           --disable-lirc \
-                           --enable-dbus \
-                           --disable-bluez4 \
-                           $PULSEAUDIO_BLUETOOTH \
-                           --enable-udev \
-                           --disable-hal-compat \
-                           --enable-ipv6 \
-                           --enable-openssl \
-                           --disable-xen \
-                           --disable-orc \
-                           --disable-manpages \
-                           --disable-per-user-esound-socket \
-                           --disable-default-build-tests \
-                           --disable-legacy-database-entry-format \
-                           --with-system-user=root \
-                           --with-system-group=root \
-                           --with-access-group=root \
-                           --without-caps \
-                           --without-fftw \
-                           --with-speex \
-                           --with-module-dir=/usr/lib/pulse"
-
-pre_build_target() {
-# broken autoreconf
-  ( cd $PKG_BUILD
-    intltoolize --force
-  )
-}
-
-pre_configure_target() {
-  # pulseaudio fails to build with LTO support
-    strip_lto
-}
-
-pre_make_target() {
-  MAKEFLAGS=-j1
-}
-
-post_makeinstall_target() {
-# add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh"
-# add_group pulse 498
-# add_group pulse-access 497
-
-  sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
-
-  rm -rf $INSTALL/usr/bin/esdcompat
-  rm -rf $INSTALL/usr/lib/cmake
-  rm -rf $INSTALL/usr/share/vala
-  rm -rf $INSTALL/etc/bash_completion.d
-}
-
-post_install() {
-  enable_service pulseaudio.service
-}
@@ -1,64 +0,0 @@
-From [email protected]  Mon Oct  1 15:06:56 2012
-Return-Path: <[email protected]>
-X-Original-To: [email protected]
-Delivered-To: [email protected]
-Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145])
-	by grenadilla.canonical.com (Postfix) with ESMTP id A48961472160
-	for <[email protected]>; Mon,  1 Oct 2012 15:06:56 +0000 (UTC)
-Received: from cluster-e.mailcontrol.com (cluster-e.mailcontrol.com [85.115.58.190])
-	by fiordland.canonical.com (Postfix) with ESMTP id 5DC1EA18423
-	for <[email protected]>; Mon,  1 Oct 2012 15:06:56 +0000 (UTC)
-Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158])
-	by rly62e.srv.mailcontrol.com (MailControl) with ESMTP id q91F6t9E016745
-	for <[email protected]>; Mon, 1 Oct 2012 16:06:55 +0100
-Received: from fiordland.canonical.com ([91.189.94.145])
-	by arctowski.canonical.com with esmtp (Exim 4.71)
-	(envelope-from <[email protected]>)
-	id 1TIhaB-0002MW-HX
-	for [email protected]; Mon, 01 Oct 2012 15:06:55 +0000
-Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112])
-	by fiordland.canonical.com (Postfix) with ESMTP id 8706DA18423
-	for <[email protected]>; Mon,  1 Oct 2012 15:06:55 +0000 (UTC)
-Received: from hd9483857.selulk5.dyn.perspektivbredband.net ([217.72.56.87] helo=localhost.localdomain)
-	by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
-	(Exim 4.71)
-	(envelope-from <[email protected]>)
-	id 1TIhaB-0006f2-8F; Mon, 01 Oct 2012 15:06:55 +0000
-From: David Henningsson <[email protected]>
-To: [email protected]
-Cc: [email protected],
-        David Henningsson <[email protected]>
-Subject: [PATCH] stream: Return error in case a client peeks to early
-Date: Mon,  1 Oct 2012 17:06:55 +0200
-Message-Id: <[email protected]>
-X-Mailer: git-send-email 1.7.9.5
-X-Mailcontrol-Inbound: uq3drnD2P+ps5SfEb0fvr78+NoP1DHBZwGqKpaXB2eTgNv8D6KLIxb8+NoP1DHBZ8VSaBg0k0xw=
-X-Spam-Score: -0.4
-X-Scanned-By: MailControl 9446.0 (www.mailcontrol.com) on 10.69.0.172
-
-If there is no silence memblock and no data, pa_memblockq_peek can
-return NULL. In this case, do not crash on an assertion in
-pa_memblock_acquire, but instead return a proper error to the client.
-
-BugLink: http://bugs.launchpad.net/bugs/1058200
-Signed-off-by: David Henningsson <[email protected]>
---
- src/pulse/stream.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/pulse/stream.c b/src/pulse/stream.c
-index 2b6d306..9bb0995 100644
--- a/src/pulse/stream.c
-+++ b/src/pulse/stream.c
-@@ -1598,6 +1598,8 @@ int pa_stream_peek(pa_stream *s, const void **data, size_t *length) {
-             return 0;
-         }
- 
-+        PA_CHECK_VALIDITY(s->context, s->peek_memchunk.memblock != NULL, PA_ERR_NODATA);
-+
-         s->peek_data = pa_memblock_acquire(s->peek_memchunk.memblock);
-     }
- 
-- 
-1.7.9.5
-
@@ -1,16 +0,0 @@
-Description: Avoid abort when poll descriptor is 0 (LP: #1092377)
-
-Index: pulseaudio/src/modules/alsa/alsa-mixer.c
-===================================================================
--- pulseaudio.orig/src/modules/alsa/alsa-mixer.c	2012-12-20 00:37:53.862456000 -0200
-+++ pulseaudio/src/modules/alsa/alsa-mixer.c	2012-12-20 00:39:58.631080479 -0200
-@@ -160,6 +160,9 @@
-     if (n < 0) {
-         pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
-         return;
-+    } else if (n == 0) {
-+        pa_log("snd_mixer_poll_descriptors_count() equal 0");
-+        return;
-     }
-     num_fds = (unsigned) n;
- 
@@ -1,40 +0,0 @@
-From 3e04d944626ba4caee8a4d74a683c6c967e935ca Mon Sep 17 00:00:00 2001
-From: David Henningsson <[email protected]>
-Date: Tue, 13 Aug 2013 12:43:29 +0200
-Subject: [PATCH 203/204] card: Add hook before profile changes
-
-This is useful to modules that want to do things just before a
-profile becomes inactive.
---
- src/pulsecore/card.c |    2 ++
- src/pulsecore/core.h |    1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
-index 7cf45df..b58dfa7 100644
--- a/src/pulsecore/card.c
-+++ b/src/pulsecore/card.c
-@@ -272,6 +272,8 @@ int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save) {
-         return 0;
-     }
- 
-+    pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGING], profile);
-+
-     if ((r = c->set_profile(c, profile)) < 0)
-         return r;
- 
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index a8cff5c..904b610 100644
--- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -115,6 +115,7 @@ typedef enum pa_core_hook {
-     PA_CORE_HOOK_CARD_PUT,
-     PA_CORE_HOOK_CARD_UNLINK,
-     PA_CORE_HOOK_CARD_PROFILE_CHANGED,
-+    PA_CORE_HOOK_CARD_PROFILE_CHANGING,
-     PA_CORE_HOOK_CARD_PROFILE_ADDED,
-     PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED,
-     PA_CORE_HOOK_PORT_AVAILABLE_CHANGED,
-- 
-1.7.9.5
-
@@ -1,24 +0,0 @@
-From c9d7dcaa87f9ada49d75483a7c604dba27a0d71a Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <[email protected]>
-Date: Tue, 7 Jan 2014 13:22:48 +0200
-Subject: [PATCH] never append -dirty to server/module version
-
---
- git-version-gen |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/git-version-gen b/git-version-gen
-index 9d65b80..fcf11fd 100755
--- a/git-version-gen
-+++ b/git-version-gen
-@@ -152,6 +152,7 @@ v=`echo "$v" |sed 's/^v//'`
- git status > /dev/null 2>&1
- 
- dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-+dirty=
- case "$dirty" in
-     '') ;;
-     *) # Append the suffix only if there isn't one already.
-- 
-1.7.2.5
-
@@ -1,13 +0,0 @@
--- pulseaudio-4.0.orig/src/pulsecore/core-util.c	2014-01-12 23:31:26.281525000 -0800
-+++ pulseaudio-4.0/src/pulsecore/core-util.c	2014-01-12 23:32:32.977118803 -0800
-@@ -1524,10 +1524,6 @@
-     if (stat(p, &st) < 0)
-         return -errno;
- 
-#ifdef HAVE_GETUID
-    if (st.st_uid != getuid())
-        return -EACCES;
-#endif
-
-     return 0;
- }
@@ -1 +0,0 @@
-export SDL_AUDIODRIVER=pulse
@@ -1,14 +0,0 @@
-[Unit]
-Description=PulseAudio Sound System
-After=syslog.target local-fs.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/pulseaudio --start --daemonize --log-level=0
-TimeoutStopSec=5
-Restart=always
-RestartSec=2
-StartLimitInterval=0
-
-[Install]
-WantedBy=multi-user.target
@@ -1,47 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="speex"
-PKG_VERSION="1.2rc1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="BSD"
-PKG_SITE="http://www.speex.org"
-PKG_URL="http://downloads.xiph.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libogg"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="speex: A free Audio Codec optimized for speech"
-PKG_LONGDESC="Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in the 2-45 kbps range. Possible applications include Voice over IP (VoIP), Internet audio streaming, audio books, and archiving of speech data (e.g. voice mail)."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static \
-                           --with-ogg=$SYSROOT_PREFIX/usr \
-                           --enable-fixed-point \
-                           --disable-oggtest \
-                           --disable-float-api \
-                           --disable-vbr"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}
@@ -1,24 +0,0 @@
-diff -Naur speex-1.2rc1/libspeex/Makefile.am speex-1.2rc1.patch/libspeex/Makefile.am
--- speex-1.2rc1/libspeex/Makefile.am	2008-06-04 09:31:35.000000000 +0200
-+++ speex-1.2rc1.patch/libspeex/Makefile.am	2009-03-10 20:40:51.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- EXTRA_DIST=echo_diagnostic.m
- 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
- 
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
-diff -Naur speex-1.2rc1/libspeex/Makefile.in speex-1.2rc1.patch/libspeex/Makefile.in
--- speex-1.2rc1/libspeex/Makefile.in	2008-07-21 04:17:19.000000000 +0200
-+++ speex-1.2rc1.patch/libspeex/Makefile.in	2009-03-10 20:41:25.000000000 +0100
-@@ -277,7 +277,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = echo_diagnostic.m
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
- # Sources for compilation in the library
@@ -1,12 +0,0 @@
-diff -Naur speex-1.2rc1/Makefile.in speex-1.2rc1a/Makefile.in
--- speex-1.2rc1/Makefile.in	2008-07-21 04:17:19.000000000 +0200
-+++ speex-1.2rc1a/Makefile.in	2010-05-18 14:31:25.229200674 +0200
-@@ -213,7 +213,7 @@
- EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
- 
- #Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
-+SUBDIRS = libspeex include doc win32 symbian ti
- DIST_SUBDIRS = libspeex include src doc win32 symbian ti
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1,12 +0,0 @@
-diff -Naur speex-1.2rc1/configure.ac speex-1.2rc1.patch/configure.ac
--- speex-1.2rc1/configure.ac	2008-07-21 04:17:08.000000000 +0200
-+++ speex-1.2rc1.patch/configure.ac	2013-02-01 16:50:06.747570221 +0100
-@@ -2,7 +2,7 @@
- 
- AC_INIT(libspeex/speex.c)
- 
-AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- SPEEX_MAJOR_VERSION=1
- SPEEX_MINOR_VERSION=1
@@ -17,12 +17,12 @@
 ################################################################################

 PKG_NAME="taglib"
-PKG_VERSION="1.9.1"
+PKG_VERSION="1.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://taglib.github.com/"
-PKG_URL="https://github.com/taglib/taglib/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://taglib.github.io/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cmake:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -34,10 +34,15 @@ PKG_AUTORECONF="no"

 # package specific configure options
 configure_target() {
-  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_STATIC=1 ..
 }

 post_makeinstall_target() {
  rm -rf $INSTALL/usr/bin
+  # pkgconf hack
  $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
 }