Merge pull request #1705 from codesnake/wetek_hub_ap6255_le8

Backport of #1701 from master to libreelec-8.0 (Add support for AP6255 wireless chip)

config/docker/changelog.txt

@@ -0,0 +1,2 @@
+100
+- Initial addon

config/docker/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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="@NAME@"
+PKG_VERSION="@VERSION@" # Update bin/docker.@NAME@ accordingly
+PKG_REV="100"
+PKG_ARCH="@ARCH@"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="docker"
+PKG_SITE=""
+PKG_SHORTDESC=""
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME=" (@IMAGE@:$PKG_VERSION)"
+PKG_ADDON_PROJECTS="@PROJECTS@"
+PKG_ADDON_REQUIRES="service.system.docker:0.0.0"
+PKG_ADDON_TYPE="xbmc.service"
+
+make_target() {
+  : #
+}
+
+makeinstall_target() {
+  : #
+}
+
+addon() {
+  : #
+}

config/docker/source/bin/docker

@@ -0,0 +1,25 @@
+#!/bin/sh
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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/>.
+################################################################################
+
+name="$(basename $0)"
+. /etc/profile
+oe_setup_addon "$name"
+
+docker rm "$name" 2>/dev/null
+docker run --name="$name" \

config/docker/source/default.py

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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/>.
+################################################################################
+
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+class Monitor(xbmc.Monitor):
+
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == '__main__':
+   Monitor().waitForAbort()

config/docker/source/resources/language/English/strings.po

@@ -0,0 +1,10 @@
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Note: Kodi remote sources can not be used as Docker volume host sources"
+msgstr ""

config/docker/source/resources/settings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+   <category   label="30000">
+      <setting label="30001" type="lsep" />
+@SETTINGS@   </category>
+</settings>

config/docker/source/system.d/docker.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=%p container
+Requires=service.system.docker.service
+After=service.system.docker.service
+
+[Service]
+Restart=always
+RestartSec=10s
+TimeoutStartSec=0
+ExecStart=/bin/sh /storage/.kodi/addons/%p/bin/%p
+ExecStop=/storage/.kodi/addons/service.system.docker/bin/docker kill %p
+
+[Install]
+WantedBy=multi-user.target

config/functions

@@ -17,9 +17,12 @@ 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_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="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -34,6 +37,7 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)"  >> $CMAKE_CONF
         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++"
@@ -65,9 +69,12 @@ 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_PATH=""
       export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$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"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -82,58 +89,55 @@ setup_toolchain() {
         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
+        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)" >> $CMAKE_CONF
       fi
-      export HOST_CC="$HOST_CC"
-      export HOST_CXX="$HOST_CXX"
-      export HOSTCC="$HOST_CC"
-      export HOSTCXX="$HOST_CXX"
-      export CC_FOR_BUILD="$HOST_CC"
-      export CXX_FOR_BUILD="$HOST_CXX"
-      export BUILD_CC="$HOST_CC"
-      export BUILD_CXX="$HOST_CXX"
+      export HOST_CC="$CC"
+      export HOST_CXX="$CXX"
+      export HOSTCC="$CC"
+      export HOSTCXX="$CXX"
+      export CC_FOR_BUILD="$CC"
+      export CXX_FOR_BUILD="$CXX"
+      export BUILD_CC="$CC"
+      export BUILD_CXX="$CXX"
       ;;
   esac
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  get_build_dir linux
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo ${PKG_VERSION}
+  get_pkg_version linux
 }
 
 # get kernel module dir
 get_module_dir() {
-  basename $(ls -d $(get_build_dir linux)/.install_pkg/lib/modules/*)
+  basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/modules/*)
 }
 
 # get package's build dir
 get_build_dir() {
-  if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-      . $_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
+  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}
   fi
+}
 
-    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+get_pkg_version() {
+  get_pkg_variable "$1" PKG_VERSION
+}
+
+get_pkg_directory() {
+  get_pkg_variable "$1" PKG_DIR
+}
+
+# get variable ($2) for package ($1)
+get_pkg_variable() {
+  if [ -n "$1" -a -n "$2" ] ; then
+    cd $ROOT
+    . config/options $1
+    echo "${!2}"
   fi
 }
 
@@ -270,6 +274,11 @@ enable_service () {
       fi
     done
   fi
+  for target in `grep '^Alias' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do
+    if [ -n "$target" ]; then
+      ln -sf ${unit} ${target_dir}/$unit_dir/${target}
+    fi
+  done
 }
 
 check_path() {
@@ -288,28 +297,47 @@ dashes="==========================="
 
 check_config() {
 dashes="==========================="
-  if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.libreelec/projects/$PROJECT ]; then
+  if [ ! -d $PROJECT_DIR/$PROJECT ]; then
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n ERROR: Project not found, use a valid project or create a new config"
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n\n Valid projects:"
 
-    for projects in $PROJECT_DIR/* $HOME/.libreelec/projects/*; do
+    for projects in $PROJECT_DIR/*; do
       check_project="$check_project\n - $(basename $projects)"
     done
     echo -e $check_project
     exit 1
   fi
 
-  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf ] &&
-     ! ls $PROJECT_DIR/$PROJECT/linux/*/linux.$TARGET_ARCH.conf &>/dev/null; then
+  if [ \( -z "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices" \) -o \( -n "$DEVICE" -a ! -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE" \) ]; then
+    check_device="$check_device\n $dashes$dashes$dashes"
+    check_device="$check_device\n ERROR: You need to specify a valid device for the $PROJECT project"
+    check_device="$check_device\n $dashes$dashes$dashes"
+    check_device="$check_device\n\n Valid devices for project: $PROJECT"
+
+    for device in $PROJECT_DIR/$PROJECT/devices/*; do
+      check_device="$check_device\n - $(basename $device)"
+    done
+    echo -e $check_device
+    exit 1
+  fi
+
+  if [ -d $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux ]; then
+    linux_config_dir="$PROJECT_DIR/$PROJECT/devices/$DEVICE/linux"
+  else
+    linux_config_dir="$PROJECT_DIR/$PROJECT/linux"
+  fi
+
+  if [ ! -f $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"
     check_arch="$check_arch\n for your project or create a new config"
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT"
 
-    for arch in $PROJECT_DIR/$PROJECT/linux/*.conf $PROJECT_DIR/$PROJECT/linux/*/linux.$TARGET_ARCH.conf; do
+    for arch in $linux_config_dir/*.conf $linux_config_dir/*/linux.$TARGET_ARCH.conf; do
       check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")"
     done
     echo -e $check_arch
@@ -335,7 +363,6 @@ show_config() {
   config_message="$config_message\n - FLOAT:\t\t\t\t $TARGET_FLOAT"
   config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU"
   config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT"
-  config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
   config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
   config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"

config/graphic

@@ -70,11 +70,6 @@ get_graphicdrivers() {
       VDPAU_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "virtualbox" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
-    fi
-
     if [ "$drv" = "vmware" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,swrast"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"

config/issue

@@ -1 +0,0 @@
-Welcome to OpenELEC - the powerful Mediacenter4you

config/options

@@ -28,7 +28,7 @@ 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"
+LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
 [ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode/package.mk $ROOT/packages/linux-firmware/x86-firmware/package.mk"
 
 # include versioning
@@ -49,6 +49,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
    . $PROJECT_DIR/$PROJECT/options
  fi
 
+# read board options if available
+ if [ -f "$PROJECT_DIR/$PROJECT/devices/$DEVICE/options" ]; then
+   . $PROJECT_DIR/$PROJECT/devices/$DEVICE/options
+ fi
+
 # 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`
@@ -84,14 +89,6 @@ fi
   if [ -f "$HOME/.libreelec/options" ]; then
     . $HOME/.libreelec/options
   fi
-  if [ -f "$HOME/.libreelec/projects/$PROJECT/options" ]; then
-    . $HOME/.libreelec/projects/$PROJECT/options
-  fi
-
-# read distro options from $HOME if available
-  if [ -f "$HOME/.libreelec/options.$DISTRO" ]; then
-    . $HOME/.libreelec/options.$DISTRO
-  fi
 
 # install devtools on development builds
   if [ -z "$DEVTOOLS" -a "$LIBREELEC_VERSION" = "devel" ]; then

config/path

@@ -19,10 +19,17 @@ 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
+fi
 
 if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
@@ -71,6 +78,7 @@ SED="sed -i"
   PKG_SHORTDESC="$1 (autogenerated)"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
+  PKG_PATCH_DIRS=""
 
   if [ -n "$1" ]; then
     _PKG_ROOT_NAME=${1%:*}
@@ -179,7 +187,7 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 . config/optimize
 
 if [ -z "$CCACHE_DIR" ]; then
-    export CCACHE_DIR=$ROOT/.ccache/$PROJECT.$TARGET_ARCH-$OS_VERSION
+  export CCACHE_DIR=$ROOT/$BUILD/.ccache
 fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config

config/version

@@ -5,5 +5,5 @@
   OS_VERSION="8.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="8.0"
+  ADDON_VERSION="8.1"
 

create_tar.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2
+git archive --format=tar --prefix=LibreELEC-source-$1/ tags/$1 | bzip2 > LibreELEC-source-$1.tar.bz2

distributions/LibreELEC/options

@@ -130,7 +130,7 @@
 # build and install hfs filesystem utilities (yes / no)
   HFSTOOLS="yes"
 
-# Windowmanager to use (ratpoison / fluxbox / none)
+# Windowmanager to use (fluxbox / none)
   WINDOWMANAGER="fluxbox"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_ADS1x15"
 PKG_VERSION="733d179"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_ADXL345"
 PKG_VERSION="b153663"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_BMP"
 PKG_VERSION="ad6521d"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_CharLCD"
 PKG_VERSION="e5952eb"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_DHT"
 PKG_VERSION="310c59b"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
@@ -29,8 +28,26 @@ PKG_SHORTDESC="Adafruit Python DHT Library"
 PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi or Beaglebone Black."
 PKG_AUTORECONF="no"
 
+case $PROJECT in
+  RPi)
+    RPI_VERSION="--force-pi"
+    ;;
+  RPi2)
+    RPI_VERSION="--force-pi2"
+    ;;
+esac
+
+pre_make_target() {
+  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+  export LDSHARED="$CC -shared"
+
+  sed -e 's/from ez_setup import use_setuptools/\#from ez_setup import use_setuptools/' \
+      -e 's/use_setuptools()/\#use_setuptools()/' \
+      -i setup.py
+}
+
 make_target() {
-  : # nop
+  python setup.py build $RPI_VERSION --cross-compile
 }
 
 makeinstall_target() {

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_GPIO"
 PKG_VERSION="fdf0fca"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_LED_Backpack"
 PKG_VERSION="d3bd401"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_LSM303"
 PKG_VERSION="03b344d"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_MCP3008"
 PKG_VERSION="705f090"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_MCP4725"
 PKG_VERSION="5b5fc87"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_PCA9685"
 PKG_VERSION="bfa4851"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_PureIO"
 PKG_VERSION="a29d95a"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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="Adafruit_Python_SI1145"
+PKG_VERSION="cbc6c62"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/THP-JOE/Python_SI1145"
+PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="Python_SI1145-$PKG_VERSION*"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
+PKG_SECTION="python"
+PKG_SHORTDESC="Python library for the SI1145"
+PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}
+

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_TCS34725"
 PKG_VERSION="4ff05a3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_VCNL40xx"
 PKG_VERSION="e54bff9"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_WS2801"
 PKG_VERSION="699426a"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="atk"
 PKG_VERSION="2.20.0"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
@@ -31,7 +30,7 @@ PKG_SHORTDESC="ATK - Accessibility Toolkit"
 PKG_LONGDESC="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications."
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
                            --disable-rebuilds --disable-glibtest"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="bash"
 PKG_VERSION="4.3.46"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/bash/bash.html"

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

@@ -17,13 +17,12 @@
 ################################################################################
 
 PKG_NAME="containerd"
-PKG_VERSION="0366d7e"
-PKG_REV="1"
+PKG_VERSION="aa8187d"
 PKG_ARCH="any"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"
 PKG_URL="https://github.com/docker/containerd/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain go"
+PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_SECTION="system"
 PKG_SHORTDESC="containerd is a daemon to control runC"
 PKG_LONGDESC="containerd is a daemon to control runC, built for performance and density. containerd leverages runC's advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers."
@@ -48,6 +47,9 @@ pre_make_target() {
          ;;
       esac
       ;;
+    aarch64)
+      export GOARCH=arm64
+      ;;
   esac
 
   export GOOS=linux
@@ -72,4 +74,3 @@ make_target() {
 makeinstall_target() {
   :
 }
-

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="cxxtools"
 PKG_VERSION="2.2.1"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://www.tntnet.org/cxxtools.html"

packages/addons/addon-depends/dvb-tools-depends/depends/bitstream/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,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="bitstream"
-PKG_VERSION="1.1"
-PKG_REV="1"
+PKG_VERSION="1.2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"

packages/addons/addon-depends/dvb-tools-depends/depends/libev/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,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="libev"
-PKG_VERSION="4.22"
-PKG_REV="1"
+PKG_VERSION="4.24"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://software.schmorp.de/pkg/libev.html"
@@ -29,6 +28,6 @@ PKG_SHORTDESC="libev: a full-featured and high-performance event loop"
 PKG_LONGDESC="A full-featured and high-performance event loop that is loosely modelled after libevent, but without its limitations and bugs."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="dvb-apps"
 PKG_VERSION="3d43b280298c"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
@@ -30,12 +29,3 @@ PKG_SECTION="tools"
 PKG_SHORTDESC="Digitial Video Broadcasting (DVB) applications"
 PKG_LONGDESC="Applications and utilities geared towards the initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC standards."
 PKG_AUTORECONF="no"
-
-make_target() {
-  make -C lib
-  make -C util
-}
-
-makeinstall_target() {
-  : # nop
-}

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

@@ -19,8 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-fe-tool"
-PKG_VERSION="fa2f7d9"
-PKG_REV="1"
+PKG_VERSION="1388a04"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"

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

@@ -19,8 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvblast"
-PKG_VERSION="3.0"
-PKG_REV="1"
+PKG_VERSION="3.1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"

packages/addons/addon-depends/dvb-tools-depends/dvblast/patches/dvblast-ldflags.patch

@@ -1,17 +0,0 @@
-diff -Naur dvblast-3.0/Makefile dvblast-3.0.patch/Makefile
---- dvblast-3.0/Makefile	2015-10-05 17:51:14.000000000 +0200
-+++ dvblast-3.0.patch/Makefile	2016-03-26 22:54:59.953303040 +0100
-@@ -55,11 +55,11 @@
- 
- dvblast: $(OBJ_DVBLAST)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDLIBS_DVBLAST) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDFLAGS) $(LDLIBS_DVBLAST) $(LDLIBS)
- 
- dvblastctl: $(OBJ_DVBLASTCTL)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDFLAGS) $(LDLIBS)
- 
- clean:
- 	@echo "CLEAN   $(CLEAN_OBJS)"

packages/addons/addon-depends/dvb-tools-depends/mumudvb/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="mumudvb"
+PKG_VERSION="fa9ff6e"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://mumudvb.net/"
+PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="MuMuDVB-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain libdvbcsa"
+PKG_SECTION="tools"
+PKG_SHORTDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
+PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
+PKG_AUTORECONF="yes"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/w_scan/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,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="w_scan"
-PKG_VERSION="20141122"
-PKG_REV="1"
+PKG_VERSION="20170107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

packages/addons/addon-depends/emby-depends/ffmpegx/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
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,18 +18,12 @@
 
 PKG_NAME="ffmpegx"
 PKG_VERSION="libreelec"
-PKG_REV="4"
-PKG_ARCH="any"
+PKG_REV="9"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="FFmpeg+"
 PKG_LONGDESC="FFmpeg built static with additional features"
 
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
 pre_configure_target() {
   cd "$ROOT/$PKG_BUILD"
   rm -rf ".$TARGET_NAME"
@@ -102,6 +96,10 @@ configure_target() {
 
 }
 
+makeinstall_target() {
+  make install DESTDIR=$INSTALL
+}
+
 post_makeinstall_target() {
   for ff in $INSTALL/usr/local/bin/*; do mv $ff ${ff}x; done
   rm -fr $INSTALL/usr/local/include

packages/addons/addon-depends/emby-depends/imagemagick/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
 #
 #  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,23 +17,20 @@
 ################################################################################
 
 PKG_NAME="imagemagick"
-PKG_VERSION="6.9.5-5"
-PKG_REV="1"
-PKG_ARCH="any"
+PKG_VERSION="7.0.5-7"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"
 PKG_SITE="http://www.imagemagick.org/"
-PKG_URL="http://www.imagemagick.org/download/releases/ImageMagick-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/ImageMagick/ImageMagick/archive/$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="ImageMagick-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain libX11"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="ImageMagick"
 PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images"
 
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --enable-shared \
                            --with-quantum-depth=8 \
                            --enable-hdri=no \
                            --disable-openmp"
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL
+}

packages/addons/addon-depends/emby-depends/x264/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
 #
 #  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,20 +17,13 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20160623-2245"
-PKG_REV="1"
-PKG_ARCH="any"
+PKG_VERSION="snapshot-20170524-2245-stable"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
 PKG_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="x264"
 PKG_LONGDESC="x264"
 
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
 pre_configure_target() {
   cd $ROOT/$PKG_BUILD
   rm -rf .$TARGET_NAME

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

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="enca"
-PKG_VERSION="1.16"
-PKG_REV="1"
+PKG_VERSION="1.19"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"
@@ -29,7 +28,7 @@ PKG_SHORTDESC="enca: detects the encoding of text files, on the basis of knowled
 PKG_LONGDESC="Enca detects the encoding of text files, on the basis of knowledge of their language. It can also convert them to other encodings, allowing you to recode files without knowing their current encoding. It supports most of Central and East European languages, and a few Unicode variants, independently on language."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_MAKEINSTALL_OPTS_TARGET="-C lib"
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="enet"
 PKG_VERSION="1.3.13"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE=""
 PKG_SITE=""
@@ -30,7 +29,7 @@ PKG_LONGDESC="ENet's purpose is to provide a relatively thin, simple and robust
 
 PKG_IS_ADDON="no"
 PKG_USE_CMAKE="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
 

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

@@ -0,0 +1,41 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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="enum34"
+PKG_VERSION="1.1.6"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="https://bitbucket.org/stoneleaf/enum34"
+PKG_URL="https://bitbucket.org/stoneleaf/$PKG_NAME/get/$PKG_VERSION.tar.bz2"
+PKG_SOURCE_DIR="stoneleaf-enum34-*"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"
+PKG_LONGDESC="Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  python setup.py build
+}
+
+makeinstall_target() {
+  :
+}

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="faad2"
 PKG_VERSION="2.7"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.audiocoding.com/"
@@ -29,7 +28,7 @@ PKG_SHORTDESC="faad: An MPEG-4 AAC decoder"
 PKG_LONGDESC="The FAAD project includes the AAC decoder FAAD2. It supports several MPEG-4 object types (LC, Main, LTP, HE AAC, PS) and file formats (ADTS AAC, raw AAC, MP4), multichannel and gapless decoding as well as MP4 metadata tags. The codecs are compatible with standard-compliant audio applications using one or more of these profiles."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_MAINTAINER="Team LibreELEC (addons@libreelec.tv)"
 

packages/addons/addon-depends/gdk-pixbuf/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="gdk-pixbuf"
 PKG_VERSION="2.34.0"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"
@@ -30,7 +29,7 @@ PKG_SECTION="x11/toolkits"
 PKG_SHORTDESC="gdk-pixbuf: a GNOME library for image loading and manipulation."
 PKG_LONGDESC="gdk-pixbuf (GdkPixbuf) is a GNOME library for image loading and manipulation. The GdkPixbuf documentation contains both the programmer's guide and the API reference."
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="gio_can_sniff=yes \
                            --disable-gtk-doc \

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

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="go"
-PKG_VERSION="1.6.3"
-PKG_REV="1"
+PKG_VERSION="1.7.5"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
@@ -53,6 +52,11 @@ make_host() {
   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
+}
+
 makeinstall_host() {
   mkdir -p $ROOT/$TOOLCHAIN/lib/golang
   cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="gtk+"
 PKG_VERSION="2.24.30"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"

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

@@ -19,19 +19,22 @@
 ################################################################################
 
 PKG_NAME="harfbuzz"
-PKG_VERSION="1.2.5"
-PKG_REV="1"
+PKG_VERSION="1.3.3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 PKG_URL="http://www.freedesktop.org/software/harfbuzz/release/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain glib freetype cairo"
+PKG_DEPENDS_TARGET="toolchain glib freetype cairo icu"
 PKG_SECTION="x11/toolkits"
 PKG_SHORTDESC="harfbuzz: an OpenType text shaping engine."
 PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine."
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_MAINTAINER="none"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-icu=no"
+PKG_CONFIGURE_OPTS_TARGET="--with-icu=yes"
+
+pre_configure_target() {
+  export LIBS="-ldl"
+}

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

@@ -0,0 +1,44 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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="icu"
+PKG_VERSION="57.1"
+PKG_ARCH="any"
+PKG_LICENSE="Custom"
+PKG_SITE="http://www.icu-project.org"
+PKG_URL="http://download.icu-project.org/files/${PKG_NAME}4c/${PKG_VERSION}/${PKG_NAME}4c-${PKG_VERSION//./_}-src.tgz"
+PKG_SOURCE_DIR="icu"
+PKG_DEPENDS_TARGET="toolchain icu:host"
+PKG_SECTION="textproc"
+PKG_SHORTDESC="International Components for Unicode library"
+PKG_LONGDESC="International Components for Unicode library"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --with-cross-build=$ROOT/$PKG_BUILD/.$HOST_NAME"
+
+PKG_CONFIGURE_SCRIPT="source/configure"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL
+}

packages/addons/addon-depends/inadyn/libite/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-2017 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="libite"
-PKG_VERSION="1.8.2"
+PKG_VERSION="1.8.3"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/troglobit/libite"
 PKG_URL="https://github.com/troglobit/libite/archive/v$PKG_VERSION.tar.gz"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="jasper"
 PKG_VERSION="1.900.1"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"
@@ -29,7 +28,7 @@ PKG_SHORTDESC="jasper: JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1) impleme
 PKG_LONGDESC="This distribution contains the public release of the an open-source implementation of the ISO/IEC 15444-1 also known as JPEG-2000 standard for image compression."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
 

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

@@ -0,0 +1,29 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017 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="libugpio"
+PKG_VERSION="0.0.6"
+PKG_ARCH="any"
+PKG_LICENSE="LGPLv2.1"
+PKG_SITE="https://github.com/mhei/libugpio"
+PKG_URL="https://github.com/mhei/$PKG_NAME/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain linux"
+PKG_LONGDESC="A free software library to ease the use of linux kernel's sysfs gpio interface from C programs and/or other libraries"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

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

@@ -1,35 +1,34 @@
 ################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017 Team LibreELEC
 #      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 #
-#  OpenELEC is free software: you can redistribute it and/or modify
+#  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.
 #
-#  OpenELEC is distributed in the hope that it will be useful,
+#  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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 PKG_NAME="serdisplib"
 PKG_VERSION="1.97.9"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://serdisplib.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
-PKG_SECTION="sysutils"
 PKG_SHORTDESC="serdisplib: a lcd control library"
 PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
                            --bindir=$SYSROOT_PREFIX/usr/bin \
@@ -38,13 +37,17 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
                            --with-drivers=all"
 
 pre_configure_target() {
-  # serdisplib fails to build in subdirs (found this in packages/devel/attr/package.mk)
+  # serdisplib fails to build in subdirs
   cd $ROOT/$PKG_BUILD
     rmdir .$TARGET_NAME
+
+  # use libusb-config from sysroot
+  export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config
 }
 
 post_make_target() {
-  # copy necessary libs and headers to build the driver glcd from lcdproc
+  # copy necessary libs and headers to build serdisplib support
+  # into the driver glcd from lcdproc
   mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib
   cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib
   mkdir -p $SYSROOT_PREFIX/usr/lib

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libXScrnSaver"
 PKG_VERSION="1.2.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://xorg.freedesktop.org/"
@@ -29,6 +28,6 @@ PKG_SHORTDESC=""
 PKG_LONGDESC=""
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="libXcursor"
 PKG_VERSION="1.1.14"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
@@ -31,6 +30,6 @@ PKG_SHORTDESC="libXcursor: X Cursor Library"
 PKG_LONGDESC="X11 Cursor management library"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libXft"
 PKG_VERSION="2.3.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
@@ -29,6 +28,6 @@ PKG_SHORTDESC="libxft: X FreeType library"
 PKG_LONGDESC="X FreeType library"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libconfig"
 PKG_VERSION="1.5"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://hyperrealm.com/libconfig/libconfig.html"

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

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="libdvbcsa"
-PKG_VERSION="f988715"
-PKG_REV="1"
+PKG_VERSION="4ce8be8"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
@@ -36,6 +35,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSR
 
 if echo "$TARGET_FPU" | grep -q '^neon'; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
+elif [ "$TARGET_ARCH" = aarch64 ]; then
+  # change this to --enable-neon when AArch64 NEON performance is improved
+  # check performance with test/benchbitslice
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-uint64"
 elif [ "$TARGET_ARCH" = x86_64  ]; then
   if echo "$PROJECT_CFLAGS" | grep -q '\-mssse3'; then
     PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-ssse3"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libexif"
 PKG_VERSION="0.6.21"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://sourceforge.net/projects/libexif"
@@ -29,4 +28,4 @@ PKG_SHORTDESC="A library to parse an EXIF file and read the data from those tags
 PKG_LONGDESC="A library to parse an EXIF file and read the data from those tags"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libiconv"
 PKG_VERSION="1.14"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="libid3tag"
 PKG_VERSION="0.15.1b"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
@@ -31,7 +30,7 @@ PKG_SHORTDESC="library for id3 tagging"
 PKG_LONGDESC="library for id3 tagging"
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_MAINTAINER="Lukas Sabota (LTsmooth42@gmail.com)"
 

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

@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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="libimobiledevice"
+PKG_VERSION="1.2.0"
+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_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"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --without-cython \
+                           --disable-largefile"
+
+post_makeinstall_target() {
+  cp $ROOT/$PKG_BUILD/common/utils.h $SYSROOT_PREFIX/usr/include/libimobiledevice/
+}

packages/addons/addon-depends/libimobiledevice/patches/libimobiledevice-0001-disable-sslv3.patch

@@ -0,0 +1,12 @@
+diff -u -r libimobiledevice-1.2.0/src/idevice.c libimobiledevice-1.2.0-nossl3/src/idevice.c
+--- libimobiledevice-1.2.0/src/idevice.c	2015-01-28 02:10:32.000000000 +0100
++++ libimobiledevice-1.2.0-nossl3/src/idevice.c	2016-03-03 18:33:45.912308242 +0100
+@@ -678,7 +678,7 @@
+ 	}
+ 	BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
+ 
+-	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
++	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method());
+ 	if (ssl_ctx == NULL) {
+ 		debug_info("ERROR: Could not create SSL context.");
+ 		BIO_free(ssl_bio);

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libmad"
 PKG_VERSION="0.15.1b"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"

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

@@ -0,0 +1,74 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  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="libnetwork"
+PKG_VERSION="0f53435"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://github.com/docker/libnetwork"
+PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_SECTION="system"
+PKG_SHORTDESC="Libnetwork provides a native Go implementation for connecting containers"
+PKG_LONGDESC="Libnetwork provides a native Go implementation for connecting containers"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+    aarch64)
+      export GOARCH=arm64
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=0
+  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 PATH=$PATH:$GOROOT/bin
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./cmd/proxy
+}
+
+makeinstall_target() {
+  :
+}

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="$ROOT/$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="$ROOT/$TOOLCHAIN/.cargo"
+export CARGO_TARGET_DIR="$ROOT/$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/libusbmuxd/package.mk

@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 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="libusbmuxd"
+PKG_VERSION="1.0.10"
+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 libplist"
+PKG_SECTION="libs"
+PKG_SHORTDESC="USB Multiplex Daemon"
+PKG_LONGDESC="USB Multiplex Daemon"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
+                           ac_cv_func_realloc_0_nonnull=yes \
+                           --enable-static \
+                           --disable-shared"

packages/addons/addon-depends/libva-vdpau-driver/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libva-vdpau-driver"
 PKG_VERSION="0.7.4"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libvncserver"
 PKG_VERSION="0.9.10"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libvnc.github.io/"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libzip"
 PKG_VERSION="0.11.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nih.at/libzip/"

packages/addons/addon-depends/mono-depends/libgdiplus/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
 #
 #  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,21 +17,19 @@
 ################################################################################
 
 PKG_NAME="libgdiplus"
-PKG_VERSION="4.2"
-PKG_REV="0"
-PKG_ARCH="any"
+PKG_VERSION="5.4"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/mono/libgdiplus"
 PKG_URL="https://github.com/mono/libgdiplus/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain giflib libjpeg-turbo tiff libXext libexif glib cairo"
-PKG_SECTION="tools"
-PKG_SHORTDESC="libgiplus"
 PKG_LONGDESC="An Open Source implementation of the GDI+ API"
-
-PKG_IS_ADDON="no"
-
 PKG_AUTORECONF="yes"
+
 PKG_CONFIGURE_OPTS_TARGET="--enable-shared               \
-                           --with-libgif   \
-                           --with-libjpeg  \
-                           --with-libtiff"
+                           --with-libgif=$TARGET_PREFIX  \
+                           --with-libjpeg=$TARGET_PREFIX \
+                           --with-libtiff=$TARGET_PREFIX"
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL
+}

packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk

@@ -30,3 +30,7 @@ unpack() {
   mkdir -p $PKG_BUILD
   cp -r $(get_build_dir sqlite)/* $PKG_BUILD/
 }
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL
+}

packages/addons/addon-depends/moonlight-common-c/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="moonlight-common-c"
-PKG_VERSION="6455381"
-PKG_REV="1"
+PKG_VERSION="1d058cb"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/irtimmer/moonlight-common-c"

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

@@ -17,12 +17,11 @@
 ################################################################################
 
 PKG_NAME="moonlight-embedded"
-PKG_VERSION="2.2.2"
-PKG_REV="1"
+PKG_VERSION="9301898"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/irtimmer/moonlight-embedded"
-PKG_URL="https://github.com/irtimmer/moonlight-embedded/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/irtimmer/moonlight-embedded/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain curl libcec pulseaudio ffmpeg systemd alsa-lib moonlight-common-c libevdev enet opus"
 PKG_SECTION=""
 PKG_SHORTDESC="Gamestream client for embedded systems"
@@ -43,9 +42,7 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb"
 fi
 
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-                       -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
-                       $FREESCALE_V4L_INCLUDE"
+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

packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0002-require-pthread.patch

@@ -0,0 +1,12 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2016-11-19 09:59:59.335970047 -0800
++++ b/CMakeLists.txt	2016-11-19 10:08:43.639992687 -0800
+@@ -139,7 +139,7 @@
+ 
+ set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS})
+ target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
+-target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} m)
++target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} pthread m)
+ 
+ add_subdirectory(docs)
+ 

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libmediainfo"
 PKG_VERSION="0.7.83"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/Download/Source"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libzen"
 PKG_VERSION="0.4.33"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="mediainfo"
 PKG_VERSION="0.7.83"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/Download/Source"

packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="mesa-demos"
 PKG_VERSION="8.3.0"
-PKG_REV="0"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="mpg123"
 PKG_VERSION="1.23.6"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2"
 PKG_SITE="http://www.mpg123.org/"
@@ -29,6 +28,6 @@ PKG_SHORTDESC="mpg123"
 PKG_LONGDESC="A fast MP3 Player"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="opencaster"
 PKG_VERSION="3.2.2"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.avalpa.com/the-key-values/15-free-software/33-opencaster"

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

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="squeezelite"
-PKG_VERSION="33cca7e"
-PKG_REV="0"
+PKG_VERSION="a3d95ec"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
@@ -34,7 +33,7 @@ PKG_AUTORECONF="no"
 pre_make_target() {
   OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT"
   CFLAGS="$CFLAGS $OPTS"
-  LDFLAGS="$LDFLAGS -lasound -lpthread -lm -lrt"
+  LDFLAGS="$LDFLAGS -lasound -lpthread -lm -lrt -lFLAC -lmad -lvorbisfile -lfaad -lmpg123"
 }
 
 makeinstall_target() {

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="tsdecrypt"
 PKG_VERSION="10.0"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://georgi.unixsol.org/programs/tsdecrypt"

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

@@ -20,7 +20,6 @@
 
 PKG_NAME="tstools"
 PKG_VERSION="1.11"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://tstools.berlios.de/"

packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="bwm-ng"
 PKG_VERSION="0.6.1"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gropp.org/?id=projects&sub=bwm-ng"
@@ -27,7 +26,7 @@ PKG_DEPENDS_TARGET="toolchain netbsd-curses libstatgrab"
 PKG_SECTION="network/analyzer"
 PKG_SHORTDESC="bwm-ng: small and simple console-based live network and disk io bandwidth monitor"
 PKG_LONGDESC="Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor for Linux, BSD, Solaris, Mac OS X and others."
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \
                            --with-time \

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libpcap"
 PKG_VERSION="1.7.4"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tcpdump.org/"
@@ -27,7 +26,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="devel"
 PKG_SHORTDESC="system interface for user-level packet capture"
 PKG_LONGDESC="libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc."
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \
                            ac_cv_header_libusb_1_0_libusb_h=no \

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libstatgrab"
 PKG_VERSION="0.91"
-PKG_REV="1"
 PKG_SITE="http://www.i-scream.org/libstatgrab/"
 PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="iftop"
 PKG_VERSION="1.0pre4"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="iperf"
 PKG_VERSION="3.1.2"
-PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://iperf.fr/"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="irssi"
 PKG_VERSION="0.8.19"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"
@@ -27,7 +26,7 @@ PKG_DEPENDS_TARGET="toolchain glib netbsd-curses libressl"
 PKG_SECTION="tools"
 PKG_SHORTDESC="IRC client"
 PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
         --enable-ssl \

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="iw"
 PKG_VERSION="4.3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PUBLIC_DOMAIN"
 PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw"

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

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="lftp"
-PKG_VERSION="4.6.5"
-PKG_REV="1"
+PKG_VERSION="4.7.4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lftp.yar.ru/"
@@ -27,15 +26,14 @@ PKG_DEPENDS_TARGET="toolchain readline libressl 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"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-nls --with-gnu-ld --without-gnutls --with-openssl"
+PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
+                           --without-gnutls \
+                           --with-openssl \
+                           --with-readline=$SYSROOT_PREFIX/usr \
+                           --with-zlib=$SYSROOT_PREFIX/usr"
 
 makeinstall_target() {
   : # nop
 }
-
-pre_configure_target() {
-  # fails to build with gcc 4.9 + lto
-  strip_lto
-}