Merge pull request #2160 from chewitt/stuff

config: bump version to 8.2.0.1 for RPi HEVC respin

config/addon/xbmc.broken.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.addon.metadata">
+    <summary>@PKG_SHORTDESC@</summary>
+    <description>
+@PKG_LONGDESC@
+    </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
+    <broken>
+@PKG_ADDON_BROKEN@
+    </broken>
+    <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/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
@@ -104,23 +104,11 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  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
@@ -130,30 +118,30 @@ get_module_dir() {
 
 # get package's build dir
 get_build_dir() {
-  if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-      . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
-    fi
-
-    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  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 $BUILD/${_PKG_NAME}-${_PKG_VERSION}
   fi
 }
 
 get_pkg_version() {
-  if [ ! -z $1 ] ; then
+  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 "$PKG_VERSION"
+    echo "${!2}"
   fi
 }
 
-tolower(){
+tolower() {
   echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
@@ -194,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
 }
@@ -341,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"
@@ -350,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
@@ -519,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/issue

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

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
@@ -76,9 +69,19 @@ SED="sed -i"
   PKG_DEPENDS_BOOTSTRAP=""
   PKG_SECTION=""
   PKG_SHORTDESC="$1 (autogenerated)"
-  PKG_LONGDESC=""
+  PKG_LONGDESC="$1 (autogenerated)"
   PKG_IS_ADDON="no"
   PKG_PATCH_DIRS=""
+  PKG_NEED_UNPACK=""
+  PKG_SHA256=""
+  PKG_ADDON_BROKEN=""
+  PKG_ADDON_NAME=""
+  PKG_ADDON_PROVIDES=""
+  PKG_ADDON_REQUIRES=""
+  PKG_ADDON_SCREENSHOT=""
+  PKG_ADDON_TYPE=""
+  PKG_DISCLAIMER=""
+  PKG_MAINTAINER=""
 
   if [ -n "$1" ]; then
     _PKG_ROOT_NAME=${1%:*}
@@ -141,6 +144,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 +191,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.2.0.1"
 
 # 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

@@ -12,8 +12,8 @@
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
-  GREETING1="#                 LibreELEC                  #"
-  GREETING2="#            http://libreelec.tv             #"
+  GREETING1="#                  LibreELEC                 #"
+  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/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}"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_SI1145"
 PKG_VERSION="cbc6c62"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/THP-JOE/Python_SI1145"

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/"

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."
@@ -58,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() {
@@ -75,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/blindscan-s2/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="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="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"
+
+makeinstall_target() {
+  :
+}

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"

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,3 +29,7 @@ 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"
+
+pre_make_target() {
+  export PERL_USE_UNSAFE_INC=1
+}

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

@@ -19,14 +19,13 @@
 ################################################################################
 
 PKG_NAME="dvb-fe-tool"
-PKG_VERSION="fa2f7d9"
-PKG_REV="1"
+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)."
@@ -43,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/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/dvbsnoop/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016-2017 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,13 +16,18 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="libite"
-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"
+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_LONGDESC="That missing frog DNA you've been looking for"
+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"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+makeinstall_target() {
+  :
+}

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="b3c9ae7"
+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/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

@@ -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"
@@ -32,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

@@ -1,113 +0,0 @@
-################################################################################
-#      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="ffmpegx"
-PKG_VERSION="libreelec"
-PKG_REV="6"
-PKG_ARCH="any"
-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"
-  cp -PR $(get_build_dir ffmpeg)/* .
-  make clean
-
-# ffmpeg builds better with these options
-  strip_gold
-  strip_lto
-
-  if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
-    CFLAGS="-DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux $CFLAGS"
-    FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
-    FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi"
-  fi
-
-# ffmpeg does not build with libx264 on aarch64
-  if [ "$TARGET_ARCH" != "aarch64" ]; then
-    FFMPEG_X264="--enable-libx264"
-  fi
-
-  if [ "$TARGET_ARCH" == "arm" ]; then
-    FFMPEG_ARM_AO="--enable-hardcoded-tables"
-  fi
-}
-
-configure_target() {
-  ./configure \
-    \
-    `#Licensing options` \
-    --enable-gpl \
-    \
-    `#Documentation options` \
-    --disable-doc \
-    \
-    `#Hardware accelerated decoding encoding` \
-    $FFMPEG_RPI_HADE \
-    \
-    `#External library support` \
-    --enable-libmp3lame \
-    $FFMPEG_X264 \
-    --enable-openssl \
-    \
-    `#Toolchain options` \
-    --arch="$TARGET_ARCH" \
-    --cpu="$TARGET_CPU" \
-    --cross-prefix="$TARGET_PREFIX" \
-    --enable-cross-compile \
-    --sysroot="$SYSROOT_PREFIX" \
-    --sysinclude="$SYSROOT_PREFIX/usr/include" \
-    --target-os="linux" \
-    --nm="$NM" \
-    --ar="$AR" \
-    --as="$CC" \
-    --cc="$CC" \
-    --ld="$CC" \
-    --pkg-config="$ROOT/$TOOLCHAIN/bin/pkg-config" \
-    --host-cc="$HOST_CC" \
-    --host-cflags="$HOST_CFLAGS" \
-    --host-ldflags="$HOST_LDFLAGS" \
-    --host-libs="-lm" \
-    --extra-cflags="$CFLAGS" \
-    --extra-ldflags="$LDFLAGS" \
-    --extra-libs="$FFMPEG_LIBS" \
-    --extra-version="x" \
-    --enable-pic \
-    \
-    `#Advanced options` \
-    $FFMPEG_ARM_AO \
-
-}
-
-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
-  rm -fr $INSTALL/usr/local/share/ffmpeg/examples
-}

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,21 +17,14 @@
 ################################################################################
 
 PKG_NAME="imagemagick"
-PKG_VERSION="6.9.6-7"
-PKG_REV="1"
-PKG_ARCH="any"
+PKG_VERSION="7.0.7-1"
 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 \

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="enca"
 PKG_VERSION="1.19"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"

packages/addons/addon-depends/enet/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,17 @@
 ################################################################################
 
 PKG_NAME="enet"
-PKG_VERSION="1.3.13"
-PKG_REV="1"
+PKG_VERSION="e33ca1d"
 PKG_ARCH="any"
 PKG_LICENSE=""
-PKG_SITE=""
-PKG_URL="http://enet.bespin.org/download/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/cgutman/enet/"
+PKG_URL="https://github.com/cgutman/enet/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="network"
 PKG_SHORTDESC="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol)"
 PKG_LONGDESC="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol)"
-
-PKG_IS_ADDON="no"
 PKG_USE_CMAKE="no"
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
 

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="enum34"
 PKG_VERSION="1.1.6"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://bitbucket.org/stoneleaf/enum34"

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/"

packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk

@@ -0,0 +1,29 @@
+################################################################################
+#      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="fdk-aac"
+PKG_VERSION="0.1.5"
+PKG_SHA256="ff53d1d01cacc29c071e23192dfefa93bdbeaf775fc5d296259b4859d0306b79"
+PKG_ARCH="any"
+PKG_LICENSE="other"
+PKG_SITE="https://sourceforge.net/projects/opencore-amr/"
+PKG_URL="https://github.com/mstorsjo/fdk-aac/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="multimedia"
+PKG_LONGDESC="A standalone library of the Fraunhofer FDK AAC code from Android."
+PKG_AUTORECONF="yes"

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

@@ -0,0 +1,61 @@
+################################################################################
+#      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="libvpx"
+PKG_VERSION="1.6.1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="https://www.webmproject.org"
+PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain yasm:host"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="WebM VP8/VP9 Codec SDK"
+PKG_LONGDESC="The WebM Project is dedicated to developing a high-quality, open video format for the web that's freely available to everyone."
+PKG_AUTORECONF="no"
+
+configure_target() {
+
+  case $ARCH in
+    aarch64)
+      TARGET_NAME_LIBVPX="arm64-linux-gcc"
+      ;;
+    arm)
+      TARGET_NAME_LIBVPX="armv7-linux-gcc"
+      ;;
+    x86_64)
+      TARGET_NAME_LIBVPX="x86_64-linux-gcc"
+      ;;
+  esac
+
+  $PKG_CONFIGURE_SCRIPT --prefix=/usr \
+                        --extra-cflags="$CFLAGS" \
+                        --as=yasm \
+                        --target=$TARGET_NAME_LIBVPX \
+                        --disable-docs \
+                        --disable-examples \
+                        --disable-shared \
+                        --disable-tools \
+                        --disable-unit-tests \
+                        --disable-vp8-decoder \
+                        --disable-vp9-decoder \
+                        --enable-ccache \
+                        --enable-pic \
+                        --enable-static \
+                        --enable-vp8 \
+                        --enable-vp9
+}

packages/addons/addon-depends/ffmpegx-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,22 +17,17 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20161203-2245-stable"
-PKG_REV="1"
-PKG_ARCH="any"
+PKG_VERSION="snapshot-20171015-2245"
 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_URL="https://download.videolan.org/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
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 }
 

packages/addons/addon-depends/ffmpegx-depends/x265/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="x265"
+PKG_VERSION="2.5"
+PKG_ARCH="x86_64"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/videolan/x265"
+PKG_URL="https://github.com/videolan/x265/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="multimedia"
+PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  LDFLAGS="$LDFLAGS -ldl"
+  cmake -G "Unix Makefiles" ./source
+}

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

@@ -0,0 +1,190 @@
+################################################################################
+#      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="ffmpegx"
+PKG_VERSION="3.4"
+PKG_ARCH="any"
+PKG_LICENSE="LGPLv2.1+"
+PKG_SITE="https://ffmpeg.org"
+PKG_URL="https://github.com/FFmpeg/FFmpeg/archive/n${PKG_VERSION}.tar.gz"
+PKG_SOURCE_DIR="FFmpeg-n${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain bzip2 fdk-aac libvorbis openssl opus x264 x265 zlib"
+PKG_SECTION="multimedia"
+PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding"
+PKG_AUTORECONF="no"
+
+# Dependencies
+get_graphicdrivers
+
+if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
+fi
+
+# ARMv6 is no longer supported by libvpx
+if [ "$PROJECT" != "RPi" -a "$PROJECT" != "Slice" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvpx"
+fi
+
+pre_configure_target() {
+  cd $PKG_BUILD
+  rm -rf .$TARGET_NAME
+
+# ffmpeg builds better with these options
+  strip_gold
+  strip_lto
+
+  if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
+    CFLAGS="-DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux $CFLAGS"
+    PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
+  fi
+
+  if [ "$TARGET_ARCH" == "arm" ]; then
+    PKG_FFMPEG_ARM_AO="--enable-hardcoded-tables"
+  fi
+
+# HW encoders
+
+  # RPi 0-3
+  if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
+    PKG_FFMPEG_HW_ENCODERS_RPi="\
+    `#Video encoders` \
+    --enable-omx-rpi \
+    --enable-mmal \
+    --enable-encoder=h264_omx \
+    \
+    `#Video hwaccel` \
+    --enable-hwaccel=h264_mmal \
+    --enable-hwaccel=mpeg2_mmal \
+    --enable-hwaccel=mpeg4_mmal \
+    --enable-hwaccel=vc1_mmal"
+  fi
+
+  # Generic
+  if [[ "$TARGET_ARCH" = "x86_64" ]]; then
+    PKG_FFMPEG_HW_ENCODERS_GENERIC="\
+    `#Video encoders` \
+    --enable-encoder=h264_nvenc \
+    --enable-encoder=h264_vaapi \
+    --enable-encoder=hevc_nvenc \
+    --enable-encoder=hevc_vaapi \
+    --enable-encoder=mjpeg_vaapi \
+    --enable-encoder=mpeg2_vaapi \
+    --enable-encoder=vp8_vaapi \
+    --enable-encoder=vp9_vaapi \
+    \
+    `#Video hwaccel` \
+    --enable-hwaccel=h263_vaapi \
+    --enable-hwaccel=h264_vaapi \
+    --enable-hwaccel=hevc_vaapi \
+    --enable-hwaccel=mpeg2_vaapi \
+    --enable-hwaccel=mpeg4_vaapi \
+    --enable-hwaccel=vc1_vaapi \
+    --enable-hwaccel=vp9_vaapi \
+    --enable-hwaccel=wmv3_vaapi"
+  fi
+
+# Encoders
+    PKG_FFMPEG_ENCODERS="\
+    `#Video encoders` \
+    --enable-libvpx \
+    --enable-encoder=libvpx_vp8 \
+    --enable-encoder=libvpx_vp9 \
+    --enable-libx264 \
+    --enable-encoder=x264 \
+    --enable-libx265 \
+    --enable-encoder=x265 \
+    \
+    `#Audio encoders` \
+    --enable-encoder=ac3 \
+    --enable-encoder=eac3 \
+    --enable-libfdk-aac \
+    --enable-encoder=libfdk-aac \
+    --enable-encoder=flac \
+    --enable-libmp3lame \
+    --enable-encoder=libmp3lame \
+    --enable-libopus \
+    --enable-encoder=libopus \
+    --enable-libvorbis \
+    --enable-encoder=libvorbis"
+
+}
+
+configure_target() {
+  ./configure \
+    \
+    `#Programs to build` \
+    --enable-ffmpeg \
+    --disable-ffplay \
+    --enable-ffprobe \
+    --disable-ffserver \
+    \
+    `#Static and Shared` \
+    --enable-static \
+    --disable-shared \
+    \
+    `#Licensing options` \
+    --enable-gpl \
+    --enable-nonfree \
+    \
+    `#Documentation options` \
+    --disable-doc \
+    \
+    `#Hardware accelerated decoding encoding` \
+    $PKG_FFMPEG_HW_ENCODERS_RPi \
+    $PKG_FFMPEG_HW_ENCODERS_GENERIC \
+    \
+    `#General options` \
+    --enable-avresample \
+    \
+    `#Toolchain options` \
+    --arch="$TARGET_ARCH" \
+    --cpu="$TARGET_CPU" \
+    --cross-prefix="$TARGET_PREFIX" \
+    --enable-cross-compile \
+    --sysroot="$SYSROOT_PREFIX" \
+    --sysinclude="$SYSROOT_PREFIX/usr/include" \
+    --target-os="linux" \
+    --nm="$NM" \
+    --ar="$AR" \
+    --as="$CC" \
+    --cc="$CC" \
+    --ld="$CC" \
+    --pkg-config="$TOOLCHAIN/bin/pkg-config" \
+    --host-cc="$HOST_CC" \
+    --host-cflags="$HOST_CFLAGS" \
+    --host-ldflags="$HOST_LDFLAGS" \
+    --host-extralibs="-lm" \
+    --extra-cflags="$CFLAGS" \
+    --extra-ldflags="$LDFLAGS" \
+    --extra-libs="$PKG_FFMPEG_LIBS" \
+    --extra-version="x" \
+    --enable-pic \
+    --enable-openssl \
+    \
+    `#Advanced options` \
+    $PKG_FFMPEG_ARM_AO \
+
+}
+
+makeinstall_target() {
+  make install DESTDIR="$INSTALL/../.INSTALL_PKG"
+}
+
+post_makeinstall_target() {
+  for ff in "$INSTALL/../.INSTALL_PKG/usr/local/bin/"*; do mv "$ff" "${ff}x"; done
+}

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/"

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"
@@ -43,17 +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
 }
 
-makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib/golang
-  cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/
+pre_makeinstall_host() {
+  # need to cleanup old golang version when updating to a new version
+  rm -rf $TOOLCHAIN/lib/golang
+}
+
+makeinstall_host() {
+  mkdir -p $TOOLCHAIN/lib/golang
+  cp -av $PKG_BUILD/* $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/"
@@ -33,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/harfbuzz/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="harfbuzz"
 PKG_VERSION="1.3.3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="icu"
 PKG_VERSION="57.1"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.icu-project.org"
@@ -36,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/inadyn/libconfuse/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libconfuse"
-PKG_VERSION="3.0"
+PKG_VERSION="3.2"
 PKG_LICENSE="https://github.com/martinh/libconfuse/blob/master/LICENSE"
 PKG_SITE="https://github.com/martinh/libconfuse"
 PKG_URL="https://github.com/martinh/libconfuse/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/"

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/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/"

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"

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"

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

@@ -18,7 +18,6 @@
 
 PKG_NAME="libdvbcsa"
 PKG_VERSION="4ce8be8"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"

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"

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/"

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/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=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath
+  export GOROOT=$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.20.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/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

@@ -17,14 +17,13 @@
 ################################################################################
 
 PKG_NAME="libvncserver"
-PKG_VERSION="0.9.10"
-PKG_REV="0"
+PKG_VERSION="0.9.11"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libvnc.github.io/"
 PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="libvncserver-LibVNCServer-$PKG_VERSION"
-PKG_DEPENDS_TARGET="toolchain libjpeg-turbo libpng"
+PKG_DEPENDS_TARGET="toolchain libjpeg-turbo libpng openssl"
 PKG_SECTION="libs"
 PKG_SHORTDESC="LibVNCServer/LibVNCClient are cross-platform C libraries that allow you to easily implement VNC server or client functionality in your program."
 PKG_LONGDESC="LibVNCServer/LibVNCClient are cross-platform C libraries that allow you to easily implement VNC server or client functionality in your program."

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,24 +17,18 @@
 ################################################################################
 
 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"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-shared               \
+                           --with-libgif=$TARGET_PREFIX  \
+                           --with-libjpeg=$TARGET_PREFIX \
+                           --with-libtiff=$TARGET_PREFIX"
 
 makeinstall_target() {
   make install DESTDIR=$INSTALL

packages/addons/addon-depends/moonlight-common-c/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,18 +17,15 @@
 ################################################################################
 
 PKG_NAME="moonlight-common-c"
-PKG_VERSION="1d058cb"
-PKG_REV="1"
+PKG_VERSION="957b1de"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
-PKG_SITE="https://github.com/irtimmer/moonlight-common-c"
-PKG_URL="https://github.com/irtimmer/moonlight-common-c/archive/$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/moonlight-stream/moonlight-common-c"
+PKG_URL="https://github.com/moonlight-stream/moonlight-common-c/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION=""
 PKG_SHORTDESC="Shared C code for the implementation of Nvidia's GameStream protocol"
 PKG_LONGDESC="Shared C code for the implementation of Nvidia's GameStream protocol"
-
-PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {

packages/addons/addon-depends/moonlight-embedded/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,18 +17,15 @@
 ################################################################################
 
 PKG_NAME="moonlight-embedded"
-PKG_VERSION="2.2.2"
-PKG_REV="1"
+PKG_VERSION="82b956a"
 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"
 PKG_LONGDESC="Moonlight Embedded is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for Linux"
-
-PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 FREESCALE_V4L_INCLUDE=""
@@ -46,7 +43,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/moonlight-embedded/patches/moonlight-embedded-0001-link-against-libm.patch

@@ -5,8 +5,8 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
  
  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})
-+target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} m)
+-target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS})
++target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} m)
  
  add_subdirectory(docs)
  

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

@@ -5,8 +5,8 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
  
  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)
+-target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} m)
++target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} pthread m)
  
  add_subdirectory(docs)
  

packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0003-add-openssl-dependency.patch

@@ -0,0 +1,11 @@
+--- a/libgamestream/CMakeLists.txt
++++ b/libgamestream/CMakeLists.txt
+@@ -27,7 +27,7 @@ set_target_properties(moonlight-common P
+ target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
+ target_include_directories(moonlight-common PRIVATE ../third_party/moonlight-common-c/reedsolomon ${ENET_INCLUDE_DIRS})
+ target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES})
+-target_link_libraries(moonlight-common ${ENET_LIBRARIES})
++target_link_libraries(moonlight-common ${ENET_LIBRARIES} ${OPENSSL_LIBRARIES})
+ 
+ target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+ 

packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0003-fix-libcec4-compilation.patch

@@ -1,63 +0,0 @@
-From 90bfcdcc4da4178b0fd6c6013947006cd1c07377 Mon Sep 17 00:00:00 2001
-From: Iwan Timmer <irtimmer@gmail.com>
-Date: Fri, 9 Dec 2016 20:05:31 +0100
-Subject: [PATCH] Update libCEC compatibility to version 4.0
-
----
- src/input/cec.c                 | 2 +-
- third_party/libcec/ceccloader.h | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/input/cec.c b/src/input/cec.c
-index 8c3892e..1a50d81 100644
---- a/src/input/cec.c
-+++ b/src/input/cec.c
-@@ -77,7 +77,7 @@ void cec_init() {
-   libcecc_reset_configuration(&g_config);
-   g_config.clientVersion = LIBCEC_VERSION_CURRENT;
-   g_config.bActivateSource = 0;
--  g_callbacks.CBCecKeyPress = &on_cec_keypress;
-+  g_callbacks.keyPress = &on_cec_keypress;
-   g_config.callbacks = &g_callbacks;
-   snprintf(g_config.strDeviceName, sizeof(g_config.strDeviceName), "Moonlight");
-   g_config.callbacks = &g_callbacks;
-diff --git a/third_party/libcec/ceccloader.h b/third_party/libcec/ceccloader.h
-index 1ae0c2a..2f8f760 100644
---- a/third_party/libcec/ceccloader.h
-+++ b/third_party/libcec/ceccloader.h
-@@ -84,7 +84,7 @@ typedef struct {
-   int                                 (CDECL *set_osd_string)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress, CEC_NAMESPACE cec_display_control duration, const char* strMessage);
-   int                                 (CDECL *switch_monitoring)(libcec_connection_t connection, int bEnable);
-   CEC_NAMESPACE cec_version           (CDECL *get_device_cec_version)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress);
--  int                                 (CDECL *get_device_menu_language)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress, CEC_NAMESPACE cec_menu_language* language);
-+  int                                 (CDECL *get_device_menu_language)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress, CEC_NAMESPACE cec_menu_language language);
-   uint64_t                            (CDECL *get_device_vendor_id)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress);
-   uint16_t                            (CDECL *get_device_physical_address)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress);
-   CEC_NAMESPACE cec_logical_address   (CDECL *get_active_source)(libcec_connection_t connection);
-@@ -100,7 +100,7 @@ typedef struct {
-   int                                 (CDECL *mute_audio)(libcec_connection_t connection, int bSendRelease);
-   int                                 (CDECL *send_keypress)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iDestination, CEC_NAMESPACE cec_user_control_code key, int bWait);
-   int                                 (CDECL *send_key_release)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iDestination, int bWait);
--  CEC_NAMESPACE cec_osd_name          (CDECL *get_device_osd_name)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iAddress);
-+  int                                 (CDECL *get_device_osd_name)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iAddress, CEC_NAMESPACE cec_osd_name name);
-   int                                 (CDECL *set_stream_path_logical)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iAddress);
-   int                                 (CDECL *set_stream_path_physical)(libcec_connection_t connection, uint16_t iPhysicalAddress);
-   CEC_NAMESPACE cec_logical_addresses (CDECL *get_logical_addresses)(libcec_connection_t connection);
-@@ -161,7 +161,7 @@ static int libcecc_resolve_all(void* lib, libcec_interface_t* iface)
-   _libcecc_resolve(lib, iface->set_osd_string,                "libcec_set_osd_string",                int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_display_control, const char*));
-   _libcecc_resolve(lib, iface->switch_monitoring,             "libcec_switch_monitoring",             int(CDECL *)(libcec_connection_t, int));
-   _libcecc_resolve(lib, iface->get_device_cec_version,        "libcec_get_device_cec_version",        CEC_NAMESPACE cec_version(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
--  _libcecc_resolve(lib, iface->get_device_menu_language,      "libcec_get_device_menu_language",      int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_menu_language*));
-+  _libcecc_resolve(lib, iface->get_device_menu_language,      "libcec_get_device_menu_language",      int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_menu_language));
-   _libcecc_resolve(lib, iface->get_device_vendor_id,          "libcec_get_device_vendor_id",          uint64_t(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-   _libcecc_resolve(lib, iface->get_device_physical_address,   "libcec_get_device_physical_address",   uint16_t(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-   _libcecc_resolve(lib, iface->get_active_source,             "libcec_get_active_source",             CEC_NAMESPACE cec_logical_address(CDECL *)(libcec_connection_t));
-@@ -177,7 +177,7 @@ static int libcecc_resolve_all(void* lib, libcec_interface_t* iface)
-   _libcecc_resolve(lib, iface->mute_audio,                    "libcec_mute_audio",                    int(CDECL *)(libcec_connection_t, int));
-   _libcecc_resolve(lib, iface->send_keypress,                 "libcec_send_keypress",                 int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_user_control_code, int));
-   _libcecc_resolve(lib, iface->send_key_release,              "libcec_send_key_release",              int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, int));
--  _libcecc_resolve(lib, iface->get_device_osd_name,           "libcec_get_device_osd_name",           CEC_NAMESPACE cec_osd_name(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-+  _libcecc_resolve(lib, iface->get_device_osd_name,           "libcec_get_device_osd_name",           int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_osd_name));
-   _libcecc_resolve(lib, iface->set_stream_path_logical,       "libcec_set_stream_path_logical",       int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-   _libcecc_resolve(lib, iface->set_stream_path_physical,      "libcec_set_stream_path_physical",      int(CDECL *)(libcec_connection_t, uint16_t));
-   _libcecc_resolve(lib, iface->get_logical_addresses,         "libcec_get_logical_addresses",         CEC_NAMESPACE cec_logical_addresses(CDECL *)(libcec_connection_t));

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"
@@ -54,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

@@ -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/"
@@ -51,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/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/"

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"
@@ -30,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/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"

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/"

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,12 +18,11 @@
 
 PKG_NAME="irssi"
 PKG_VERSION="0.8.19"
-PKG_REV="1"
 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"
@@ -41,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/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

@@ -18,12 +18,11 @@
 
 PKG_NAME="lftp"
 PKG_VERSION="4.7.4"
-PKG_REV="1"
 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/ncftp/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="ncftp"
 PKG_VERSION="3.2.5"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.ncftp.com/ncftp/"