Merge pull request #3192 from mglae/le9_ncurses_stools110

ncurses: improvements / system-tools 110: update mc and efibootmgr

.gitignore

@@ -15,6 +15,9 @@ mkpkg-temp
 # private working directory
 /.work/
 
+# dedicated filesystem
+/lost+found/
+
 # symlinks...
 /sources
 /.work

Makefile

@@ -24,4 +24,4 @@ distclean:
 	rm -rf ./.ccache ./$(BUILD_DIRS)
 
 src-pkg:
-	tar cvjf sources.tar.bz2 sources .stamps
+	tar cvJf sources.tar.xz sources .stamps

config/arch.x86_64

@@ -10,7 +10,7 @@
   TARGET_KERNEL_ARCH=x86
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m64"
+  TARGET_CFLAGS="-march=$TARGET_CPU -m64 -mmmx -msse -msse2 -mfpmath=sse"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m64"
 
 # build with SIMD support ( yes / no )

config/optimize

@@ -22,7 +22,7 @@ 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$TOOLCHAIN/include"
+HOST_CFLAGS="-march=native -O2 -Wall -pipe -I$TOOLCHAIN/include"
 HOST_CXXFLAGS="$HOST_CFLAGS"
 HOST_LDFLAGS="-Wl,-rpath,$TOOLCHAIN/lib -L$TOOLCHAIN/lib"
 HOST_INCDIR="$TOOLCHAIN/include /usr/include"
@@ -60,8 +60,8 @@ if [ -z "$HOST_LIBDIR" ]; then
   HOST_LIBDIR="$TOOLCHAIN/lib"
 
   # ubuntu/debian specific "multiarch support"
-  MACHINE_HARDWARE_NAME="$(uname -m)"
-  MACHINE_HARDWARE_PLATFORM="$(uname -i)"
+  export MACHINE_HARDWARE_NAME="$(uname -m)"
+  export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
   FAMILY_TRIPLET=${HOST_NAME/${MACHINE_HARDWARE_NAME}/${MACHINE_HARDWARE_PLATFORM}}
   if [ -d /lib/$FAMILY_TRIPLET ]; then
     HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"

config/options

@@ -1,93 +1,74 @@
 # Do not build as root. Ever.
-if [[ $EUID -eq 0 ]]; then
+if [[ "${EUID}" -eq 0 ]]; then
   echo "Building as the root user is NOT supported. Use a regular user account for the build." 1>&2
   exit 1
 fi
 
 # set default language for buildsystem
-  export LC_ALL=C
+export LC_ALL=C
+
+# set default independent variables
+ROOT="${PWD}"
+DISTRO_DIR="${ROOT}/distributions"
+PROJECT_DIR="${ROOT}/projects"
 
 # determines DISTRO, if not forced by user
-# default is LibreELEC
-if [ -z "$DISTRO" ]; then
-  DISTRO="LibreELEC"
-else
-  DISTRO="$DISTRO"
-fi
+DISTRO="${DISTRO:-LibreELEC}"
 
 # determines PROJECT, if not forced by user
-# default is Generic
-if [ -z "$PROJECT" ]; then
-  PROJECT="Generic"
-else
-  PROJECT="$PROJECT"
-fi
+PROJECT="${PROJECT:-Generic}"
 
-# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
-# default is x86_64
-if [ -z "$ARCH" ]; then
-  TARGET_ARCH="x86_64"
-else
-  TARGET_ARCH="$ARCH"
-fi
-
-ROOT="${PWD}"
-DISTRO_DIR="$ROOT/distributions"
-PROJECT_DIR="$ROOT/projects"
+# determines TARGET_ARCH, if not forced by user
+ARCH="${ARCH:-x86_64}"
+TARGET_ARCH="${ARCH}"
 
 # include helper functions
 . config/functions
 
-# include versioning
-  . config/version
+# read DISTRO version information
+. "${DISTRO_DIR}/${DISTRO}/version" || die "\nERROR: No distro version present\n"
 
-# read distro versioning if available
- if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
-   . $DISTRO_DIR/$DISTRO/version
- fi
+# read DISTRO options if available
+if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
+  . "${DISTRO_DIR}/${DISTRO}/options"
+fi
 
-# read distro options if available
- if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
-   . $DISTRO_DIR/$DISTRO/options
- fi
+# read PROJECT options if available
+if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
+  . "${PROJECT_DIR}/${PROJECT}/options"
+fi
 
-# read project options if available
- if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
-   . $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
+# read DEVICE options if available
+if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
+  . "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
+fi
 
 # projects can set KERNEL_NAME (kernel.img)
-[ -z "$KERNEL_NAME" ] && KERNEL_NAME="KERNEL"
+KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
 
-LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux $PROJECT_DIR/$PROJECT/patches/linux $PROJECT_DIR/$PROJECT/packages/linux $ROOT/packages/linux"
-[ -n "$DEVICE" ] && LINUX_DEPENDS+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/linux $PROJECT_DIR/$PROJECT/devices/$DEVICE/packages/linux"
-[ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode $ROOT/packages/linux-firmware/kernel-firmware"
+LINUX_DEPENDS="${PROJECT_DIR}/${PROJECT}/linux ${PROJECT_DIR}/${PROJECT}/patches/linux ${PROJECT_DIR}/${PROJECT}/packages/linux ${ROOT}/packages/linux"
+[ -n "${DEVICE}" ] && LINUX_DEPENDS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/linux"
+[ "${TARGET_ARCH}" = "x86_64" ] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
 
 # Need to point to your actual cc
-# If you have ccache installed, take care that LOCAL_CC don't point to it
-  [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(which gcc)"
+# If you have ccache installed, take care that LOCAL_CC does not point to it
+[ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(command -v gcc)"
 
-if [ -z "$LOCAL_CC" ] ; then
-  echo "***** Please install gcc *****"
-  exit 127
+if [ -z "${LOCAL_CC}" ]; then
+  die "***** Please install gcc *****" "127"
 fi
 
 # Need to point to your actual g++
-# If you have ccache installed, take care that LOCAL_CXX don't point to it
-  [ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(which g++)"
+# If you have ccache installed, take care that LOCAL_CXX does not point to it
+[ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(command -v g++)"
 
 # verbose compilation mode (yes/no)
-  VERBOSE="yes"
+VERBOSE="${VERBOSE:-yes}"
 
 # Concurrency make level (-j option)
-#  Try value 1 (default) to 4 on single CPU computer, or more on
-#  multi-processor computer (like hyperthreading SMP CPU)
-  [ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(grep -c '^processor[[:cntrl:]]*:' /proc/cpuinfo)
+#  Try values between 1 and number of processor cores present.
+#  default: use all cores
+[ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(nproc)
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
@@ -95,22 +76,29 @@ fi
 # value. The default is gigabytes. The actual value stored is rounded down to
 # the nearest multiple of 16 kilobytes.  Keep in mind this per project .ccache
 # directory.
-  CCACHE_CACHE_SIZE="10G"
+CCACHE_CACHE_SIZE="10G"
 
 # read options from $HOME if available
-  if [ -f "$HOME/.libreelec/options" ]; then
-    . $HOME/.libreelec/options
-  fi
-
-# overwrite OEM_SUPPORT via commandline
-if [ "$OEM" = yes -o "$OEM" = no ]; then
-  OEM_SUPPORT=$OEM
+if [ -f "${HOME}/.libreelec/options" ]; then
+  . "${HOME}/.libreelec/options"
 fi
 
-[ -z ${_DEBUG_DEPENDS_LIST+x} ] && set_debug_depends
+# overwrite OEM_SUPPORT via commandline
+if [ "${OEM}" = "yes" -o "${OEM}" = "no" ]; then
+  OEM_SUPPORT="${OEM}"
+fi
 
-check_path >&2
-check_config >&2
+[ -z "${_DEBUG_DEPENDS_LIST+x}" ] && set_debug_depends
+
+check_config
 
 . config/graphic
 . config/path $1
+
+## package processing
+
+# If the package caches are unset, then populate them
+init_package_cache
+
+# set package metadata
+source_package "${1}"

config/path

@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
 set -e
 
 # setup initial directorys (relative to root)
@@ -58,80 +61,6 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
 
 MAKE="$TOOLCHAIN/bin/make"
 MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
-SED="sed -i"
-
-unset LD_LIBRARY_PATH
-
-# Don't use BUILD_WITH_DEBUG in "gloabl" package.mk - instead, call the function
-# build_with_debug() directly as the function depends on various package.mk
-# variables that will be in the process of being configured. Once package.mk is
-# fully sourced we can set this variable and use it in situations where we know the
-# package has already been sourced.
-unset BUILD_WITH_DEBUG
-
-# If the package caches are unset, then populate them
-init_package_cache
-
-# set package metadata
-reset_pkg_vars "$1"
-
-[ -n "$1" ] && PKG_DIR="$(get_pkg_directory $1)"
-
-if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
-  unset -f configure_package
-  . $PKG_DIR/package.mk
-  [ -z "$PKG_SHORTDESC" ] && PKG_SHORTDESC="$PKG_NAME (autogenerated)"
-  [ -z "$PKG_LONGDESC" ] &&  PKG_LONGDESC="$PKG_NAME (autogenerated)"
-fi
-
-if [ "$PKG_IS_ADDON" = "yes" -o "$PKG_IS_ADDON" = "embedded" ] ; then
-  [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="${PKG_SECTION//\//.}.$PKG_NAME"
-  [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
-fi
-
-# Automatically set PKG_SOURCE_NAME unless it is already defined.
-# PKG_SOURCE_NAME will be automatically set to a name based on
-# the $PKG_NAME-$PKG_VERSION convention.
-#
-# Any $PKG_URL that references more than a single url will abort
-# the build as these are no longer supported - use mkpkg instead.
-if [ -n "$PKG_URL" -a -z "$PKG_SOURCE_NAME" ]; then
-  if [[ $PKG_URL =~ .*\ .* ]]; then
-    echo "Error - packages with multiple urls are no longer supported, use mkpkg:"
-    echo "$PKG_URL"
-    exit 1
-  fi
-  if [[ ${PKG_URL} =~ .git$ || ${PKG_URL} =~ ^git:// ]]; then
-    PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}
-  elif [[ ${PKG_URL} =~ ^file:// ]]; then
-    PKG_SOURCE_NAME=${PKG_URL#file://}
-    # if no specific PKG_TAR_COPY_OPTS then default to excluding .git and .svn as they can be huge
-    [ -z "${PKG_TAR_COPY_OPTS+x}" ] && PKG_TAR_COPY_OPTS="--exclude=.git --exclude=.svn"
-  else
-    PKG_SOURCE_NAME="${PKG_URL##*/}"
-    case $PKG_SOURCE_NAME in
-      ${PKG_NAME}-${PKG_VERSION}.*)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-      *.tar.bz2 | *.tar.gz | *.tar.xz)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
-        ;;
-      *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-    esac
-  fi
-fi
-
-PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-
-build_with_debug && BUILD_WITH_DEBUG="yes" || BUILD_WITH_DEBUG="no"
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -152,45 +81,23 @@ fi
 
 VERSION_SUFFIX=$TARGET_ARCH
 
-SILENT_OUT=3
-VERBOSE_OUT=4
-if [ "$VERBOSE" = yes ]; then
-  exec 3>&1
-  exec 4>&2
-else
-  exec 3>&2
-  exec 4>/dev/null
-fi
-BUILD_INDENT_SIZE=4
+# redirect formatted output
+if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
+  export BUILD_INDENT_SIZE=4
+  export SILENT_OUT=3
+  export VERBOSE_OUT=4
 
-# define colors
-if [ "$DISABLE_COLORS" != "yes" ]; then
-  black="\e[0;30m"
-  boldblack="\e[1;30m"
-  red="\e[0;31m"
-  boldred="\e[1;31m"
-  green="\e[0;32m"
-  boldgreen="\e[1;32m"
-  yellow="\e[0;33m"
-  boldyellow="\e[1;33m"
-  blue="\e[0;34m"
-  boldblue="\e[1;34m"
-  magenta="\e[0;35m"
-  boldmagenta="\e[1;35m"
-  cyan="\e[0;36m"
-  boldcyan="\e[1;36m"
-  white="\e[0;37m"
-  boldwhite="\e[1;37m"
-  endcolor="\e[0m"
-fi
-
-# If sourcing a package, configure any package variables dependent on variables we have set
-if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
-  if [ "$(type -t configure_package)" = "function" ]; then
-    configure_package
+  if [ "$VERBOSE" = yes ]; then
+    exec 3>&1
+    exec 4>&2
+  else
+    exec 3>&2
+    exec 4>/dev/null
   fi
 fi
 
+unset LD_LIBRARY_PATH
+
 # multilib? nah
 unset CONFIG_SITE
 

config/show_config

@@ -129,32 +129,33 @@ show_config() {
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
   # Kodi configuration
+  if [ ! "$MEDIACENTER" = "no" ]; then
+    config_message="$config_message\n\n Kodi configuration:"
+    config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n\n Kodi configuration:"
-  config_message="$config_message\n $dashes$dashes"
+    config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
+    config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
+    if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
+      config_message="$config_message\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
+      config_message="$config_message\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+    fi
+    config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
+    config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
+    config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
+    config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
+    config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
+    config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
+    config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
+    config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
+    config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
 
-  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
-    config_message="$config_message\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
-    config_message="$config_message\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+    for config_skin in $SKINS; do
+      config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
+    done
+
+    config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
+    config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
   fi
-  config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
-  config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
-  config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-  config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-  config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-  config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
-
-  for config_skin in $SKINS; do
-    config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
-  done
-
-  config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
 
   if [ "$(type -t show_distro_config)" = "function" ]; then
     show_distro_config

config/sources

@@ -1,2 +1,2 @@
 # Sourceforge download site
-  SOURCEFORGE_SRC="http://prdownloads.sourceforge.net"
+  SOURCEFORGE_SRC="https://prdownloads.sourceforge.net"

licenses/LibPNG2.txt

@@ -0,0 +1,134 @@
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+ * Copyright (c) 1995-2018 The PNG Reference Library Authors.
+ * Copyright (c) 2018 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no even shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+    Simon-Pierre Cadieux
+    Eric S. Raymond
+    Mans Rullgard
+    Cosmin Truta
+    Gilles Vollant
+    James Yu
+    Mandar Sahastrabuddhe
+    Google Inc.
+    Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+    There is no warranty against interference with your enjoyment of
+    the library or against infringement.  There is no warranty that our
+    efforts or the library will fulfill any of your particular purposes
+    or needs.  This library is provided with all faults, and the entire
+    risk of satisfactory quality, performance, accuracy, and effort is
+    with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+    Tom Lane
+    Glenn Randers-Pehrson
+    Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+    John Bowler
+    Kevin Bracey
+    Sam Bushell
+    Magnus Holmgren
+    Greg Roelofs
+    Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+    Andreas Dilger
+    Dave Martindale
+    Guy Eric Schalnat
+    Paul Schmidt
+    Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose.  The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be misrepresented.
+
+ 2. Altered versions must be plainly marked as such and must not
+    be misrepresented as being the original source.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products.  If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.

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

@@ -4,13 +4,10 @@
 PKG_NAME="Adafruit_Python_ADS1x15"
 PKG_VERSION="a963cc0ee83e2ba6d671b02df5febf7250f626aa"
 PKG_SHA256="2f81a9a6b7b7f46b79faa5b01df0c25fa5f16af80842d74e35b5fbf01ab0c619"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python ADS1x15 Library"
-PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi or BeagleBone black."
+PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
 

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_ADXL345"
 PKG_VERSION="dca3d90b5477a304fa130f5cc90ea59e3968ce6f"
 PKG_SHA256="22ec0fc6679cc3e9b5f0aff5cfeef34cbbf13e59aecfb829c2f0dc2d90b5fb8b"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python ADXL345 Library"
-PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi or BeagleBone Black."
+PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_BMP"
 PKG_VERSION="e8521e969afae3321d9789353d7e92ea9a5e9a56"
 PKG_SHA256="e5e140c34e312f6a00c62b1bd47ebe3f1857009b1c202c18c7b092ebb2e1eb9c"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python BMP Library"
-PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi or Beaglebone Black."
+PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_CharLCD"
 PKG_VERSION="bc75cad284766240424f29dc8e7b84d0caceb72e"
 PKG_SHA256="eae4b446162feb533a469a9dacf6e750250f925561c9f7983a11d340e1dd98d4"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python CharLCD Library"
-PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi or BeagleBone Black."
+PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,14 +4,11 @@
 PKG_NAME="Adafruit_Python_DHT"
 PKG_VERSION="18846deec6a96572b3f2c4a9edfb5bac55b46f5b"
 PKG_SHA256="9125f8f42b4874db257a45184b866e8b424aa67230d2ffbc734b53686da7817f"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-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_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
 
 pre_make_target() {

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_GPIO"
 PKG_VERSION="c543d1df9c0a71bafb9f0a1f9dceecd79a920e74"
 PKG_SHA256="d3cb74fd033ebe5aea1786a584d64ef5eb8082ef2bf0a568b01691612cd04e88"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python GPIO Library"
-PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi and Beaglebone Black using the RPi.GPIO and Adafruit_BBIO librarie"
+PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi ."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_LED_Backpack"
 PKG_VERSION="e34b9548e86e63747563a94f02b65b2980fdefff"
 PKG_SHA256="244d2625cdaebdc68e299fedde276efa5c9f7c143681c4ee056fb8350a4f7167"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Python library for controlling LED backpack displays."
-PKG_LONGDESC="Python library for controlling LED backpack displays such as 8x8 matrices, bar graphs, and 7/14-segment displays on a Raspberry Pi or BeagleBone Black."
+PKG_LONGDESC="Python library for controlling LED backpack displays."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_LSM303"
 PKG_VERSION="37d288844515d7bb62a2329982eb033e92dceceb"
 PKG_SHA256="609591f2add15e849d3bba320417c705a50a3ed077632baf20c12c8b740d5331"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python LSM303 Library"
-PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi & BeagleBone Black."
+PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_MCP3008"
 PKG_VERSION="e721d26e650c99b0f6d3efd4ec30444e1adf5ccd"
 PKG_SHA256="f5e4c847a87716c16f0209df95c281b5071549644a79a143a77b212f25c464dc"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python MCP3008 Library"
-PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi or BeagleBone black."
+PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_MCP4725"
 PKG_VERSION="4d028bbcf58b011a8f14c5d95057b7e1dcc1064e"
 PKG_SHA256="6ebbd1f76807b01dc2b723064e52b0c82fc45388265b8ec867e0a42a46a6e926"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python MCP4725 Library"
-PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi or BeagleBone black."
+PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_PCA9685"
 PKG_VERSION="f86db2ca5de379748afd71e379ce2155f47d21e7"
 PKG_SHA256="46e11dcfbfaab5756ddeb6ab31740cf8c7419ec1d32be2519f19882e7d86e426"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python PCA9685 Library"
-PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi or BeagleBone black."
+PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_PureIO"
 PKG_VERSION="6f4976d91c52d70b67b28bba75a429b5328a52c1"
 PKG_SHA256="891a4d077fe6610de6aa4b0dc5b9933a6c7db3492072df60c0383662f28c2ae9"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Pure python access to Linux IO including I2C and SPI."
-PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI. Drop in replacement for smbus and spidev modules."
+PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI."
 PKG_TOOLCHAIN="manual"

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

@@ -4,13 +4,9 @@
 PKG_NAME="Adafruit_Python_SI1145"
 PKG_VERSION="18c400643b39dbf29ab7ff8e74ab0c5c36ef5cf1"
 PKG_SHA256="0238b2c01cfbb2890ae78468d2fc19c815748fc94860a4eb92b649d074476264"
-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 Python2 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_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_SSD1306"
 PKG_VERSION="8819e2d203df49f2843059d981b7347d9881c82b"
 PKG_SHA256="ed1163dee2fe6c0c2065a429e1d93cff7397a309071ff83714c84566739680a2"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python SSD1306 Library"
 PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_TCS34725"
 PKG_VERSION="6306f90b4601237a852acef89eeecc1261ce38b3"
 PKG_SHA256="f2c3218551da55d7fdbe2499a6ffa3a0b8ed1709e4402c6b0e0f37b17d4aa81f"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python TCS34725 Library"
-PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi & BeagleBone Black."
+PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_VCNL40xx"
 PKG_VERSION="5c72575b7390fbedfae0b5fb2a881ca9efe9ca22"
 PKG_SHA256="78346836965562720248138203a4af9dc6aa18815bda2a5b7842e3b9af9d1ea8"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python VCNL40xx Library"
-PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi & BeagleBone Black."
+PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -4,12 +4,9 @@
 PKG_NAME="Adafruit_Python_WS2801"
 PKG_VERSION="d0c190715ffef1b00e5ffa2d7b7560e7f8ed4263"
 PKG_SHA256="6219edb5c1d767ff950f5020bacdfb5ba608b4995eb14d6073fdec2f17f584cb"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
 PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host"
-PKG_SECTION="python"
-PKG_SHORTDESC="Adafruit Python WS2801 Library"
-PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi & BeagleBone Black."
+PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi."
 PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="argtable2"
+PKG_VERSION="2.13"
+PKG_SHA256="8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf"
+PKG_LICENSE="BSD"
+PKG_SITE="http://argtable.sourceforge.net/"
+PKG_URL="https://downloads.sourceforge.net/project/argtable/argtable/argtable-${PKG_VERSION}/argtable2-${PKG_VERSION:2:4}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Argtable is an open source ANSI C library that parses GNU-style command-line options."
+
+make_target() {
+  :
+}

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

@@ -4,14 +4,11 @@
 PKG_NAME="bash"
 PKG_VERSION="4.3.46"
 PKG_SHA256="fc7131bbc3139db143ec9fe03fd4e6bd3636bdf53e6956065b261f034b6af74b"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/bash/bash.html"
 PKG_URL="ftp://ftp.cwru.edu/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
-PKG_SECTION="devel"
-PKG_SHORTDESC="The GNU Bourne Again shell"
-PKG_LONGDESC="The GNU Bourne Again shell"
+PKG_LONGDESC="The GNU Bourne Again shell."
 
 PKG_CONFIGURE_OPTS_TARGET="--with-curses \
                            --enable-readline \

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

@@ -5,14 +5,11 @@
 PKG_NAME="ccid"
 PKG_VERSION="1.4.28"
 PKG_SHA256="875836ac5d9d952b40dc1a253a726e74361671864d81337285a3260268f8ade0"
-PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
 PKG_URL="https://alioth.debian.org/frs/download.php/latestfile/112/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain pcsc-lite"
-PKG_SECTION="driver"
-PKG_SHORTDESC="CCID free software driver"
-PKG_LONGDESC="CCID free software driver"
+PKG_LONGDESC="A generic USB Chip/Smart Card Interface Devices driver."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --enable-twinserial"

packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk

@@ -5,9 +5,8 @@
 PKG_NAME="at-spi2-atk"
 PKG_VERSION="2.26.2"
 PKG_SHA256="61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e"
-PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain at-spi2-core atk libX11 libxml2"
-PKG_SHORTDESC="A GTK+ module that bridges ATK to D-Bus at-spi"
+PKG_LONGDESC="A GTK+ module that bridges ATK to D-Bus at-spi."

packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk

@@ -5,12 +5,11 @@
 PKG_NAME="at-spi2-core"
 PKG_VERSION="2.28.0"
 PKG_SHA256="42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87"
-PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
-PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi"
+PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."
 
 PKG_MESON_OPTS_TARGET="-Denable_docs=false \
                        -Denable-introspection=no"

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

@@ -5,12 +5,11 @@
 PKG_NAME="atk"
 PKG_VERSION="2.29.1"
 PKG_SHA256="1aa7707c6297c1797fe4d79a22a57ede4d5586b0f7a3b30e886d7ca9d75f20da"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib glib:host"
-PKG_LONGDESC="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications."
+PKG_LONGDESC="Provides the set of accessibility interfaces that are implemented by other applications."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_MESON_OPTS_TARGET="-Ddocs=false \

packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libXcomposite"
 PKG_LONGDESC="libXcomposite for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libXdamage"
 PKG_LONGDESC="libXdamage for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libXfixes"
 PKG_LONGDESC="libXfixes for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libXi"
 PKG_LONGDESC="libXi for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libXrender"
 PKG_LONGDESC="libXrender for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libXtst"
 PKG_LONGDESC="libXtst for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk

@@ -7,15 +7,14 @@ PKG_NAME="chrome-libxcb"
 PKG_LONGDESC="libxcb for chrome"
 PKG_URL=""
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-static \
+                           --enable-shared"
+
 unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
   :
 }

packages/addons/addon-depends/chrome-depends/cups/package.mk

@@ -5,19 +5,13 @@
 PKG_NAME="cups"
 PKG_VERSION="2.2.8"
 PKG_SHA256="8f87157960b9d80986f52989781d9de79235aa060e05008e4cf4c0a6ef6bca72"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
 PKG_URL="https://github.com/apple/cups/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl zlib"
-PKG_LONGDESC="CUPS printing system"
+PKG_LONGDESC="CUPS printing system."
 PKG_BUILD_FLAGS="+pic"
 
-pre_configure_target() {
-  cd ..
-  rm -rf .$TARGET_NAME
-}
-
 PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
                            --disable-gssapi \
                            --disable-avahi \
@@ -25,6 +19,11 @@ PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
                            --disable-launchd \
                            --disable-unit-tests"
 
+pre_configure_target() {
+  cd ..
+  rm -rf .$TARGET_NAME
+}
+
 makeinstall_target() {
   make BUILDROOT="$INSTALL/../.INSTALL_PKG"
 }

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

@@ -5,7 +5,6 @@
 PKG_NAME="gdk-pixbuf"
 PKG_VERSION="2.36.12"
 PKG_SHA256="fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334"
-PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz"

packages/addons/addon-depends/chrome-depends/gtk3/package.mk

@@ -5,13 +5,11 @@
 PKG_NAME="gtk3"
 PKG_VERSION="3.22.30"
 PKG_SHA256="a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567"
-PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-$PKG_VERSION.tar.xz"
-PKG_SOURCE_DIR="gtk+-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango"
-PKG_LONGDESC="The Gimp ToolKit (GTK) is a library for creating graphical user interfaces for the X Window System."
+PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System."
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-cups \
                            --disable-debug \

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

@@ -5,7 +5,6 @@
 PKG_NAME="harfbuzz"
 PKG_VERSION="1.8.1"
 PKG_SHA256="fbed6392ddb085e45e6090a9f389f72926d0e355f4b0a2ef51d35cf21686df45"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 PKG_URL="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$PKG_VERSION.tar.bz2"

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

@@ -4,13 +4,11 @@
 PKG_NAME="icu"
 PKG_VERSION="61.1"
 PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
-PKG_ARCH="any"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.icu-project.org"
 PKG_URL="http://download.icu-project.org/files/icu4c/${PKG_VERSION}/icu4c-${PKG_VERSION//./_}-src.tgz"
-PKG_SOURCE_DIR="icu"
 PKG_DEPENDS_TARGET="toolchain icu:host"
-PKG_LONGDESC="International Components for Unicode library"
+PKG_LONGDESC="International Components for Unicode library."
 
 PKG_ICU_OPTS="--disable-extras \
               --disable-icuio \
@@ -20,15 +18,16 @@ PKG_ICU_OPTS="--disable-extras \
               --disable-tests \
               --disable-tools"
 
-
 PKG_CONFIGURE_OPTS_HOST="--enable-static \
                          --disable-shared \
                          $PKG_ICU_OPTS"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
-                         $PKG_ICU_OPTS"
+configure_package() {
+  PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
+                             $PKG_ICU_OPTS"
 
-PKG_CONFIGURE_SCRIPT="source/configure"
+  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/source/configure"
+}
 
 post_makeinstall_target() {
   rm -rf $INSTALL

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

@@ -5,12 +5,11 @@
 PKG_NAME="libXScrnSaver"
 PKG_VERSION="1.2.2"
 PKG_SHA256="8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://xorg.freedesktop.org/"
 PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain scrnsaverproto"
-PKG_LONGDESC="X11 Screen Saver extension client library"
+PKG_LONGDESC="X11 Screen Saver extension client library."
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-static \
                            --enable-shared \

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

@@ -5,12 +5,11 @@
 PKG_NAME="libXcursor"
 PKG_VERSION="1.1.15"
 PKG_SHA256="294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b"
-PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender"
-PKG_LONGDESC="X11 Cursor management library"
+PKG_LONGDESC="X11 Cursor management library.s"
 PKG_BUILD_FLAGS="+pic"
 
 makeinstall_target() {

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

@@ -5,12 +5,11 @@
 PKG_NAME="libXft"
 PKG_VERSION="2.3.2"
 PKG_SHA256="f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c"
-PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain fontconfig freetype libXrender util-macros xorgproto"
-PKG_LONGDESC="X FreeType library"
+PKG_LONGDESC="X FreeType library."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \

packages/addons/addon-depends/chrome-depends/libxss/package.mk

@@ -4,13 +4,11 @@
 PKG_NAME="libxss"
 PKG_VERSION="1.2.2"
 PKG_SHA256="8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d"
-PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2"
-PKG_SOURCE_DIR="libXScrnSaver-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain util-macros libXext scrnsaverproto"
-PKG_LONGDESC="X11 Screen Saver extension library"
+PKG_LONGDESC="X11 Screen Saver extension library."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"

packages/addons/addon-depends/chrome-depends/pango/package.mk

@@ -5,7 +5,6 @@
 PKG_NAME="pango"
 PKG_VERSION="1.42.1"
 PKG_SHA256="915a6756b298578ff27c7a6393f8c2e62e6e382f9411f2504d7af1a13c7bce32"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-$PKG_VERSION.tar.xz"

packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk

@@ -5,12 +5,11 @@
 PKG_NAME="scrnsaverproto"
 PKG_VERSION="1.2.2"
 PKG_SHA256="8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://xorg.freedesktop.org/"
 PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="X11 Screen Saver extension wire protocol"
+PKG_LONGDESC="X11 Screen Saver extension wire protocol."
 
 makeinstall_target() {
   :

packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk

@@ -4,7 +4,6 @@
 PKG_NAME="shared-mime-info"
 PKG_VERSION="1.9"
 PKG_SHA256="5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83"
-PKG_ARCH="any"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
 PKG_URL="http://freedesktop.org/~hadess/shared-mime-info-$PKG_VERSION.tar.xz"

packages/addons/addon-depends/chrome-depends/unclutter/package.mk

@@ -4,7 +4,6 @@
 PKG_NAME="unclutter"
 PKG_VERSION="1.09"
 PKG_SHA256="3a53575fe2a75a34bc9a2b0ad92ee0f8a7dbedc05d8783f191c500060a40a9bd"
-PKG_ARCH="any"
 PKG_LICENSE="Public Domain"
 PKG_SITE="https://sourceforge.net/projects/unclutter/"
 PKG_URL="https://sourceforge.net/projects/unclutter/unclutter/source_$PKG_VERSION/unclutter-$PKG_VERSION.tar.gz"

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

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="comskip"
+PKG_VERSION="6030aa0d3b589161ec96c6c986c48aa826fb9f72"
+PKG_SHA256="df0b4b0354aef5acc17e4e94a20a396fa69c474af7579c94aad09dd490e0ee38"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kaashoek.com/comskip/"
+PKG_URL="https://github.com/erikkaashoek/Comskip/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain argtable2 ffmpeg"
+PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings."
+PKG_TOOLCHAIN="autotools"
+
+pre_configure_target() {
+  LDFLAGS="$LDFLAGS -ldl"
+
+  export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src"
+  export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2"
+}
+
+make_target() {
+ :
+}

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

@@ -1,17 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="06b9cb3"
-PKG_SHA256="4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a"
-PKG_ARCH="any"
+PKG_VERSION="c4446665cb9c30056f4998ed953e6d4ff22c7c39" # v1.2.0
+PKG_SHA256="0bd3370f769c25f077445b77266a0afba6fe60b9caa443153e604d8727f2a891"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"
-PKG_URL="https://github.com/docker/containerd/archive/${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/containerd/containerd/archive/$PKG_VERSION.tar.gz"
 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."
+PKG_LONGDESC="A daemon to control runC, built for performance and density."
 PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
@@ -40,7 +38,11 @@ pre_make_target() {
   export CGO_ENABLED=1
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
-  export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $CC"
+  # Update CONTAINERD_VERSION if you update the PKG_VERSION
+  export CONTAINERD_VERSION=v1.2.0
+  export CONTAINERD_REVISION=$PKG_VERSION
+  export CONTAINERD_PKG=github.com/containerd/containerd
+  export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC"
   export GOLANG=$TOOLCHAIN/lib/golang/bin/go
   export GOPATH=$PKG_BUILD/.gopath
   export GOROOT=$TOOLCHAIN/lib/golang
@@ -56,6 +58,6 @@ pre_make_target() {
 
 make_target() {
   mkdir -p bin
-  $GOLANG build -v -o bin/containerd      -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd
-  $GOLANG build -v -o bin/containerd-shim -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd-shim
+  $GOLANG build -v -o bin/containerd      -a -tags "static_build no_btrfs" -ldflags "$LDFLAGS" ./cmd/containerd
+  $GOLANG build -v -o bin/containerd-shim -a -tags "static_build no_btrfs" -ldflags "$LDFLAGS" ./cmd/containerd-shim
 }

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

@@ -4,15 +4,12 @@
 PKG_NAME="cxxtools"
 PKG_VERSION="2.2.1"
 PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342"
-PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://www.tntnet.org/cxxtools.html"
 PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="python/web"
-PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
-PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
+PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-unittest"
@@ -23,7 +20,7 @@ post_makeinstall_host() {
 }
 
 post_makeinstall_target() {
-  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/cxxtools-config
+  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/cxxtools-config
 
   rm -rf $INSTALL/usr/bin
 }

packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk

@@ -14,7 +14,7 @@ unpack() {
 }
 
 makeinstall_target() {
-  :
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
 }
 
 post_makeinstall_target() {

packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk

@@ -2,15 +2,13 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="krb5"
-PKG_VERSION="1.16.1-final"
-PKG_SHA256="d46a676bd6cfe58b8684ffd881bc7ed2c9c90cb43ccfa45a9500530e84aa262b"
-PKG_ARCH="any"
+PKG_VERSION="1.16.2-final"
+PKG_SHA256="92f62e5a54404d22aa2a7eee9fba64d1be8d10d8dd3aa052e1799993208acce4"
 PKG_LICENSE="MIT"
 PKG_SITE="http://web.mit.edu/kerberos/"
 PKG_URL="https://github.com/krb5/krb5/archive/krb5-$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="krb5-krb5-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="The Kerberos network authentication protocol"
+PKG_LONGDESC="The Kerberos network authentication protocol."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_regcomp=yes \
@@ -21,3 +19,7 @@ post_unpack() {
   rm -rf $PKG_BUILD/doc
   mv $PKG_BUILD/src/* $PKG_BUILD
 }
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+}

packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk

@@ -4,7 +4,6 @@
 PKG_NAME="lttng-ust"
 PKG_VERSION="2.10.2"
 PKG_SHA256="015452be6f94e4468315d0478cd5a4d01d9e52672bcea122b4ff7426198d5803"
-PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://lttng.org/"
 PKG_URL="https://github.com/lttng/lttng-ust/archive/v$PKG_VERSION.tar.gz"
@@ -13,3 +12,7 @@ PKG_LONGDESC="LTTng is an open source tracing framework for Linux"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages"
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+}

packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk

@@ -4,17 +4,13 @@
 PKG_NAME="userspace-rcu"
 PKG_VERSION="0.10.1"
 PKG_SHA256="4ddbca9927b459b7a295dec612cf43df5886d398161d50c59d0097995e368a3b"
-PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="http://liburcu.org"
 PKG_URL="https://github.com/urcu/userspace-rcu/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="userspace read-copy-update library"
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --enable-static"
-
-pre_configure_target() {
-  CFLAGS="$CFLAGS -fPIC"
-}

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

@@ -2,15 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="blindscan-s2"
-PKG_VERSION="94cb626"
-PKG_SHA256="cea70a7c4f3091530fd3cdf6e79e1c7386928678ef89fa5d937e5092c7cf9522"
-PKG_ARCH="any"
+PKG_VERSION="192eaf0b3eccfb9721b3d49b9010b5c1447776e0"
+PKG_SHA256="c9e5bd07672765b30dac758844e2eb87ab68d5dc6bc731e9df6394159acddcbb"
 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_URL="https://github.com/PLi-metas/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"
 
 makeinstall_target() {

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

@@ -2,15 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bitstream"
-PKG_VERSION="1.3"
-PKG_SHA256="f8a90b0ae517ccb295760317f7809ff097ae220ef75b05b0fc2b813debc4a8b7"
-PKG_ARCH="any"
+PKG_VERSION="1.4"
+PKG_SHA256="b2484940d3b8733bec9dd1ec1731de428261dff31c9f95874264be9dc9ce786b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"
-PKG_URL="http://download.videolan.org/pub/videolan/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="http://download.videolan.org/pub/videolan/bitstream/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="biTStream is a set of C headers allowing a simpler access to binary structures such as specified by MPEG, DVB, IETF, etc."
-PKG_LONGDESC="biTStream is a set of C headers allowing a simpler access to binary structures such as specified by MPEG, DVB, IETF, etc."
+PKG_LONGDESC="biTStream is a set of C headers allowing a simpler access to binary structures such as specified by MPEG, DVB, IETF."
 
 PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"

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

@@ -4,13 +4,11 @@
 PKG_NAME="libev"
 PKG_VERSION="4.24"
 PKG_SHA256="973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://software.schmorp.de/pkg/libev.html"
 PKG_URL="http://dist.schmorp.de/libev/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
-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_LONGDESC="A full-featured and high-performance event loop."
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
+                           --enable-static"

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

@@ -1,18 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvb-apps"
 PKG_VERSION="3d43b280298c"
 PKG_SHA256="70c1d293ea3ddbcb970e01c8a51487ee97a4dcf33a73c0236c7d57757c7f6fb0"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
 PKG_URL="http://linuxtv.org/hg/dvb-apps/archive/${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-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_LONGDESC="Applications for initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC."
 
 pre_make_target() {
   export PERL_USE_UNSAFE_INC=1
 }
+
+makeinstall_target() {
+ :
+}

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

@@ -3,15 +3,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvblast"
-PKG_VERSION="77cfaa8"
-PKG_SHA256="b78eaec73addb328384bf8acb93a1b6a6334f4fa47914f98b91b4cd4fc00b639"
-PKG_ARCH="any"
+PKG_VERSION="acf3844377351ea2949ce1c48dbfde589491013d"
+PKG_SHA256="007d2c93876892bd09c2a520bdce0b04f6469187123bbf24cdcf0d5effec5389"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.videolan.org/projects/dvblast.html"
 PKG_URL="http://repo.or.cz/dvblast.git/snapshot/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain bitstream libev"
-PKG_SECTION="tools"
-PKG_SHORTDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming application"
 PKG_LONGDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming application"
 
 pre_configure_target() {

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

@@ -2,15 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvbsnoop"
-PKG_VERSION="c1ec72f"
-PKG_SHA256="a277434fa78a31493d53a74e2a4f5bbb77e9cc396ec230c64f03e85dc6338e7f"
-PKG_ARCH="any"
+PKG_VERSION="badf61fcdab1177c1162747be06d035a2b671e9b"
+PKG_SHA256="7f0f5d9ca15c5caae3ca249d95a5fc30cececd16f63e00a1404e0d2368ce56fa"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dvbsnoop.sourceforge.net/"
 PKG_URL="https://github.com/persianpros/dvbsnoop/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_TOOLCHAIN="autotools"
 

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

@@ -2,16 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mumudvb"
-PKG_VERSION="a09373d"
-PKG_SHA256="66ef8f11a0e5795cd6408e33581a95de88a76d499e8a0d41f34880295d346efa"
-PKG_ARCH="any"
+PKG_VERSION="6153f87a17a94fbf6e71d710bef39c313302b494"
+PKG_SHA256="4e8dd903d0cba1e798c3921da83b332a9bbb5ad2102f5c1a9699965af6989e28"
 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_TOOLCHAIN="autotools"
 

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

@@ -2,16 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="szap-s2"
-PKG_VERSION="69ff358"
+PKG_VERSION="69ff3584caf9b46f7a551b39b9f9956f8461377c"
 PKG_SHA256="eea8d99d2d5d6403d624acdd9df908a2dd7767dd5469b44e9a281ff863096b32"
-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"
 
 makeinstall_target() {

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

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="t2scan"
+PKG_VERSION="8b9ad91e8685ff80e7c5d924caec83f1ee49ebf3"
+PKG_SHA256="cdfae6232ba1bbc954bd228f9db217d004c07407cf46245816d39f4599e91111"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/mighty-p/t2scan"
+PKG_URL="https://github.com/mighty-p/t2scan/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files."
+
+# aml 3.14 hack
+pre_configure_target() {
+  if [ "$LINUX" = "amlogic-3.14" -o "$LINUX" = "amlogic-3.10" ]; then
+    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
+}
+
+makeinstall_target() {
+  :
+}

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

@@ -2,16 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tune-s2"
-PKG_VERSION="60cc4aa"
+PKG_VERSION="60cc4aaa70b646d38f2e40251860375283c44816"
 PKG_SHA256="e39069a0f2f0930809647052fe1f8c9a13f05af537013b03a99f09ceb9bfb997"
-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"
 
 makeinstall_target() {

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

@@ -4,20 +4,21 @@
 PKG_NAME="w_scan"
 PKG_VERSION="20170107"
 PKG_SHA256="38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="DVBlast is a small channel scan tool to create an channel.conf for VDR"
-PKG_LONGDESC="DVBlast is a small channel scan tool to create an channel.conf for VDR"
+PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files."
 PKG_TOOLCHAIN="autotools"
 
-# aml 3.14 is meh
+# aml 3.14 hack
 pre_configure_target() {
-if [ $LINUX = "amlogic-3.14" -o $LINUX = "amlogic-3.10" ]; then
-  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
+  if [ "$LINUX" = "amlogic-3.14" -o "$LINUX" = "amlogic-3.10" ]; then
+    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
+}
+
+makeinstall_target() {
+  :
 }

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

@@ -2,13 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="imagemagick"
-PKG_VERSION="7.0.8-10"
-PKG_SHA256="119f99e7849805741fbf0a7890bae0b0a6530fdab35dd3f39185b2dddba272f8"
-PKG_ARCH="any"
+PKG_VERSION="7.0.8-11"
+PKG_SHA256="95e4da5fa109bc8b59b5e7a54cdfcf1af3230067c95adf608ff21c08eca1de20"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"
 PKG_SITE="http://www.imagemagick.org/"
 PKG_URL="https://github.com/ImageMagick/ImageMagick/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="ImageMagick-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images"
 
@@ -18,3 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \
                            --with-pango=no \
                            --with-utilities=no \
                            --with-x=no"
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+}

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

@@ -4,14 +4,11 @@
 PKG_NAME="enca"
 PKG_VERSION="1.19"
 PKG_SHA256="3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"
 PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="devel"
-PKG_SHORTDESC="enca: detects the encoding of text files, on the basis of knowledge of their language."
-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_LONGDESC="Enca detects the encoding of text files, on the basis of knowledge of their language."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_MAKEINSTALL_OPTS_TARGET="-C lib"

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

@@ -4,14 +4,11 @@
 PKG_NAME="enet"
 PKG_VERSION="e33ca1d"
 PKG_SHA256="0ba5547de2c4c7fc79d367179a9bc92a7ac27e9258dd50fb277cd8761afaf9b0"
-PKG_ARCH="any"
 PKG_LICENSE=""
 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_LONGDESC="A network communication layer on top of UDP (User Datagram Protocol)."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

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

@@ -4,16 +4,11 @@
 PKG_NAME="enum34"
 PKG_VERSION="1.1.6"
 PKG_SHA256="b09c7f7ee925e600bd4efaa5fef49919eacdbdfd5a52e0696c5d03010cffb9ec"
-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 Python2 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_LONGDESC="Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4."
 PKG_TOOLCHAIN="manual"
 
 make_target() {

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

@@ -5,13 +5,11 @@
 PKG_NAME="faad2"
 PKG_VERSION="2.8.8"
 PKG_SHA256="985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.audiocoding.com"
 PKG_URL="https://downloads.sourceforge.net/sourceforge/faac/faad2-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="audio"
-PKG_LONGDESC="An MPEG-4 AAC decoder"
+PKG_LONGDESC="An MPEG-4 AAC decoder."
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \

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

@@ -4,11 +4,9 @@
 PKG_NAME="fdk-aac"
 PKG_VERSION="0.1.6"
 PKG_SHA256="adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3"
-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_TOOLCHAIN="autotools"

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

@@ -4,14 +4,11 @@
 PKG_NAME="libvpx"
 PKG_VERSION="1.7.0"
 PKG_SHA256="1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238"
-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_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="WebM VP8/VP9 Codec"
 
 configure_target() {
 
@@ -23,13 +20,14 @@ configure_target() {
       PKG_TARGET_NAME_LIBVPX="armv7-linux-gcc"
       ;;
     x86_64)
+      PKG_DEPENDS_TARGET+=" nasm:host"
       PKG_TARGET_NAME_LIBVPX="x86_64-linux-gcc"
       ;;
   esac
 
   $PKG_CONFIGURE_SCRIPT --prefix=/usr \
                         --extra-cflags="$CFLAGS" \
-                        --as=yasm \
+                        --as=nasm \
                         --target=$PKG_TARGET_NAME_LIBVPX \
                         --disable-docs \
                         --disable-examples \

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

@@ -2,32 +2,42 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20180627-2245"
-PKG_SHA256="4fa2bcd818fa0ec197c027b3d38ba587ebc4cfb956c2b24deb37e69a46999daf"
-PKG_ARCH="any"
+PKG_VERSION="545de2ffec6ae9a80738de1b2c8cf820249a2530"
+PKG_SHA256="74725cf7036b2c96387c2c014ef00d181942d00230f21e16277f11d2d9683adc"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
-PKG_URL="https://download.videolan.org/x264/snapshots/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://repo.or.cz/x264.git/snapshot/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
-PKG_LONGDESC="x264"
+PKG_LONGDESC="x264 codec"
+
+if [ "$TARGET_ARCH" = "x86_64" ]; then
+  PKG_DEPENDS_TARGET+=" nasm:host"
+fi
 
 pre_configure_target() {
   cd $PKG_BUILD
   rm -rf .$TARGET_NAME
+
+  if [ "$TARGET_ARCH" = "x86_64" ]; then
+    export AS="$TOOLCHAIN/bin/nasm"
+    PKG_X264_ASM="--enable-asm"
+  else
+    PKG_X264_ASM="--disable-asm"
+  fi
 }
 
 configure_target() {
   ./configure \
-    --prefix="/usr" \
+    --cross-prefix="$TARGET_PREFIX" \
     --extra-cflags="$CFLAGS" \
     --extra-ldflags="$LDFLAGS" \
-    --disable-cli \
-    --enable-static \
-    --enable-strip \
-    --disable-asm \
-    --enable-pic \
     --host="$TARGET_NAME" \
-    --cross-prefix="$TARGET_PREFIX" \
-    --sysroot="$SYSROOT_PREFIX"
+    --prefix="/usr" \
+    --sysroot="$SYSROOT_PREFIX" \
+    $PKG_X264_ASM \
+    --disable-cli \
+    --enable-lto \
+    --enable-pic \
+    --enable-static \
+    --enable-strip
 }

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

@@ -2,15 +2,13 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x265"
-PKG_VERSION="2.8"
-PKG_SHA256="6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863"
+PKG_VERSION="2.9"
+PKG_SHA256="ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.videolan.org/developers/x265.html"
-PKG_URL="http://download.videolan.org/pub/videolan/$PKG_NAME/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
+PKG_URL="http://download.videolan.org/pub/videolan/x265/${PKG_NAME}_${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
 PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library"
 PKG_TOOLCHAIN="make"
 

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

@@ -2,16 +2,13 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="4.0.1"
-PKG_SHA256="cbb7c3ed5b7a669962dfe7c58dc495279274ac259e75770cccf2d2b0115ff5fb"
-PKG_ARCH="any"
+PKG_VERSION="4.1"
+PKG_SHA256="7afb163d6974693cdad742aa1224c33683c50845c67ee5ae35506efc631ac121"
 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 aom 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_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-gold"
 
 # Dependencies
@@ -21,6 +18,10 @@ if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
 fi
 
+if [ "$TARGET_ARCH" = "x86_64" ]; then
+  PKG_DEPENDS_TARGET+=" nasm:host"
+fi
+
 if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvpx"
 fi
@@ -39,10 +40,6 @@ pre_configure_target() {
     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
@@ -177,7 +174,7 @@ configure_target() {
     --enable-openssl \
     \
     `#Advanced options` \
-    $PKG_FFMPEG_ARM_AO \
+    --disable-hardcoded-tables \
 
 }
 

packages/addons/addon-depends/game-tools/bchunk/package.mk

@@ -4,14 +4,11 @@
 PKG_NAME="bchunk"
 PKG_VERSION="1.2.0"
 PKG_SHA256="afdc9d5e38bdd16f0b8b9d9d382b0faee0b1e0494446d686a08b256446f78b5d"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://he.fi/bchunk/"
 PKG_URL="http://he.fi/bchunk/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="system"
-PKG_SHORTDESC="binchunker converts a CD image in a .bin / .cue format (sometimes .raw / .cue) to a set of .iso and .cdr tracks"
-PKG_LONGDESC="binchunker converts a CD image in a .bin / .cue format (sometimes .raw / .cue) to a set of .iso and .cdr tracks"
+PKG_LONGDESC="Tool to convert a CD image in a .bin/.cue format to a set of .iso and .cdr tracks."
 
 makeinstall_target() {
   :

packages/addons/addon-depends/game-tools/ecm-tools/package.mk

@@ -4,14 +4,11 @@
 PKG_NAME="ecm-tools"
 PKG_VERSION="55365b0"
 PKG_SHA256="39c2d0e36b1cba33fa9fee1c0a2a63f851b561fceb59dc99550a1e8e580d3b5a"
-PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/alucryd/ecm-tools"
 PKG_URL="https://github.com/alucryd/ecm-tools/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="system"
-PKG_SHORTDESC="Error Code Modeler"
-PKG_LONGDESC="Error Code Modeler"
+PKG_LONGDESC="Error Code Modeler.s"
 
 makeinstall_target() {
   :

packages/addons/addon-depends/game-tools/iat/package.mk

@@ -4,14 +4,11 @@
 PKG_NAME="iat"
 PKG_VERSION="0.1.7"
 PKG_SHA256="fb72c42f4be18107ec1bff8448bd6fac2a3926a574d4950a4d5120f0012d62ca"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceforge.net/projects/iat.berlios/"
 PKG_URL="https://sourceforge.net/projects/iat.berlios/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="system"
-PKG_SHORTDESC="Iso9660 Analyzer Tool, this tool have engine for detect many structure of image file"
-PKG_LONGDESC="Iso9660 Analyzer Tool, this tool have engine for detect many structure of image file"
+PKG_LONGDESC="Iso9660 Analyzer Tool to detect many structures of image file."
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes"
 

packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk

@@ -4,14 +4,11 @@
 PKG_NAME="linuxconsoletools"
 PKG_VERSION="1.5.1"
 PKG_SHA256="0bd07aacea251d63d3d8a458728c7f965f41ae45891d906cefedc3fde0753b1e"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/linuxconsole/"
 PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="system"
-PKG_SHORTDESC="Set of utilities for joysticks and serial devices"
-PKG_LONGDESC="Set of utilities for joysticks and serial devices"
+PKG_LONGDESC="Set of utilities for joysticks and serial devices."
 
 PKG_MAKE_OPTS_TARGET="SYSTEMD_SUPPORT=0"
 

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

@@ -1,18 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="go"
-PKG_VERSION="1.9.2"
-PKG_SHA256="5fb19c45d5230a7c2380232c9fb5b7e8d6f45015003f63b1485f78c20f96bce4"
-PKG_ARCH="any"
+PKG_VERSION="1.10.5"
+PKG_SHA256="afe38b3c6a91e7e6c2bae0cf7427d1080ed3b7d8c044504400db56c3b72bb082"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
-PKG_SOURCE_DIR="${PKG_NAME}-${PKG_NAME}${PKG_VERSION}"
 PKG_DEPENDS_HOST="toolchain"
-PKG_SECTION="system"
-PKG_SHORTDESC="Go is an open source programming language that makes it easy to build simple, reliable, and efficient software."
-PKG_LONGDESC="Go is an open source programming language that makes it easy to build simple, reliable, and efficient software."
+PKG_LONGDESC="An programming language that makes it easy to build simple, reliable, and efficient software."
 PKG_TOOLCHAIN="manual"
 
 ####################################################################

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libconfuse"
-PKG_VERSION="3.2"
-PKG_SHA256="02593cb4fc83854d8d404b77825acfeeff2832e641bd0d9feb4c05a39163279b"
+PKG_VERSION="3.2.2"
+PKG_SHA256="2cf7e032980aff8f488efba61510dc3fb95e9a4b9183f985dea457a5651b0e2c"
 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

@@ -4,14 +4,11 @@
 PKG_NAME="jasper"
 PKG_VERSION="1.900.1"
 PKG_SHA256="6e9a959bf4f8cb02f77f42d1b9880b8e85d021ac51f43d8787b5438fd2b7a1c5"
-PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libjpeg-turbo"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="jasper: JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1) implementation"
-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_LONGDESC="A implementation of the ISO/IEC 15444-1 also known as JPEG-2000 standard for image compression."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

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

@@ -4,12 +4,11 @@
 PKG_NAME="libugpio"
 PKG_VERSION="0.0.6"
 PKG_SHA256="5093c34cdb891560b0807cb371521cf94fa5c090ee7a84779663b16c831b9e9e"
-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_LONGDESC="A software library to ease the use of linux kernel's sysfs gpio interface from C programs and/or other libraries."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic"
 

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

@@ -5,13 +5,11 @@
 PKG_NAME="serdisplib"
 PKG_VERSION="1.97.9"
 PKG_SHA256="fe82ebe72731e91509083569dfe41a09e21632cc1211cdc4f76274f83ed218fa"
-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_SHORTDESC="serdisplib: a lcd control library"
-PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers"
+PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers."
 
 PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
                            --bindir=$SYSROOT_PREFIX/usr/bin \

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

@@ -4,14 +4,11 @@
 PKG_NAME="libconfig"
 PKG_VERSION="1.5"
 PKG_SHA256="cae5c02361d8a9b2bb26946c64f089d2e5e599972f386203fbc48975c0d885c8"
-PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://hyperrealm.com/libconfig/libconfig.html"
 PKG_URL="https://github.com/hyperrealm/libconfig/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="lib"
-PKG_SHORTDESC="C/C++ Configuration File Library"
-PKG_LONGDESC="C/C++ Configuration File Library"
+PKG_LONGDESC="A C/C++ configuration file library."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \

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

@@ -4,15 +4,12 @@
 PKG_NAME="libdvbcsa"
 PKG_VERSION="aae3d0c"
 PKG_SHA256="2c0b69a5ca70c5032f9375a57bcec449ecdf93b5459f60f087f5fa06c605c7c1"
-PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
 PKG_SITE="https://github.com/glenvt18/libdvbcsa/"
 PKG_URL="https://github.com/glenvt18/libdvbcsa/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="lib"
-PKG_SHORTDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
-PKG_LONGDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+PKG_LONGDESC="A implementation of DVB/CSA, with encryption and decryption capabilities."
 PKG_TOOLCHAIN="autotools"
 # libdvbcsa is a bit faster without LTO, and tests will fail with gcc-5.x
 PKG_BUILD_FLAGS="+pic"

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

@@ -4,11 +4,8 @@
 PKG_NAME="libexif"
 PKG_VERSION="0.6.21"
 PKG_SHA256="16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a"
-PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://sourceforge.net/projects/libexif"
 PKG_URL="http://downloads.sf.net/sourceforge/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="lib"
-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_LONGDESC="A library to parse an EXIF file and read the data from those tags."

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

@@ -4,14 +4,11 @@
 PKG_NAME="libiconv"
 PKG_VERSION="1.15"
 PKG_SHA256="ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
 PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="devel"
-PKG_SHORTDESC="Libiconv converts from one character encoding to another through Unicode conversion."
-PKG_LONGDESC="Libiconv converts from one character encoding to another through Unicode conversion."
+PKG_LONGDESC="A tool that converts from one character encoding to another through Unicode conversion."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--host=$TARGET_NAME \

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

@@ -4,14 +4,11 @@
 PKG_NAME="libid3tag"
 PKG_VERSION="0.15.1b"
 PKG_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
 PKG_URL="$SOURCEFORGE_SRC/mad/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
-PKG_SECTION="audio"
-PKG_SHORTDESC="library for id3 tagging"
-PKG_LONGDESC="library for id3 tagging"
+PKG_LONGDESC="A library for id3 tagging."
 
 PKG_MAINTAINER="Lukas Sabota (LTsmooth42@gmail.com)"
 

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

@@ -4,14 +4,11 @@
 PKG_NAME="libimobiledevice"
 PKG_VERSION="1.2.0"
 PKG_SHA256="786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037"
-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 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"
+PKG_LONGDESC="A cross-platform software library that talks the protocols to support Apple devices."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \

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

@@ -4,14 +4,11 @@
 PKG_NAME="libmad"
 PKG_VERSION="0.15.1b"
 PKG_SHA256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
 PKG_URL="$SOURCEFORGE_SRC/mad/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="audio"
-PKG_SHORTDESC="libmad: MPEG Audio Decoder"
-PKG_LONGDESC="MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as the so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II, and Layer III a.k.a. MP3) are fully implemented."
+PKG_LONGDESC="A high-quality MPEG audio decoder."
 PKG_TOOLCHAIN="autotools"
 
 # package specific configure options

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

@@ -4,9 +4,8 @@
 PKG_NAME="libmpdclient"
 PKG_VERSION="2.14"
 PKG_SHA256="0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372"
-PKG_ARCH="any"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="is a C library which implements the Music Player Daemon protocol"
+PKG_LONGDESC="A C library which implements the Music Player Daemon protocol."

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

@@ -1,17 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libnetwork"
-PKG_VERSION="7b2b1fe"
-PKG_SHA256="2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6"
-PKG_ARCH="any"
+PKG_VERSION="3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b"
+PKG_SHA256="572ce85f2c51a21c1cd55056cf8cb9ef1d447c2de9c82485233be9f851284299"
 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_LONGDESC="A native Go implementation for connecting containers."
 PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
@@ -42,9 +40,16 @@ pre_make_target() {
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-extld $CC"
   export GOLANG=$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$PKG_BUILD.gopath
+  export GOPATH=$PKG_BUILD/.gopath
   export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
+
+  mkdir -p $PKG_BUILD/.gopath
+  if [ -d $PKG_BUILD/vendor ]; then
+    mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
+  fi
+
+  ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/docker/libnetwork
 }
 
 make_target() {