Merge pull request #1873 from chewitt/version

config: set version to 8.1.0

config/addon/xbmc.service.library.xml

@@ -0,0 +1,35 @@
+<?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.libreelec.tv" version="@OS_VERSION@"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+@REQUIRES@
+  </requires>
+  <extension point="xbmc.service" library="default.py">
+    <provides>@PKG_ADDON_PROVIDES@</provides>
+  </extension>
+  <extension point="xbmc.python.library" library="addon.py">
+    <provides></provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>@PKG_SHORTDESC@</summary>
+    <description>
+@PKG_LONGDESC@
+    </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
+    <platform>all</platform>
+    <news>
+@PKG_ADDON_NEWS@
+    </news>
+    <assets>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
+@PKG_ADDON_SCREENSHOT@
+    </assets>
+  </extension>
+</addon>

config/functions

@@ -17,16 +17,16 @@ setup_toolchain() {
       export CFLAGS="$TARGET_CFLAGS"
       export CXXFLAGS="$TARGET_CXXFLAGS"
       export LDFLAGS="$TARGET_LDFLAGS"
-      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
+      export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
       export PKG_CONFIG_PATH=""
       export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
       export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
       export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
       export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-      export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
+      export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
       if [ ! -f $CMAKE_CONF ] ; then
-        mkdir -p $ROOT/$TOOLCHAIN/etc
+        mkdir -p $TOOLCHAIN/etc
         echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
         echo "SET(CMAKE_SYSTEM_VERSION 1)"  >> $CMAKE_CONF
         echo "SET(CMAKE_SYSTEM_PROCESSOR  $TARGET_ARCH)" >> $CMAKE_CONF
@@ -39,8 +39,8 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)"  >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)"  >> $CMAKE_CONF
       fi
-      export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
-      export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      export HOST_CC="$TOOLCHAIN/bin/host-gcc"
+      export HOST_CXX="$TOOLCHAIN/bin/host-g++"
       export HOSTCC="$HOST_CC"
       export HOSTCXX="$HOST_CXX"
       export CC_FOR_BUILD="$HOST_CC"
@@ -54,8 +54,8 @@ setup_toolchain() {
     host|bootstrap)
       export DESTIMAGE="host"
       export AWK="gawk"
-      export CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
-      export CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      export CC="$TOOLCHAIN/bin/host-gcc"
+      export CXX="$TOOLCHAIN/bin/host-g++"
       export CPP="cpp"
       export LD="ld"
       export AS="as"
@@ -69,14 +69,14 @@ setup_toolchain() {
       export CFLAGS="$HOST_CFLAGS"
       export CXXFLAGS="$HOST_CXXFLAGS"
       export LDFLAGS="$HOST_LDFLAGS"
-      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
+      export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
       export PKG_CONFIG_PATH=""
-      export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
+      export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig"
       export PKG_CONFIG_SYSROOT_DIR=""
       unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
       unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
-      export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
-      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN"
+      export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
+      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN"
       if [ ! -f $CMAKE_CONF ] ; then
         mkdir -p $TOOLCHAIN/etc
         echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
@@ -85,7 +85,7 @@ setup_toolchain() {
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_AR $AR CACHE FILEPATH "Archiver")" >> $CMAKE_CONF # hum?
-        echo "SET(CMAKE_FIND_ROOT_PATH  $ROOT/$TOOLCHAIN)" >> $CMAKE_CONF
+        echo "SET(CMAKE_FIND_ROOT_PATH  $TOOLCHAIN)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF
@@ -120,7 +120,7 @@ get_module_dir() {
 get_build_dir() {
   local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
   if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
-    echo $ROOT/$BUILD/${_PKG_NAME}-${_PKG_VERSION}
+    echo $BUILD/${_PKG_NAME}-${_PKG_VERSION}
   fi
 }
 
@@ -182,41 +182,41 @@ add_group() {
 do_autoreconf() {
   export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoconf" ]; then
-    export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
+  if [ -e "$TOOLCHAIN/bin/autoconf" ]; then
+    export AUTOCONF=$TOOLCHAIN/bin/autoconf
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/automake" ]; then
-    export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
+  if [ -e "$TOOLCHAIN/bin/automake" ]; then
+    export AUTOMAKE=$TOOLCHAIN/bin/automake
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autopoint" ]; then
-    export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
+  if [ -e "$TOOLCHAIN/bin/autopoint" ]; then
+    export AUTOPOINT=$TOOLCHAIN/bin/autopoint
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/libtoolize" ]; then
-    export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
+  if [ -e "$TOOLCHAIN/bin/libtoolize" ]; then
+    export LIBTOOLIZE=$TOOLCHAIN/bin/libtoolize
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/intltoolize" ]; then
-    export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
+  if [ -e "$TOOLCHAIN/bin/intltoolize" ]; then
+    export INTLTOOLIZE=$TOOLCHAIN/bin/intltoolize
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/aclocal" ]; then
-    export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
+  if [ -e "$TOOLCHAIN/bin/aclocal" ]; then
+    export ACLOCAL="$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoheader" ]; then
-    export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
+  if [ -e "$TOOLCHAIN/bin/autoheader" ]; then
+    export AUTOHEADER=$TOOLCHAIN/bin/autoheader
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/libtool" ]; then
-    export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
+  if [ -e "$TOOLCHAIN/bin/libtool" ]; then
+    export LIBTOOL=$TOOLCHAIN/bin/libtool
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
+  if [ -e "$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
     mkdir -p $ACLOCAL_DIR
-    export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
+    export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
     $AUTORECONF $@
   fi
 }
@@ -329,7 +329,7 @@ dashes="==========================="
     linux_config_dir="$PROJECT_DIR/$PROJECT/linux"
   fi
 
-  if [ ! -f $linux_config_dir/linux.$TARGET_ARCH.conf ] &&
+  if [ ! -e $linux_config_dir/linux.$TARGET_ARCH.conf ] &&
      ! ls $linux_config_dir/*/linux.$TARGET_ARCH.conf &>/dev/null; then
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture"
@@ -338,6 +338,7 @@ dashes="==========================="
     check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT"
 
     for arch in $linux_config_dir/*.conf $linux_config_dir/*/linux.$TARGET_ARCH.conf; do
+      [[ ${arch} =~ .*\*.* ]] && continue #ignore unexpanded wildcard
       check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")"
     done
     echo -e $check_arch
@@ -507,7 +508,7 @@ show_config() {
 # strip
 debug_strip() {
   if [ ! "$DEBUG" = yes ]; then
-    find $* -type f -executable | xargs $STRIP 1>/dev/null || :
+    find $* -type f -executable | xargs $STRIP 2>/dev/null || :
   fi
 }
 

config/optimize

@@ -28,10 +28,10 @@ TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
 HOST_CPPFLAGS=""
-HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
+HOST_CFLAGS="-O2 -Wall -pipe -I$TOOLCHAIN/include"
 HOST_CXXFLAGS="$HOST_CFLAGS"
-HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
-HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
+HOST_LDFLAGS="-Wl,-rpath,$TOOLCHAIN/lib -L$TOOLCHAIN/lib"
+HOST_LIBDIR="$TOOLCHAIN/lib"
 
 # work around Ubuntu default C*FLAGS 
 # see https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-Wformat_-Wformat-security
@@ -70,4 +70,4 @@ HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security"
 
   # default dirs
     HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib"
-    HOST_INCDIR="$ROOT/$TOOLCHAIN/include /usr/include"
+    HOST_INCDIR="$TOOLCHAIN/include /usr/include"

config/path

@@ -19,16 +19,9 @@ set -e
 HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
 
-if [ -n "$DEVICE" ]; then
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
-  if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-  fi
-else
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
-  if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-  fi
+BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$LIBREELEC_VERSION
+if [ "$LIBREELEC_VERSION" = "devel" ] ; then
+  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
 fi
 
 if [ -n "$BUILD_SUFFIX" ]; then
@@ -43,11 +36,11 @@ STAMPS=$BUILD/.stamps
 STAMPS_INSTALL=$BUILD/image/.stamps
 DOCS=DOCS
 TOOLCHAIN=$BUILD/toolchain
-SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
+SYSROOT_PREFIX=$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
-TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
+TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
 
-FAKEROOT_SCRIPT=$ROOT/.fakeroot.$BUILD
+FAKEROOT_SCRIPT=$BUILD/.fakeroot
 
 if [ -z "$INSTALL" ]; then
   INSTALL=$BUILD/image/system
@@ -56,8 +49,8 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
 
 . config/sources
 
-MAKE="$ROOT/$TOOLCHAIN/bin/make"
-MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
+MAKE="$TOOLCHAIN/bin/make"
+MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
 SED="sed -i"
 
 # set package metadata
@@ -79,6 +72,8 @@ SED="sed -i"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
   PKG_PATCH_DIRS=""
+  PKG_NEED_UNPACK=""
+  PKG_SHA256=""
 
   if [ -n "$1" ]; then
     _PKG_ROOT_NAME=${1%:*}
@@ -141,6 +136,7 @@ SED="sed -i"
 
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
+    PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
   fi
 
   # Automatically set PKG_SOURCE_NAME unless it is already defined.
@@ -187,17 +183,17 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 . config/optimize
 
 if [ -z "$CCACHE_DIR" ]; then
-  export CCACHE_DIR=$ROOT/$BUILD/.ccache
+  export CCACHE_DIR=$BUILD/.ccache
 fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
-export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
+export PKG_CONFIG=$TOOLCHAIN/bin/pkg-config
 
-if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
-  export PATH="$ROOT/$TOOLCHAIN/bin:$ROOT/$TOOLCHAIN/sbin:$PATH"
+if [ -z "$PATH" -o "$PATH" = "${PATH#$TOOLCHAIN/bin:}" ]; then
+  export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin:$PATH"
 fi
 
-if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
-  export LD_LIBRARY_PATH="$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
+if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$TOOLCHAIN/lib:}" ]; then
+  export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH

config/version

@@ -1,9 +1,8 @@
 # VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="devel"
+  LIBREELEC_VERSION="8.1.0"
 
 # OS_VERSION: OS Version
-  OS_VERSION="8.0"
+  OS_VERSION="8.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="8.1"
-
+  ADDON_VERSION="8.2"

distributions/LibreELEC/options

@@ -13,7 +13,7 @@
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="#                  LibreELEC                 #"
-  GREETING2="#            http://libreelec.tv             #"
+  GREETING2="#            https://libreelec.tv            #"
   GREETING3="##############################################"
   GREETING4=""
 
@@ -136,7 +136,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy vmware"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
@@ -158,13 +158,13 @@
   INITRAMFS_PARTED_SUPPORT="no"
 
 # build with swap support (yes / no)
-  SWAP_SUPPORT="no"
+  SWAP_SUPPORT="yes"
 
 # swap support enabled per default (yes / no)
   SWAP_ENABLED_DEFAULT="no"
 
 # swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
+  SWAPFILESIZE="128"
 
 # build with installer (yes / no)
   INSTALLER_SUPPORT="yes"
@@ -195,4 +195,4 @@
 # Default size of system partition, in MB, eg. 512
   SYSTEM_SIZE=512
 # Default system partition offset, in sectors, eg. 2048
-  SYSTEM_PART_START=2048
+  SYSTEM_PART_START=8192

packages/addons/addon-depends/containerd/package.mk

@@ -57,12 +57,12 @@ pre_make_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath:$PKG_BUILD/vendor/
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/containerd
+  ln -fs $PKG_BUILD $PKG_BUILD/vendor/src/github.com/docker/containerd
 }
 
 make_target() {

packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2017-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,29 +16,18 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="x86-firmware"
-PKG_VERSION="c4c07a8"
-PKG_ARCH="x86_64"
-PKG_LICENSE="other"
-PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
-PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="$PKG_VERSION"
+PKG_NAME="blindscan-s2"
+PKG_VERSION="94cb626"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://bitbucket.org/majortom/blindscan-s2"
+PKG_URL="https://github.com/persianpros/blindscan-s2/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="x86-firmware: x86 related firmware"
-PKG_LONGDESC="x86-firmware: x86 related firmware"
-
-PKG_IS_ADDON="no"
+PKG_SECTION="tools"
+PKG_SHORTDESC="blindscan-s2 is a program to blindscan digital satellite signals"
+PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals"
 PKG_AUTORECONF="no"
 
-configure_target() {
-  :
-}
-
-make_target() {
-  :
-}
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="dvb-fe-tool"
-PKG_VERSION="1388a04"
+PKG_VERSION="326060c"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"
 PKG_URL="https://git.linuxtv.org/cgit.cgi/v4l-utils.git/snapshot/$PKG_VERSION.tar.xz"
 PKG_SOURCE_DIR="$PKG_VERSION*"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain systemd"
 PKG_SECTION="tools"
 PKG_SHORTDESC="dvb-fe-tool: Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
 PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
@@ -42,17 +42,17 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
             --without-libintl-prefix"
 
 post_patch() {
-  mkdir -p $ROOT/$PKG_BUILD/build-aux/
-    touch $ROOT/$PKG_BUILD/build-aux/config.rpath
-    touch $ROOT/$PKG_BUILD/libdvbv5-po/Makefile.in.in
-    touch $ROOT/$PKG_BUILD/v4l-utils-po/Makefile.in.in
+  mkdir -p $PKG_BUILD/build-aux/
+    touch $PKG_BUILD/build-aux/config.rpath
+    touch $PKG_BUILD/libdvbv5-po/Makefile.in.in
+    touch $PKG_BUILD/v4l-utils-po/Makefile.in.in
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME/lib/libdvbv5
+  cd $PKG_BUILD/.$TARGET_NAME/lib/libdvbv5
   make CFLAGS="$TARGET_CFLAGS"
 
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME/utils/dvb
+  cd $PKG_BUILD/.$TARGET_NAME/utils/dvb
   make CFLAGS="$TARGET_CFLAGS"
 }
 

packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk

@@ -0,0 +1,33 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="dvbsnoop"
+PKG_VERSION="c1ec72f"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://dvbsnoop.sourceforge.net/"
+PKG_URL="https://github.com/persianpros/dvbsnoop/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_SHORTDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
+PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
+PKG_AUTORECONF="yes"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mumudvb"
-PKG_VERSION="fa9ff6e"
+PKG_VERSION="b3c9ae7"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mumudvb.net/"

packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk

@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="szap-s2"
+PKG_VERSION="69ff358"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
+PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="CrazyCat-${PKG_NAME}-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_SHORTDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
+PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
+PKG_AUTORECONF="no"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk

@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="tune-s2"
+PKG_VERSION="60cc4aa"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
+PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="CrazyCat-${PKG_NAME}-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_SHORTDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
+PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
+PKG_AUTORECONF="no"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk

@@ -31,7 +31,7 @@ PKG_AUTORECONF="yes"
 # aml 3.14 is meh
 pre_configure_target() {
 if [ "$TARGET_ARCH" = "aarch64" ]; then
-  sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $ROOT/$PKG_BUILD/configure*
-  sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $ROOT/$PKG_BUILD/configure*
+  sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $PKG_BUILD/configure*
+  sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $PKG_BUILD/configure*
 fi
 }

packages/addons/addon-depends/emby-depends/ffmpegx/package.mk

@@ -25,7 +25,7 @@ PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264"
 PKG_LONGDESC="FFmpeg built static with additional features"
 
 pre_configure_target() {
-  cd "$ROOT/$PKG_BUILD"
+  cd "$PKG_BUILD"
   rm -rf ".$TARGET_NAME"
   cp -PR $(get_build_dir ffmpeg)/* .
   make clean
@@ -55,6 +55,7 @@ configure_target() {
     \
     `#Licensing options` \
     --enable-gpl \
+    --enable-nonfree \
     \
     `#Documentation options` \
     --disable-doc \
@@ -80,7 +81,7 @@ configure_target() {
     --as="$CC" \
     --cc="$CC" \
     --ld="$CC" \
-    --pkg-config="$ROOT/$TOOLCHAIN/bin/pkg-config" \
+    --pkg-config="$TOOLCHAIN/bin/pkg-config" \
     --host-cc="$HOST_CC" \
     --host-cflags="$HOST_CFLAGS" \
     --host-ldflags="$HOST_LDFLAGS" \

packages/addons/addon-depends/emby-depends/x264/package.mk

@@ -25,7 +25,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="x264"
 
 pre_configure_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 }
 

packages/addons/addon-depends/go/package.mk

@@ -42,22 +42,22 @@ PKG_AUTORECONF="no"
 
 configure_host() {
   export GOOS=linux
-  export GOROOT_FINAL=$ROOT/$TOOLCHAIN/lib/golang
+  export GOROOT_FINAL=$TOOLCHAIN/lib/golang
   export GOROOT_BOOTSTRAP=/usr/lib/golang
   export GOARCH=amd64
 }
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/src
+  cd $PKG_BUILD/src
   bash make.bash --no-banner
 }
 
 pre_makeinstall_host() {
   # need to cleanup old golang version when updating to a new version
-  rm -rf $ROOT/$TOOLCHAIN/lib/golang
+  rm -rf $TOOLCHAIN/lib/golang
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib/golang
-  cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/
+  mkdir -p $TOOLCHAIN/lib/golang
+  cp -av $PKG_BUILD/* $TOOLCHAIN/lib/golang/
 }

packages/addons/addon-depends/gtk+/package.mk

@@ -32,7 +32,7 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_GLIB_GENMARSHAL=$ROOT/$TOOLCHAIN/bin/glib-genmarshal \
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_GLIB_GENMARSHAL=$TOOLCHAIN/bin/glib-genmarshal \
                            --disable-glibtest \
                            --enable-modules \
                            --enable-explicit-deps=no \

packages/addons/addon-depends/icu/package.mk

@@ -35,7 +35,7 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
-                           --with-cross-build=$ROOT/$PKG_BUILD/.$HOST_NAME"
+                           --with-cross-build=$PKG_BUILD/.$HOST_NAME"
 
 PKG_CONFIGURE_SCRIPT="source/configure"
 

packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk

@@ -38,7 +38,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
 
 pre_configure_target() {
   # serdisplib fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rmdir .$TARGET_NAME
 
   # use libusb-config from sysroot

packages/addons/addon-depends/libimobiledevice/package.mk

@@ -22,7 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libimobiledevice.org"
 PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libusbmuxd libressl"
+PKG_DEPENDS_TARGET="toolchain libusbmuxd openssl"
 PKG_SECTION="libs"
 PKG_SHORTDESC="libimobiledevice is a cross-platform software library that talks the protocols to support iPhone®, iPod Touch®, iPad® and Apple TV® devices"
 PKG_LONGDESC="libimobiledevice is a cross-platform software library that talks the protocols to support iPhone®, iPod Touch®, iPad® and Apple TV® devices"
@@ -34,5 +34,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-largefile"
 
 post_makeinstall_target() {
-  cp $ROOT/$PKG_BUILD/common/utils.h $SYSROOT_PREFIX/usr/include/libimobiledevice/
+  cp $PKG_BUILD/common/utils.h $SYSROOT_PREFIX/usr/include/libimobiledevice/
 }

packages/addons/addon-depends/libnetwork/package.mk

@@ -58,9 +58,9 @@ pre_make_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD.gopath
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 }
 

packages/addons/addon-depends/librespot-depends/pyalsaaudio/package.mk

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="pyalsaaudio"
+PKG_VERSION="0.8.4"
+PKG_LICENSE="PSF"
+PKG_SITE="http://larsimmisch.github.io/pyalsaaudio/"
+PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host alsa-lib"
+PKG_LONGDESC="ALSA bindings"
+
+make_target() {
+  export LDSHARED="$CC -shared"
+  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+  python setup.py build --cross-compile
+}
+
+makeinstall_target() {
+  python setup.py install --root=$INSTALL --prefix=/usr
+  find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
+  rm -rf $INSTALL/usr/lib/python*/site-packages/*.egg-info \
+         $INSTALL/usr/lib/python*/site-packages/*/tests
+}

packages/addons/addon-depends/librespot-depends/rust/package.mk

@@ -0,0 +1,81 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="rust"
+PKG_VERSION="1.18.0"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="https://www.rust-lang.org"
+PKG_URL=""
+PKG_DEPENDS="toolchain"
+PKG_SECTION="devel"
+PKG_LONGDESC="Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+unpack() {
+  :
+}
+
+configure_target() {
+  :
+}
+
+make_target() {
+  export CARGO_HOME="$TOOLCHAIN/.cargo"
+  export RUSTUP_HOME="$CARGO_HOME"
+  export PATH="$CARGO_HOME/bin:$PATH"
+  rm -rf "$CARGO_HOME"
+  curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path -y
+  rustup default "$PKG_VERSION"
+  case "$TARGET_ARCH" in
+    aarch64)
+      RUST_TRIPLE="aarch64-unknown-linux-gnu"
+      ;;
+    arm)
+      RUST_TRIPLE="arm-unknown-linux-gnueabihf"
+      ;;
+    x86_64)
+      RUST_TRIPLE="x86_64-unknown-linux-gnu"
+      ;;
+  esac
+  if [ "$TARGET_ARCH" != "x86_64" ]; then
+    rustup target add "$RUST_TRIPLE"
+  fi
+
+  cat <<EOF >"$CARGO_HOME/config"
+[target.$RUST_TRIPLE]
+linker = "$CC"
+EOF
+
+  cat <<'EOF' >"$CARGO_HOME/env"
+export CARGO_HOME="$TOOLCHAIN/.cargo"
+export CARGO_TARGET_DIR="$PKG_BUILD/.$TARGET_NAME"
+export PATH="$CARGO_HOME/bin:$PATH"
+export RUSTUP_HOME="$CARGO_HOME"
+mkdir -p "$CARGO_TARGET_DIR"
+EOF
+
+  echo "CARGO_BUILD=\"cargo build --release --target $RUST_TRIPLE\"" \
+       >>"$CARGO_HOME/env"
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/moonlight-embedded/package.mk

@@ -45,7 +45,7 @@ fi
 PKG_CMAKE_OPTS_TARGET="$FREESCALE_V4L_INCLUDE"
 
 pre_build_target() {
-  cp -a $(get_build_dir moonlight-common-c)/* $ROOT/$PKG_BUILD/third_party/moonlight-common-c
+  cp -a $(get_build_dir moonlight-common-c)/* $PKG_BUILD/third_party/moonlight-common-c
 }
 
 pre_configure_target() {

packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk

@@ -53,5 +53,5 @@ post_makeinstall_target() {
     mkdir -p $SYSROOT_PREFIX/usr/include/MediaInfo/$i/
     cp -aP ../../../Source/MediaInfo/$i/*.h $SYSROOT_PREFIX/usr/include/MediaInfo/$i/
   done
-  cp -P libmediainfo-config $ROOT/$TOOLCHAIN/bin
+  cp -P libmediainfo-config $TOOLCHAIN/bin
 }

packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk

@@ -50,5 +50,5 @@ post_makeinstall_target() {
     mkdir -p $SYSROOT_PREFIX/usr/include/ZenLib/$i/
     cp -aP ../../../Source/ZenLib/$i/*.h $SYSROOT_PREFIX/usr/include/ZenLib/$i/
   done
-  cp -P libzen-config $ROOT/$TOOLCHAIN/bin
+  cp -P libzen-config $TOOLCHAIN/bin
 }

packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk

@@ -29,5 +29,5 @@ PKG_LONGDESC="OpenCaster is a free and open source MPEG2 transport stream data g
 PKG_AUTORECONF="no"
 
 pre_makeinstall_target() {
-  mkdir -p $ROOT/$PKG_BUILD/.install_pkg
+  mkdir -p $PKG_BUILD/.install_pkg
 }

packages/addons/addon-depends/network-tools-depends/irssi/package.mk

@@ -22,7 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"
 PKG_URL="https://github.com/irssi-import/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain glib netbsd-curses libressl"
+PKG_DEPENDS_TARGET="toolchain glib netbsd-curses openssl"
 PKG_SECTION="tools"
 PKG_SHORTDESC="IRC client"
 PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems"
@@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
         --without-sco"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -I$ROOT/$PKG_BUILD"
+  export CFLAGS="$CFLAGS -I$PKG_BUILD"
   export LIBS="-ltermcap"
 }
 

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -22,7 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lftp.yar.ru/"
 PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain readline libressl zlib"
+PKG_DEPENDS_TARGET="toolchain readline openssl zlib"
 PKG_SECTION="tools"
 PKG_SHORTDESC="ftp client"
 PKG_LONGDESC="LFTP is a sophisticated ftp/http client, and a file transfer program supporting a number of network protocols"

packages/addons/addon-depends/network-tools-depends/nmap/package.mk

@@ -38,7 +38,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
 
 pre_configure_target() {
 # nmap fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 
   export CPPFLAGS="$CPPFLAGS -Iliblua"

packages/addons/addon-depends/ninja/package.mk

@@ -38,5 +38,5 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp ninja $ROOT/$TOOLCHAIN/bin/
+  cp ninja $TOOLCHAIN/bin/
 }

packages/addons/addon-depends/nspr/package.mk

@@ -37,8 +37,8 @@ if [ "$TARGET_ARCH" = "x86_64" ] ; then
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--with-pthreads $TARGET_USE_64"
-PKG_MAKE_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
-PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
+PKG_MAKE_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall"
+PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall"
 
 configure_target() {
   cd $(get_build_dir nss)/nspr

packages/addons/addon-depends/nss/package.mk

@@ -34,7 +34,7 @@ PKG_AUTORECONF="no"
 MAKEFLAGS=-j1
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/nss
+  cd $PKG_BUILD/nss
 
   [ "$TARGET_ARCH" = "x86_64" ] && export USE_64=1
 
@@ -42,15 +42,15 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $ROOT/$TOOLCHAIN/bin
+  cp $PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $TOOLCHAIN/bin
 }
 
 post_makeinstall_host() {
-  rm -rf $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/Linux*
+  rm -rf $PKG_BUILD/nss/coreconf/nsinstall/Linux*
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/nss
+  cd $PKG_BUILD/nss
 
   [ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1"
 
@@ -59,14 +59,14 @@ make_target() {
      USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
      OS_TEST=$TARGET_ARCH \
      NSS_TESTS="dummy" \
-     NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall \
+     NSINSTALL=$TOOLCHAIN/bin/nsinstall \
      CPU_ARCH_TAG=$TARGET_ARCH \
      CC=$CC LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" \
      V=1
 }
 
 makeinstall_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   $STRIP dist/Linux*/lib/*.so
   cp -L dist/Linux*/lib/*.so $SYSROOT_PREFIX/usr/lib
   cp -L dist/Linux*/lib/libcrmf.a $SYSROOT_PREFIX/usr/lib

packages/addons/addon-depends/pngquant/package.mk

@@ -35,13 +35,13 @@ configure_host() {
 }
 
 make_host() {
-  cd $ROOT/$PKG_BUILD
-  BIN=$ROOT/$PKG_BUILD/pngquant make
+  cd $PKG_BUILD
+  BIN=$PKG_BUILD/pngquant make
 
-  $STRIP $ROOT/$PKG_BUILD/pngquant
+  $STRIP $PKG_BUILD/pngquant
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp $ROOT/$PKG_BUILD/pngquant $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp $PKG_BUILD/pngquant $TOOLCHAIN/bin
 }

packages/addons/addon-depends/protobuf/package.mk

@@ -28,7 +28,7 @@ PKG_LONGDESC="protobuf: Protocol Buffers - Google's data interchange format"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/cmake/CMakeLists.txt"
+PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
 
 PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
                      -DBUILD_SHARED_LIBS=0 \

packages/addons/addon-depends/qtbase/package.mk

@@ -30,7 +30,7 @@ PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="-prefix /usr
                            -sysroot $SYSROOT_PREFIX
-                           -hostprefix $ROOT/$TOOLCHAIN
+                           -hostprefix $TOOLCHAIN
                            -device linux-libreelec-g++
                            -opensource -confirm-license
                            -release

packages/addons/addon-depends/runc/package.mk

@@ -57,12 +57,12 @@ pre_make_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -X main.version=$(cat ./VERSION) -extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath:$PKG_BUILD/Godeps/_workspace/
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/Godeps/_workspace/src/github.com/opencontainers/runc
+  ln -fs $PKG_BUILD $PKG_BUILD/Godeps/_workspace/src/github.com/opencontainers/runc
 }
 
 make_target() {

packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libmtp"
-PKG_VERSION="1.1.11"
+PKG_VERSION="1.1.13"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libmtp.sourceforge.net/"

packages/addons/addon-depends/system-tools-depends/diffutils/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="diffutils"
-PKG_VERSION="3.5"
+PKG_VERSION="3.6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/diffutils/"

packages/addons/addon-depends/system-tools-depends/dstat/package.mk

@@ -0,0 +1,41 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="dstat"
+PKG_VERSION="77e9347"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://dag.wiee.rs/home-made/dstat"
+PKG_URL="https://github.com/dagwieers/dstat/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python"
+PKG_SECTION="tools"
+PKG_SHORTDESC="Versatile resource statistics tool"
+PKG_LONGDESC="Versatile resource statistics tool"
+PKG_AUTORECONF="no"
+
+post_unpack() {
+rm $PKG_BUILD/Makefile
+}
+
+make_target() {
+  : # nothing to do
+}
+
+makeinstall_target() {
+  : # nothing to do
+}

packages/addons/addon-depends/system-tools-depends/dtach/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="dtach"
-PKG_VERSION="0.8"
+PKG_VERSION="0.9"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dtach.sourceforge.net"
-PKG_URL="http://download.sourceforge.net/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/crigler/dtach/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="dtach - A program that emulates the detach feature of screen"

packages/addons/addon-depends/system-tools-depends/fdupes/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="fdupes"
-PKG_VERSION="1.51"
+PKG_VERSION="1.6.1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://premium.caribe.net/~adrian2/fdupes.html"
-PKG_URL="https://fdupes.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adrianlopezroche/fdupes/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="FDUPES is a program for identifying or deleting duplicate files residing within specified directories"

packages/addons/addon-depends/system-tools-depends/fdupes/patches/fdupes-01-crosscompile.patch

@@ -6,7 +6,7 @@ index 1d5e41a..6dc6da4 100644
  #
  # Make Configuration
  #
--CC = gcc
+-CC ?= gcc
  COMPILER_OPTIONS = -Wall -O -g
  
  CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE) $(OMIT_GETOPT_LONG)

packages/addons/addon-depends/system-tools-depends/file/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,17 +17,17 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="5.29"
+PKG_VERSION="70c5f15"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.darwinsys.com/file/"
-PKG_URL="ftp://ftp.astron.com/pub/file/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/file/file/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain zlib file:host"
 PKG_SECTION="tools"
 PKG_SHORTDESC="file: File type identification utility"
 PKG_LONGDESC="These are the sources to Darwin's file(1) utility and master magic(4) file, now maintained by Christos Zoulas. The file(1) utility is used to determine the types of various files."
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_HOST="--enable-fsect-man5 --enable-static --disable-shared"
 PKG_CONFIGURE_OPTS_TARGET="--enable-fsect-man5 --enable-static --disable-shared"

packages/addons/addon-depends/system-tools-depends/file/patches/file-fix-segfault-in-magic_close.patch

@@ -1,17 +0,0 @@
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 961e83d..b7d500c 100644
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -348,11 +348,9 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
- protected void
- file_ms_free(struct magic_set *ms)
- {
--	size_t i;
- 	if (ms == NULL)
- 		return;
--	for (i = 0; i < MAGIC_SETS; i++)
--		mlist_free(ms->mlist[i]);
-+	mlist_free(ms->mlist[0]);
- 	free(ms->o.pbuf);
- 	free(ms->o.buf);
- 	free(ms->c.li);

packages/addons/addon-depends/system-tools-depends/file/patches/file-zip.patch

@@ -1,26 +0,0 @@
-From e990dc53f658cb67ec7b33c32e0bc24e65801792 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sat, 14 May 2011 15:04:15 +0000
-Subject: [PATCH] small archive
-
----
- magic/Magdir/archive |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/magic/Magdir/archive b/magic/Magdir/archive
-index e84c8e3..5ad1ce3 100644
---- a/magic/Magdir/archive
-+++ b/magic/Magdir/archive
-@@ -654,6 +654,9 @@
- >>>>78	string	-template		Template
- !:mime	application/vnd.oasis.opendocument.image-template
- 
-+>26	byte	x			Zip archive data
-+
-+
- # StarView Metafile
- # From Pierre Ducroquet <pinaraf@pinaraf.info>
- 0	string	VCLMTF	StarView MetaFile
--- 
-1.7.4.1
-

packages/addons/addon-depends/system-tools-depends/hd-idle/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="hd-idle"
-PKG_VERSION="1.04"
+PKG_VERSION="1.05"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://hd-idle.sourceforge.net/"

packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="hddtemp"
-PKG_VERSION="0.3-beta15"
+PKG_VERSION="e16aed6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.guzu.net/linux/hddtemp.php"
-PKG_URL="http://download.savannah.gnu.org/releases/hddtemp/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://github.com/guzu/hddtemp/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="debug/tools"
 PKG_SHORTDESC="hddtemp: tool that reports hard drive temperature"
@@ -30,6 +30,11 @@ PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db"
 
+post_unpack() {
+  cd $PKG_BUILD
+  wget -O hddtemp.db http://www.guzu.net/linux/hddtemp.db
+}
+
 makeinstall_target() {
   : # nop
 }

packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,12 +17,11 @@
 ################################################################################
 
 PKG_NAME="hid_mapper"
-PKG_VERSION="0"
+PKG_VERSION="2.1.0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL="http://www.coldsource.net/hid_mapper.tar.gz"
-PKG_SOURCE_DIR="${PKG_NAME}_beta"
+PKG_SITE="https://github.com/s-leroux/hid_mapper"
+PKG_URL="https://github.com/s-leroux/hid_mapper/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="generic HID mapper"

packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-03_fix-parser.patch

@@ -1,11 +1,9 @@
-diff --git a/MapReader.cpp b/MapReader.cpp
-index e64b636..bd1ab68 100644
 --- a/MapReader.cpp
 +++ b/MapReader.cpp
-@@ -98,7 +98,10 @@ void MapReader::LoadMap(const char *filename,EventMapping *map)
- 			
+@@ -106,7 +106,10 @@
  			i = 0;
- 			while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && ptr[i]!=' ')
+ 
+ 			while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && (!isspace(ptr[i])))
 -				key_name[i] = ptr[i++];
 +				{
 +					key_name[i] = ptr[i];

packages/addons/addon-depends/system-tools-depends/htop/package.mk

@@ -0,0 +1,32 @@
+################################################################################
+#      This file is part of LibreELEC - https://LibreELEC.tv
+#      Copyright (C) 2016-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="htop"
+PKG_VERSION="2.0.2"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://hisham.hm/htop"
+PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain netbsd-curses"
+PKG_SECTION="tools"
+PKG_SHORTDESC="An interactive process viewer for Unix"
+PKG_AUTORECONF="yes"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fno-strict-aliasing -lncurses -lterminfo"
+}

packages/addons/addon-depends/system-tools-depends/htop/patches/htop-01_netbsd-curses_support.patch

@@ -0,0 +1,142 @@
+From: awiouy <awiouy@gmail.com>
+Date: Thu, 6 Jul 2017 18:51:24 +0200
+Subject: [PATCH] htop: netbsd-curses support
+
+diff --git a/RichString.c b/RichString.c
+--- a/RichString.c
++++ b/RichString.c
+@@ -18,21 +18,7 @@ in the source distribution for its full text.
+ #include <ctype.h>
+ 
+ #include <assert.h>
+-#ifdef HAVE_NCURSESW_CURSES_H
+-#include <ncursesw/curses.h>
+-#elif HAVE_NCURSES_NCURSES_H
+-#include <ncurses/ncurses.h>
+-#elif HAVE_NCURSES_CURSES_H
+-#include <ncurses/curses.h>
+-#elif HAVE_NCURSES_H
+-#include <ncurses.h>
+-#elif HAVE_CURSES_H
+ #include <curses.h>
+-#endif
+-
+-#ifdef HAVE_LIBNCURSESW
+-#include <wctype.h>
+-#endif
+ 
+ #define RichString_size(this) ((this)->chlen)
+ #define RichString_sizeVal(this) ((this).chlen)
+@@ -41,19 +27,11 @@ in the source distribution for its full text.
+ #define RichString_beginAllocated(this) memset(&this, 0, sizeof(RichString)); (this).chptr = (this).chstr;
+ #define RichString_end(this) RichString_prune(&(this));
+ 
+-#ifdef HAVE_LIBNCURSESW
+-#define RichString_printVal(this, y, x) mvadd_wchstr(y, x, (this).chptr)
+-#define RichString_printoffnVal(this, y, x, off, n) mvadd_wchnstr(y, x, (this).chptr + off, n)
+-#define RichString_getCharVal(this, i) ((this).chptr[i].chars[0] & 255)
+-#define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)] = (CharType) { .chars = { ch, 0 } }; } while(0)
+-#define CharType cchar_t
+-#else
+ #define RichString_printVal(this, y, x) mvaddchstr(y, x, (this).chptr)
+ #define RichString_printoffnVal(this, y, x, off, n) mvaddchnstr(y, x, (this).chptr + off, n)
+ #define RichString_getCharVal(this, i) ((this).chptr[i])
+ #define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)] = ch; } while(0)
+ #define CharType chtype
+-#endif
+ 
+ typedef struct RichString_ {
+    int chlen;
+@@ -87,41 +65,6 @@ static void RichString_extendLen(RichString* this, int len) {
+ 
+ #define RichString_setLen(this, len) do{ if(len < RICHSTRING_MAXLEN && this->chlen < RICHSTRING_MAXLEN) { RichString_setChar(this,len,0); this->chlen=len; } else RichString_extendLen(this,len); }while(0)
+ 
+-#ifdef HAVE_LIBNCURSESW
+-
+-static inline void RichString_writeFrom(RichString* this, int attrs, const char* data_c, int from, int len) {
+-   wchar_t data[len+1];
+-   len = mbstowcs(data, data_c, len);
+-   if (len < 0)
+-      return;
+-   int newLen = from + len;
+-   RichString_setLen(this, newLen);
+-   for (int i = from, j = 0; i < newLen; i++, j++) {
+-      this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (iswprint(data[j]) ? data[j] : '?') } };
+-   }
+-}
+-
+-inline void RichString_setAttrn(RichString* this, int attrs, int start, int finish) {
+-   cchar_t* ch = this->chptr + start;
+-   for (int i = start; i <= finish; i++) {
+-      ch->attr = attrs;
+-      ch++;
+-   }
+-}
+-
+-int RichString_findChar(RichString* this, char c, int start) {
+-   wchar_t wc = btowc(c);
+-   cchar_t* ch = this->chptr + start;
+-   for (int i = start; i < this->chlen; i++) {
+-      if (ch->chars[0] == wc)
+-         return i;
+-      ch++;
+-   }
+-   return -1;
+-}
+-
+-#else
+-
+ static inline void RichString_writeFrom(RichString* this, int attrs, const char* data_c, int from, int len) {
+    int newLen = from + len;
+    RichString_setLen(this, newLen);
+@@ -148,8 +91,6 @@ int RichString_findChar(RichString* this, char c, int start) {
+    return -1;
+ }
+ 
+-#endif
+-
+ void RichString_prune(RichString* this) {
+    if (this->chlen > RICHSTRING_MAXLEN)
+       free(this->chptr);
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,36 +183,6 @@
+    ], [$4])
+ ])
+ 
+-AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+-if test "x$enable_unicode" = xyes; then
+-   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+-    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+-     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
+-      HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+-       HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+-        HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+-      missing_libraries="$missing_libraries libncursesw"
+-      AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+-   ))))))
+-
+-   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+-      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+-         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+-else
+-   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+-    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
+-     HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
+-      HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
+-      missing_libraries="$missing_libraries libncurses"
+-   ))))
+-   
+-   AC_CHECK_HEADERS([curses.h],[:],
+-      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+-         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+-fi
+-
+ if test "$my_htop_platform" = "freebsd"; then
+    AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
+ fi
+

packages/addons/addon-depends/system-tools-depends/htop/patches/htop-02_temp_remove_set_escdelay.patch

@@ -0,0 +1,36 @@
+From 308aed7fc91f40db7b7f69095c1a7b777bfeb934 Mon Sep 17 00:00:00 2001
+From: awiouy <awiouy@gmail.com>
+Date: Thu, 6 Jul 2017 18:50:57 +0200
+Subject: [PATCH] htop: remove set_escdelay - fixed in netbsd-curses 0.2.1
+
+drop this patch at netbsd-curses bump to 0.2.1 or higher
+
+---
+ InfoScreen.c    | 1 -
+ ScreenManager.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/InfoScreen.c b/InfoScreen.c
+index e27494c7..28017c63 100644
+--- a/InfoScreen.c
++++ b/InfoScreen.c
+@@ -117,7 +117,6 @@ void InfoScreen_run(InfoScreen* this) {
+ 
+       if (this->inc->active)
+          move(LINES-1, CRT_cursorX);
+-      set_escdelay(25);
+       int ch = getch();
+       
+       if (ch == ERR) {
+diff --git a/ScreenManager.c b/ScreenManager.c
+index 05e1c024..5d1d07d1 100644
+--- a/ScreenManager.c
++++ b/ScreenManager.c
+@@ -189,7 +189,6 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
+       }
+ 
+       int prevCh = ch;
+-      set_escdelay(25);
+       ch = getch();
+ 
+       HandlerResult result = IGNORED;

packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,11 +17,12 @@
 ################################################################################
 
 PKG_NAME="lm_sensors"
-PKG_VERSION="3.4.0"
+PKG_VERSION="0d5ccf6"
 PKG_ARCH="arm x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://secure.netroedge.com/~lm78/"
-PKG_URL="http://ftp.gwdg.de/pub/linux/misc/lm-sensors/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://github.com/groeck/lm-sensors/archive/${PKG_VERSION}.tar.gz"
+PKG_SOURCE_DIR="lm-sensors-${PKG_VERSION}*"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="lm_sensors: Hardware monitoring via the SMBus"

packages/addons/addon-depends/system-tools-depends/lshw/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="lshw"
-PKG_VERSION="B.02.17"
+PKG_VERSION="B.02.18"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ezix.org/project/wiki/HardwareLiSter"

packages/addons/addon-depends/system-tools-depends/mc/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 ################################################################################
 
 PKG_NAME="mc"
-PKG_VERSION="4.8.17"
+PKG_VERSION="4.8.19"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
@@ -27,9 +27,7 @@ PKG_DEPENDS_TARGET="toolchain libtool:host gettext:host glib pcre netbsd-curses"
 PKG_SECTION="tools"
 PKG_SHORTDESC="mc: visual file manager"
 PKG_LONGDESC="mc is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included"
-
 PKG_AUTORECONF="no"
-PKG_IS_ADDON="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
             --datadir=/storage/.kodi/addons/virtual.system-tools/data \

packages/addons/addon-depends/system-tools-depends/mc/patches/mc-01-netbsd-curses.patch

@@ -1,50 +0,0 @@
-From 38d4c655d322837574e957b4a824f4a0d1bb3b86 Mon Sep 17 00:00:00 2001
-From: rofl0r <retnyg@gmx.net>
-Date: Mon, 18 Jul 2016 22:19:56 +0100
-Subject: [PATCH] Ticket #3665: fix compatibility with netbsd curses.
-
-The code that manipulates the ncurses backend into changing
-the key combination to generate SIGINT from CTRL-c to CTRL-g does
-so by accessing undocumented internal ncurses data structures.
-This breaks compilation with netbsd-curses[0], and could also break
-when the ncurses author decides to change internal structures in a
-future release.
-
-Fix it by using a portable approach that works everywhere using libc
-primitives instead.
-
-[0] https://github.com/sabotage-linux/netbsd-curses
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/tty/tty-ncurses.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
-index efee8ec..76a21d2 100644
---- a/lib/tty/tty-ncurses.c
-+++ b/lib/tty/tty-ncurses.c
-@@ -179,6 +179,7 @@ mc_tty_normalize_lines_char (const char *ch)
- void
- tty_init (gboolean mouse_enable, gboolean is_xterm)
- {
-+    struct termios mode;
-     initscr ();
- 
- #ifdef HAVE_ESCDELAY
-@@ -194,11 +195,12 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
-     ESCDELAY = 200;
- #endif /* HAVE_ESCDELAY */
- 
-+    tcgetattr (STDIN_FILENO, &mode);
-     /* use Ctrl-g to generate SIGINT */
--    cur_term->Nttyb.c_cc[VINTR] = CTRL ('g');   /* ^g */
-+    mode.c_cc[VINTR] = CTRL ('g');      /* ^g */
-     /* disable SIGQUIT to allow use Ctrl-\ key */
--    cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
--    tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
-+    mode.c_cc[VQUIT] = NULL_VALUE;
-+    tcsetattr (STDIN_FILENO, TCSANOW, &mode);
- 
-     tty_start_interrupt_key ();
- 

packages/addons/addon-depends/system-tools-depends/mc/patches/mc-02-netbsd-curses.patch

@@ -1,27 +0,0 @@
-From 2da86f2595157c68c2d49e6c2b08a508750878ed Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Tue, 9 Aug 2016 16:55:12 +0300
-Subject: [PATCH] Define NCURSES_CONST if curses library doesn't define it.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/tty/tty-ncurses.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h
-index 4f0e603..9962c7c 100644
---- a/lib/tty/tty-ncurses.h
-+++ b/lib/tty/tty-ncurses.h
-@@ -20,6 +20,11 @@
- #include <ncursesw/curses.h>
- #endif /* USE_NCURSESW */
- 
-+/* netbsd-libcurses doesn't define NCURSES_CONST */
-+#ifndef NCURSES_CONST
-+#define NCURSES_CONST const
-+#endif
-+
- /*** typedefs(not structures) and defined constants **********************************************/
- 
- /*** enums ***************************************************************************************/
-

packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,16 +17,16 @@
 ################################################################################
 
 PKG_NAME="mtpfs"
-PKG_VERSION="1.1"
+PKG_VERSION="fd3864d"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.adebenham.com/mtpfs/"
-PKG_URL="http://www.adebenham.com/files/mtp/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse libmtp glib"
 PKG_SECTION="tools"
 PKG_SHORTDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device"
 PKG_LONGDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device"
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-mad"
 

packages/addons/addon-depends/system-tools-depends/p7zip/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="p7zip"
-PKG_VERSION="15.14"
+PKG_VERSION="16.02"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://p7zip.sourceforge.net/"

packages/addons/addon-depends/system-tools-depends/screen/package.mk

@@ -40,7 +40,7 @@ pre_configure_target() {
   export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
 
 # screen fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 }
 

packages/addons/addon-depends/system-tools-depends/strace/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="strace"
-PKG_VERSION="4.11"
+PKG_VERSION="4.17"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://sourceforge.net/projects/strace/"

packages/addons/addon-depends/system-tools-depends/strace/patches/strace-4.17-autoreconf.patch

@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,11 +31,7 @@
+ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ AC_PREREQ(2.57)
+-AC_INIT([strace],
+-	m4_esyscmd([./git-version-gen .tarball-version]),
+-	[strace-devel@lists.sourceforge.net],
+-	[strace],
+-	[https://strace.io])
++AC_INIT([strace],[4.17])
+ m4_define([copyright_year], m4_esyscmd([./copyright-year-gen .year]))
+ AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.])
+ AC_CONFIG_SRCDIR([strace.c])

packages/addons/addon-depends/system-tools-depends/strace/patches/strace-4.8-autoreconf.patch

@@ -1,13 +0,0 @@
-diff -Naur strace-4.8/configure.ac strace-4.8.patch/configure.ac
---- strace-4.8/configure.ac	2013-05-04 21:51:57.000000000 +0200
-+++ strace-4.8.patch/configure.ac	2013-09-04 03:30:12.478057723 +0200
-@@ -1,8 +1,6 @@
- dnl Process this file with autoconf to create configure.  Use autoreconf.
- AC_PREREQ(2.57)
--AC_INIT([strace],
--	m4_esyscmd([./git-version-gen .tarball-version]),
--	[strace-devel@lists.sourceforge.net])
-+AC_INIT([strace],[4.8])
- AC_CONFIG_SRCDIR([strace.c])
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_HEADERS([config.h])

packages/addons/addon-depends/system-tools-depends/unrar/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="unrar"
-PKG_VERSION="5.3.11"
+PKG_VERSION="5.5.5"
 PKG_ARCH="any"
 PKG_LICENSE="free"
 PKG_SITE="http://www.rarlab.com"

packages/addons/addon-depends/system-tools-depends/vim/package.mk

@@ -0,0 +1,56 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vim"
+PKG_VERSION="8.0.0684"
+PKG_ARCH="any"
+PKG_LICENSE="VIM"
+PKG_SITE="http://www.vim.org/"
+PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain netbsd-curses"
+PKG_SECTION="tools"
+PKG_SHORTDESC="vim: VI IMproved"
+PKG_LONGDESC="Vim is a highly configurable text editor built to enable efficient text editing."
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_TARGET="vim_cv_getcwd_broken=no \
+                           vim_cv_memmove_handles_overlap=yes \
+                           vim_cv_stat_ignores_slash=yes \
+                           vim_cv_terminfo=yes \
+                           vim_cv_tgent=zero \
+                           vim_cv_toupper_broken=no \
+                           vim_cv_tty_group=world \
+                           vim_cv_tty_mode=0620 \
+                           ac_cv_sizeof_int=4 \
+                           ac_cv_small_wchar_t=no \
+			   --enable-selinux=no \
+                           --enable-gui=no \
+                           --with-compiledby=LibreELEC \
+                           --with-features=huge \
+                           --with-tlib=ncurses \
+                           --without-x"
+
+pre_configure_target() {
+  cd ..
+  rm -rf .$TARGET_NAME
+  export LIBS="-lcurses -lterminfo"
+}
+
+make_target() {
+  :
+}

packages/addons/addon-depends/system-tools-depends/vim/patches/vim-01-disable-mouse-in-default-config.patch

@@ -0,0 +1,15 @@
+--- a/runtime/defaults.vim
++++ b/runtime/defaults.vim
+@@ -66,9 +66,9 @@
+ 
+ " In many terminal emulators the mouse works just fine.  By enabling it you
+ " can position the cursor, Visually select and scroll with the mouse.
+-if has('mouse')
+-  set mouse=a
+-endif
++"if has('mouse')
++"  set mouse=a
++"endif
+ 
+ " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).

packages/addons/addon-depends/tini/package.mk

@@ -36,7 +36,7 @@ PKG_CMAKE_TARGET_OPTS="-DMINIMAL=ON"
 PKG_MAKE_TARGET_OPTS="tini-static"
 
 pre_configure_target(){
-  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $ROOT/$PKG_BUILD/src/tiniConfig.h.in
+  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $PKG_BUILD/src/tiniConfig.h.in
 }
 
 makeinstall_target() {

packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk

@@ -53,7 +53,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk

@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk

@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk

@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk

@@ -46,7 +46,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk

@@ -52,7 +52,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk

@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk

@@ -22,7 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev"
 PKG_URL="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain vdr libressl"
+PKG_DEPENDS_TARGET="toolchain vdr openssl"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
 PKG_LONGDESC="TV"
@@ -46,8 +46,8 @@ post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
-  cp --remove-destination $ROOT/$PKG_BUILD/server/${LIB_NAME}-server.so $ROOT/$PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION}
-  cp --remove-destination $ROOT/$PKG_BUILD/client/${LIB_NAME}-client.so $ROOT/$PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/server/${LIB_NAME}-server.so $PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/client/${LIB_NAME}-client.so $PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION}
 
   $STRIP client/libvdr-*.so*
   $STRIP server/libvdr-*.so*

packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk

@@ -46,7 +46,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

packages/addons/browser/chromium/package.mk

@@ -47,7 +47,7 @@ make_target() {
   export LD=$CXX
 
   # Use Python 2
-  find . -name '*.py' -exec sed -i -r "s|/usr/bin/python$|$ROOT/$TOOLCHAIN/bin/python|g" {} +
+  find . -name '*.py' -exec sed -i -r "s|/usr/bin/python$|$TOOLCHAIN/bin/python|g" {} +
 
   # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
   # Note: These are for OpenELEC use ONLY. For your own distribution, please
@@ -114,7 +114,7 @@ make_target() {
   ./third_party/libaddressinput/chromium/tools/update-strings.py
 
   ./tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}"
-  ./out/Release/gn gen out/Release --args="${_flags[*]}" --script-executable=$ROOT/$TOOLCHAIN/bin/python
+  ./out/Release/gn gen out/Release --args="${_flags[*]}" --script-executable=$TOOLCHAIN/bin/python
 
   ninja -C out/Release chrome chrome_sandbox widevinecdmadapter
 }

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,8 +1,2 @@
-8.0.100
-- Update for LibreELEC 8.0
-
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
+100
+- Initial add-on

packages/addons/driver/imon-mce/changelog.txt

@@ -1,8 +1,5 @@
-8.0.100
-- Update for LibreELEC 8.0
+101
+- Added proper icon and description
 
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
+100
+- Initial add-on

packages/addons/driver/sapphire/changelog.txt

@@ -1,8 +1,8 @@
-8.0.102
+102
 - Rebuild driver against 4.8 kernel
 
-8.0.101
+101
 - Rebuild driver against 4.7 kernel
 
-8.0.100
+100
 - Initial add-on

packages/addons/driver/steamcontroller/changelog.txt

@@ -1,6 +1,6 @@
-8.1.101
+101
 - Update to 60499dc
 - Fix cpu usage due to high polling rate
 
-8.0.100
+100
 - Initial add-on

packages/addons/driver/steamcontroller/package.mk

@@ -61,6 +61,6 @@ addon() {
     fi
     cp $(get_build_dir linux)/usr/include/linux/input.h $ADDON_BUILD/$PKG_ADDON_ID/include/linux/
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $ADDON_BUILD/$PKG_ADDON_ID/lib/ -f 1>/dev/null
+  python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $ADDON_BUILD/$PKG_ADDON_ID/lib/ -f 1>/dev/null
   find $ADDON_BUILD/$PKG_ADDON_ID/lib/ -name '*.py' -exec rm {} \;
 }

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,17 +1,11 @@
-8.0.102
-- automatically update driver to latest version on first install
-  show driver version in addon settings
-  allow update for aarch64 architecture
-  german translations
+102
+- Automatically update driver to latest version on first install
+- Show driver version in addon settings
+- Allow update for aarch64 architecture
+- German translations
 
-8.0.101
-- system wait-for-online preference is now respected
+101
+- System wait-for-online preference is now respected
 
-8.0.100
-- Update for LibreELEC 8.0
-
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
+100
+- Initial add-on

packages/addons/driver/sundtek-mediatv/package.mk

@@ -34,8 +34,8 @@ PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"
 
 make_target() {
-  mkdir -p $ROOT/$PKG_BUILD
-  cd $ROOT/$PKG_BUILD
+  mkdir -p $PKG_BUILD
+  cd $PKG_BUILD
 
   case $TARGET_ARCH in
     x86_64)

packages/addons/script/moonlight/package.mk

@@ -38,8 +38,8 @@ PKG_ADDON_PROVIDES="executable"
 
 post_unpack() {
   # don't use the files from the script
-  rm $ROOT/$PKG_BUILD/script.moonlight/icon.png
-  rm $ROOT/$PKG_BUILD/script.moonlight/changelog.txt
+  rm $PKG_BUILD/script.moonlight/icon.png
+  rm $PKG_BUILD/script.moonlight/changelog.txt
 }
 
 make_target() {
@@ -52,7 +52,7 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp -PR $ROOT/$PKG_BUILD/script.moonlight/* $ADDON_BUILD/$PKG_ADDON_ID
+    cp -PR $PKG_BUILD/script.moonlight/* $ADDON_BUILD/$PKG_ADDON_ID
 
     # use our own changelog.txt
     cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID

packages/addons/service/boblightd/changelog.txt

@@ -1,8 +1,2 @@
-8.0.100
-- Update for LibreELEC 8.0
-
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
+100
+- Initial add-on

packages/addons/service/dispmanx_vnc/package.mk

@@ -24,7 +24,7 @@ PKG_ADDON_PROJECTS="RPi RPi2"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/patrikolausson/dispmanx_vnc"
 PKG_URL="https://github.com/patrikolausson/dispmanx_vnc/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig libressl"
+PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig openssl"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Raspberry Pi VNC: a Virtual Network Computing server for Raspberry Pi"
 PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"

packages/addons/service/docker/package.mk

@@ -24,6 +24,7 @@ PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6 WeTek_Hub WeTek_Play_2 Odroid_C2"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
 PKG_URL="https://github.com/docker/docker/archive/v${PKG_VERSION}.tar.gz"
+PKG_SOURCE_DIR="moby-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc libnetwork tini"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
@@ -68,16 +69,16 @@ configure_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD/.gopath
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD/.gopath
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  mkdir -p $ROOT/$PKG_BUILD/.gopath
-  if [ -d $ROOT/$PKG_BUILD/vendor ]; then
-    mv $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/.gopath/src
+  mkdir -p $PKG_BUILD/.gopath
+  if [ -d $PKG_BUILD/vendor ]; then
+    mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
   fi
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/.gopath/src/github.com/docker/docker
+  ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/docker/docker
 
   # used for docker version
   export GITCOMMIT=$PKG_VERSION
@@ -98,8 +99,8 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $ROOT/$PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # containerd
     cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd

packages/addons/service/emby/changelog.txt

@@ -1,56 +1,59 @@
+115:
+- Update to version 3.2.26.0
+
 114:
 - Update to version 3.2.17.0
 - Rebuild libx264, ffmpegx and imagemagick
 - Use ffmpgex by default
 
-113:
+113
 - Update to version 3.2.8
 - Rebuild x264 and ffmpegx
 
-112:
+112
 - Refer to libMagickWand-7
 
-111:
+111
 - Updated to version 3.2.5
 - Rebuild libx264, ffmpegx and imagemagick
 
-110:
+110
 - Rebuild ffmpegx with libx264
 
-109:
+109
 - Rebuild ffmpgex and imagemagick
 
-108:
+108
 - Update to version 3.0.8500
 
-107:
+107
 - Update to version 3.0.8300
 - Rebuild ffmpegx
 
-106:
+106
 - Updat to version 3.0.8100
 - Rebuild ffmpegx
 
-105:
+105
 - Update to version 3.0.7100
 
-104:
+104
 - Update to version 3.0.6300
 - Rebuild ffmpegx
 
-103:
+103
 - Update to version 3.0.6070
 - Build for all architectures
 - Refer to libsqlite3.so.0 instead of libsqlite3.so
 
-102:
+102
 - Update to version 3.0.6030
 - Add dedicated ffmpeg and ffprobe
 - Remove unused shared libraries
 
-101:
+101
 - Update to version 3.0.5985
 - Removed mono build dependency
 
-100:
-- Initial release
+100
+- Initial add-on

packages/addons/service/emby/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.2.17.0"
-PKG_REV="114"
+PKG_VERSION="3.2.26.0"
+PKG_REV="115"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
@@ -28,7 +28,7 @@ PKG_SHORTDESC="Emby: a personal media server"
 PKG_LONGDESC="Emby ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
 
 PKG_IS_ADDON="yes"
-PKG_ADDON_NAME="Emby (beta)"
+PKG_ADDON_NAME="Emby"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_ADDON_REQUIRES="tools.mono:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"

packages/addons/service/hyperion/package.mk

@@ -49,7 +49,7 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then
 fi
 
 pre_build_target() {
-  cp -a $(get_build_dir rpi_ws281x)/* $ROOT/$PKG_BUILD/dependencies/external/rpi_ws281x
+  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
 }
 
 pre_configure_target() {

packages/addons/service/inadyn/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://troglobit.com/inadyn.html"
 PKG_URL="https://github.com/troglobit/inadyn/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libconfuse libite libressl"
+PKG_DEPENDS_TARGET="toolchain libconfuse libite openssl"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Inadyn: a small and simple Dynamic Domain Name System client"
 PKG_LONGDESC="Inadyn ($PKG_VERSION) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."

packages/addons/service/lcdd/changelog.txt

@@ -1,16 +1,16 @@
-104:
+104
 - Update to 466edd3
 
-103:
+103
 - Update to 0.5.8
 
-102:
+102
 - Update to c05a7de
 - Reintroduce dm140 driver
 - Build with libugpio
 
-101:
+101
 - Update to upstream 1554506
 
-100:
+100
 - Initial addon

packages/addons/service/lcdd/package.mk

@@ -49,7 +49,7 @@ pre_make_target() {
 }
 
 addon() {
-  drivers="none|$(cat $ROOT/$PKG_BUILD/.$TARGET_NAME/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')"
+  drivers="none|$(cat $PKG_BUILD/.$TARGET_NAME/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')"
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
 

packages/addons/service/librespot/changelog.txt

@@ -0,0 +1,22 @@
+106
+- Rework code
+- Display artist and title on track load
+
+105
+- Update to 910974e
+
+104
+- Switch from ffmpegx to pulseaudio to stream to Kodi
+- Wait for sound.target
+
+103
+- Update system_information_string
+
+102
+- Update to aa86ebf
+
+101
+- Enable streaming to Kodi
+
+100
+- Initial addon