Merge pull request #4398 from flubshi/backport_remove_expired_ca

Remove expired 'AddTrust External Root' ca from trust list; update cacert.pem

.gitignore

@@ -12,6 +12,9 @@
 # mkpkg temp
 mkpkg-temp
 
+# options
+/.libreelec
+
 # private working directory
 /.work/
 

Makefile

@@ -14,9 +14,6 @@ image:
 noobs:
 	./scripts/image noobs
 
-amlpkg:
-	./scripts/image amlpkg
-
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

config/docker/package.mk

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="@NAME@"

config/docker/source/bin/docker

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 name="$(basename $0)"

config/docker/source/default.py

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 import subprocess

config/functions

@@ -10,24 +10,6 @@ die() {
   exit "${2:-1}"
 }
 
-# p1: name of potential function to execute if it exists
-# return 0 if function executed, 1 if not, die if error
-pkg_call() {
-  [ -n "${PKG_NAME}" ] || die "$(print_color CLR_ERROR "FAILURE: Cannot call ${1} package function when package is not known!")"
-
-  if [ "$(type -t ${1})" = "function" ]; then
-    ${1} || die "$(print_color CLR_ERROR "FAILURE: ${1} for package ${PKG_NAME} did not succeed!")"
-  else
-    return 1
-  fi
-}
-
-# p1: name of potential function to execute if it exists
-# return 0 if function executed or not, or die if error
-pkg_call_optional() {
-  pkg_call ${1} || return 0
-}
-
 # return 0 if $2 in space-separated list $1, otherwise return 1
 listcontains() {
   if [ -n "$1" -a -n "$2" ]; then
@@ -147,6 +129,21 @@ build_msg() {
   fi
 }
 
+# prints a warning if the file slated for removal doesn't exist
+# this allows us to continue instead of bailing out with just "rm"
+safe_remove() {
+  local path="$1"
+
+  [ -z "${path}" ] && return 0
+
+  if [ -e "${path}" -o -L "${path}" ]; then
+    rm -r "${path}"
+  elif [ -n "${PKG_NAME}" ]; then
+    print_color CLR_WARNING "safe_remove: path does not exist: [${PKG_NAME}]: ${path}\n"
+  else
+    print_color CLR_WARNING "safe_remove: path does not exist: ${path}\n"
+  fi
+}
 
 ### BUILDSYSTEM HELPERS ###
 # check if a flag is enabled
@@ -178,6 +175,24 @@ flag_enabled() {
   fi
 }
 
+setup_pkg_config_target() {
+  export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
+  export PKG_CONFIG_PATH=""
+  export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
+  export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
+  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+}
+
+setup_pkg_config_host() {
+  export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
+  export PKG_CONFIG_PATH=""
+  export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig"
+  export PKG_CONFIG_SYSROOT_DIR=""
+  unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+  unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
+}
+
 setup_toolchain() {
   if [ "$LTO_SUPPORT" = "yes" ]; then
     if flag_enabled "lto-parallel" "no"; then
@@ -227,11 +242,18 @@ setup_toolchain() {
   fi
 
   # parallel
-  if ! flag_enabled "parallel" "yes"; then
+  if flag_enabled "parallel" "yes"; then
+    NINJA_OPTS="$NINJA_OPTS -j$CONCURRENCY_MAKE_LEVEL"
+    export MAKEFLAGS="-j$CONCURRENCY_MAKE_LEVEL"
+  else
     NINJA_OPTS="$NINJA_OPTS -j1"
     export MAKEFLAGS="-j1"
-  else
-    export MAKEFLAGS="-j$CONCURRENCY_MAKE_LEVEL"
+  fi
+
+  # verbose flag
+  if flag_enabled "verbose" "no"; then
+    NINJA_OPTS="$NINJA_OPTS -v"
+    export MAKEFLAGS="$MAKEFLAGS V=1 VERBOSE=1"
   fi
 
   case "$1" in
@@ -252,12 +274,7 @@ setup_toolchain() {
       export CFLAGS="$TARGET_CFLAGS"
       export CXXFLAGS="$TARGET_CXXFLAGS"
       export LDFLAGS="$TARGET_LDFLAGS"
-      export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
-      export PKG_CONFIG_PATH=""
-      export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
-      export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
-      export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-      export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+      setup_pkg_config_target
       export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -304,18 +321,14 @@ setup_toolchain() {
       export CFLAGS="$HOST_CFLAGS"
       export CXXFLAGS="$HOST_CXXFLAGS"
       export LDFLAGS="$HOST_LDFLAGS"
-      export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
-      export PKG_CONFIG_PATH=""
-      export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig"
-      export PKG_CONFIG_SYSROOT_DIR=""
-      unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-      unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
+      setup_pkg_config_host
       export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN"
       if [ ! -f $CMAKE_CONF ] ; then
         mkdir -p $TOOLCHAIN/etc
         echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
         echo "SET(CMAKE_SYSTEM_VERSION 1)"  >> $CMAKE_CONF
+        echo "SET(CMAKE_SYSTEM_PROCESSOR ${MACHINE_HARDWARE_NAME})" >> $CMAKE_CONF
         echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
@@ -342,16 +355,16 @@ setup_toolchain() {
 }
 
 create_meson_conf() {
-  local endian root
+  local endian root properties
   case "$1" in
-    target|init)    endian="little"
-                    root="$SYSROOT_PREFIX/usr"
+    target|init)    root="$SYSROOT_PREFIX/usr"
                     ;;
-    host|bootstrap) endian="big"
-                    root="$TOOLCHAIN"
+    host|bootstrap) root="$TOOLCHAIN"
                     ;;
   esac
 
+  properties="PKG_MESON_PROPERTIES_${1^^}"
+
   cat > $2 <<EOF
 [binaries]
 c = '$CC'
@@ -365,12 +378,15 @@ llvm-config = '$SYSROOT_PREFIX/usr/bin/llvm-config-host'
 system = 'linux'
 cpu_family = '$TARGET_ARCH'
 cpu = '$TARGET_SUBARCH'
-endian = '$endian'
+endian = 'little'
 
 [properties]
 root = '$root'
 $(python -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))")
 $(python -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
+$(python -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))")
+$(python -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
+${!properties}
 EOF
 }
 
@@ -487,34 +503,45 @@ debug_strip() {
 }
 
 init_package_cache() {
-  local _ANCHOR="@?+?@" DIR
+  local _ANCHOR="@?+?@"
+  local temp_global temp_local
 
   # If the package caches are unset, then populate them
   if [ -z "${_CACHE_PACKAGE_LOCAL}" -o -z "${_CACHE_PACKAGE_GLOBAL}" ]; then
-    _CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
-    _CACHE_PACKAGE_GLOBAL="${BUILD}/.cache_package_global"
-    mkdir -p "${BUILD}"
-    : > "${_CACHE_PACKAGE_LOCAL}"
-    : > "${_CACHE_PACKAGE_GLOBAL}"
+    temp_global="$(mktemp)"
+    temp_local="$(mktemp)"
 
-    # cache project/device folder for a package
-    if [ -n $DEVICE ]; then
-      for DIR in $(find $ROOT/projects/$PROJECT/devices/$DEVICE/packages -type d 2>/dev/null); do
-        [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_LOCAL}"
-      done
+    # cache project/device folder for packages
+    if [ -n "${DEVICE}" ]; then
+      find "${ROOT}/projects/${PROJECT}/devices/${DEVICE}/packages" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_local}"
     fi
 
-    # cache project folder for a package
-    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do
-      [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_LOCAL}"
-    done
+    # cache project folder for packages
+    find "${ROOT}/projects/${PROJECT}/packages" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_local}"
 
     # cache packages folder
-    for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do
-      [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_GLOBAL}"
-    done
+    find "${ROOT}/${PACKAGES}" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_global}"
 
+    _CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
+    _CACHE_PACKAGE_GLOBAL="${BUILD}/.cache_package_global"
     export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
+
+    # overwrite existing cache files only when they are invalid, or not yet created
+    mkdir -p "$(dirname "${_CACHE_PACKAGE_GLOBAL}")"
+    if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then
+      rm "${temp_local}"
+    else
+      mv "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"
+    fi
+    if [ -f "${_CACHE_PACKAGE_GLOBAL}" ] && cmp -s "${temp_global}" "${_CACHE_PACKAGE_GLOBAL}"; then
+      rm "${temp_global}"
+    else
+      mv "${temp_global}" "${_CACHE_PACKAGE_GLOBAL}"
+    fi
+  fi
+
+  if [ -z "${_DEBUG_DEPENDS_LIST+x}" ]; then
+    set_debug_depends
   fi
 }
 
@@ -596,14 +623,14 @@ check_device() {
 
 check_arch() {
   local dashes="===========================" arch_err_msg linux_config_dir
-  if [ -d ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ]; then
+  if [ -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux" ]; then
     linux_config_dir="${PROJECT_DIR}/${PROJECT}/devices/$DEVICE/linux"
   else
     linux_config_dir="${PROJECT_DIR}/${PROJECT}/linux"
   fi
 
-  if [ ! -e $linux_config_dir/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf ] &&
-     ! ls $linux_config_dir/*/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf &>/dev/null; then
+  if [ ! -e "$linux_config_dir/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf" ] &&
+       ! ls "$linux_config_dir/"*/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf &>/dev/null; then
     arch_err_msg="\n $dashes$dashes$dashes"
     arch_err_msg="${arch_err_msg}\n ERROR: Architecture not found, use a valid Architecture"
     arch_err_msg="${arch_err_msg}\n for your project or create a new config"
@@ -679,8 +706,7 @@ do_autoreconf() {
 get_pkg_variable() {
   if [ -n "$1" -a -n "$2" ] ; then
     if [ "$1" != "$PKG_NAME" ]; then
-      cd $ROOT
-      . config/options $1 &>/dev/null
+      source_package "${1}"
     fi
     echo "${!2}"
   fi
@@ -688,7 +714,7 @@ get_pkg_variable() {
 
 # get package's build dir
 get_build_dir() {
-  local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
+  local _PKG_NAME="${1%:*}" _PKG_VERSION="$(get_pkg_version "$1")"
   if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
     echo $BUILD/${_PKG_NAME}-${_PKG_VERSION}
   fi
@@ -734,11 +760,16 @@ get_pkg_directory() {
 }
 
 calculate_stamp() {
-  local stamp
+  local stamp data
+
   stamp="$PKG_DIR $PROJECT_DIR/$PROJECT/patches/$PKG_NAME"
   [ -n "$DEVICE" ] && stamp+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME"
   [ -n "$PKG_NEED_UNPACK" ] && stamp+=" $PKG_NEED_UNPACK"
-  find ${stamp} -exec sha256sum {} \; 2>/dev/null | sed "s/ ${ROOT//\//\\/}\// /" | sort | sha256sum | cut -d" " -f1
+
+  data="$(find ${stamp} -exec sha256sum {} \; 2>/dev/null | sed "s/ ${ROOT//\//\\/}\// /")"
+  [ -n "${PKG_STAMP}" ] && data+=$'\n'"$(echo "${PKG_STAMP}" | sha256sum)"
+
+  echo "${data}" | sort | sha256sum | cut -d" " -f1
 }
 
 target_has_feature() {
@@ -803,6 +834,132 @@ find_dir_path() {
   find_path -d "$1" "$2"
 }
 
+# p1: name of function to test for
+# return 0 if function exists, 1 if not
+pkg_call_exists() {
+  [ "$(type -t ${1})" = "function" ] && return 0 || return 1
+}
+
+# p1: name of function to execute unconditionally
+# testing the exit code value of this function is likely to break set -e fail-on-error behaviour
+pkg_call() {
+  [ -n "${PKG_NAME}" ] || die "$(print_color CLR_ERROR "FAILURE: Cannot call ${1} package function when package is not known!")"
+
+  ${1}
+}
+
+unset_functions() {
+  local target
+
+  unset -f configure_package
+
+  unset -f pre_unpack unpack post_unpack
+  unset -f pre_patch post_patch
+
+  for target in target host init bootstrap; do
+    unset -f pre_build_${target}
+    unset -f pre_configure_${target} configure_${target} post_configure_${target}
+    unset -f pre_make_${target} make_${target} post_make_${target}
+    unset -f pre_makeinstall_${target} makeinstall_${target} post_makeinstall_${target}
+  done
+
+  unset -f pre_install post_install
+
+  unset -f addon
+}
+
+# p1: name of package to be sourced
+source_package() {
+  local opwd="${PWD}"
+
+  # Don't use BUILD_WITH_DEBUG in "global" 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
+
+  reset_pkg_vars
+  unset_functions
+
+  if [ -n "${1}" ]; then
+    [ -f "${1}" ] && PKG_DIR="$(dirname "${1}")" || PKG_DIR="$(get_pkg_directory "${1}")"
+
+    [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
+
+    cd "${ROOT}"
+    . ${PKG_DIR}/package.mk || die "FAILURE: an error occurred while sourcing ${PKG_DIR}/package.mk"
+    cd "${opwd}"
+
+    PKG_SHORTDESC="${PKG_SHORTDESC:-${PKG_NAME} (autogenerated)}"
+    PKG_LONGDESC="${PKG_LONGDESC:-${PKG_NAME} (autogenerated)}"
+
+    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
+
+    if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
+      for _p in ${PKG_DEPENDS_UNPACK}; do
+        PKG_NEED_UNPACK+=" $(get_pkg_directory ${_p})"
+      done
+    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"
+        die
+      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}"
+  fi
+
+  build_with_debug && BUILD_WITH_DEBUG="yes" || BUILD_WITH_DEBUG="no"
+
+  # Late variable binding - allow the package to now evaluate any variables
+  # that we may have initialised after sourcing the package, typically
+  # PKG_BUILD etc.
+  if [ -n "${PKG_NAME}" ]; then
+    if pkg_call_exists configure_package; then
+      pkg_call configure_package
+    fi
+  fi
+}
+
 
 ### KERNEL HELPERS ###
 kernel_path() {
@@ -832,20 +989,26 @@ kernel_config_path() {
              $pkg_linux_dir/config/$config_name \
              ; do
     [[ $cfg =~ /devices//linux/ ]] && continue
-    [ -f "$cfg" ] && echo "$cfg" && break
+    [ -f "$cfg" ] && echo "$cfg" && return
   done
+
+  die "ERROR: Unable to locate kernel config for ${LINUX} - looking for ${config_name}"
 }
 
 kernel_make() {
-  LDFLAGS="" make CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
-    ARCH="$TARGET_KERNEL_ARCH" \
-    HOSTCC="$TOOLCHAIN/bin/host-gcc" \
-    HOSTCXX="$TOOLCHAIN/bin/host-g++" \
-    HOSTCFLAGS="$HOST_CFLAGS" \
-    HOSTLDFLAGS="$HOST_LDFLAGS" \
-    HOSTCXXFLAGS="$HOST_CXXFLAGS" \
-    DEPMOD="$TOOLCHAIN/bin/depmod" \
-    "$@"
+  (
+    setup_pkg_config_host
+
+    LDFLAGS="" make CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
+      ARCH="$TARGET_KERNEL_ARCH" \
+      HOSTCC="$TOOLCHAIN/bin/host-gcc" \
+      HOSTCXX="$TOOLCHAIN/bin/host-g++" \
+      HOSTCFLAGS="$HOST_CFLAGS" \
+      HOSTLDFLAGS="$HOST_LDFLAGS" \
+      HOSTCXXFLAGS="$HOST_CXXFLAGS" \
+      DEPMOD="$TOOLCHAIN/bin/depmod" \
+      "$@"
+  )
 }
 
 # get kernel module dir
@@ -933,6 +1096,7 @@ install_addon_images() {
 
 create_addon_xml() {
   local addon_xml addon_version addon_name provider_name requires requires_addonname requires_addonversion screenshots
+  local tmp_changelog
 
   addon_xml="$1/addon.xml"
 
@@ -956,11 +1120,14 @@ done
   fi
 
   if [ -f $PKG_DIR/changelog.txt ]; then
+    tmp_changelog="$(mktemp)"
+    cat ${PKG_DIR}/changelog.txt | xmlstarlet esc >"${tmp_changelog}"
     sed -e "/@PKG_ADDON_NEWS@/ \
          {
-           r $PKG_DIR/changelog.txt
+           r ${tmp_changelog}
            d
          }" -i "$addon_xml"
+    rm -f "${tmp_changelog}"
   else
     sed -e "s|@PKG_ADDON_NEWS@||g" -i "$addon_xml"
   fi
@@ -990,6 +1157,8 @@ done
 }
 
 install_addon_files() {
+  mkdir -p "$1"
+
   install_addon_source "$1"
   install_addon_images "$1"
   create_addon_xml "$1"
@@ -1025,7 +1194,7 @@ add_user() {
 
   mkdir -p ${INSTALL}/usr/cache
   touch ${INSTALL}/usr/cache/shadow
-  ln -sf /storage/.cache/shadow ${INSTALL}/etc/shadow
+  ln -sf /storage/.cache/shadow ${INSTALL}/etc/shadow 2>/dev/null || true
 
   PASSWORD="$2"
   if [ "$PASSWORD" = "x" ]; then
@@ -1046,7 +1215,7 @@ add_group() {
 }
 
 # Usage: enable_service <unit> [target]
-enable_service () {
+enable_service() {
   local unit="$1"
   local unit_dir="/usr/lib/systemd/system"
   local target="$2"
@@ -1068,6 +1237,185 @@ enable_service () {
   done
 }
 
+
+### MULTI-THREADED FUNCTION HELPERS ###
+# Test MTWITHLOCKS so that these functions are a no-op during non-multithreaded builds.
+
+# Prevent concurrent modifications to a package (unpack) or
+# package:target (install/build).
+#
+# If a package is already locked and the owner is ourselves
+# then assume we already have the required lock.
+pkg_lock() {
+  [ "${MTWITHLOCKS}" != "yes" ] && return 0
+
+  local pkg="$1" task="$2" parent_pkg="$3"
+  local this_job="${MTJOBID}"
+  local lock_job lock_seq lock_task lock_pkg locked=no idwidth
+  local fail_seq
+
+  exec 98>"${THREAD_CONTROL}/locks/${pkg}.${task}"
+  while [ : ]; do
+    read -r lock_job lock_seq lock_task lock_pkg <<<$(cat "${THREAD_CONTROL}/locks/${pkg}.${task}.owner" 2>/dev/null)
+    [ -n "${lock_job}" ] && break
+    flock --wait 1 --exclusive 98 && locked=yes && break
+  done
+
+  if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then
+    [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+    pkg_lock_status "STALLED" "${parent_pkg}" "${task}" "$(printf "waiting on [%0*d] %s %s" ${idwidth} ${lock_job} "${lock_task}" "${lock_pkg}")"
+    flock --exclusive 98
+  fi
+
+  # As we now have the lock, if .failed still exists then a previous process must have failed
+  if [ -f "${THREAD_CONTROL}/locks/${pkg}.${task}.failed" ]; then
+    fail_seq="$(< "${THREAD_CONTROL}/locks/${pkg}.${task}.failed")"
+    print_color CLR_ERROR "FAILURE: ${pkg}.${task}.failed exists, a previous dependency process has failed (seq: ${fail_seq})\n"
+    if [ -d "${THREAD_CONTROL}/logs" ]; then
+cat <<EOF
+
+The following logs for this failure are available:
+  stdout: ${THREAD_CONTROL}/logs/${fail_seq}/stdout
+  stderr: ${THREAD_CONTROL}/logs/${fail_seq}/stderr
+
+EOF
+    fi
+    return 1
+  fi
+
+  pkg_lock_status "LOCKED" "${pkg}" "${task}"
+}
+
+# Log additional information for a locked package.
+pkg_lock_status() {
+  [ "${MTWITHLOCKS}" != "yes" ] && return 0
+
+  local status="$1" pkg="$2" task="$3" msg="$4"
+  local this_job="${MTJOBID}" line idwidth
+
+  [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+
+  (
+    flock --exclusive 94
+
+    printf -v line "%s: <%06d> [%0*d/%0*d] %-7s %-7s %-35s" \
+      "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${idwidth} ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${task}" "${pkg}"
+    [ -n "${msg}" ] && line+=" (${msg})"
+
+    echo "${line}" >>"${THREAD_CONTROL}/history"
+
+    if [ "${DASHBOARD}" != "no" ]; then
+      update_dashboard "${status}" "${pkg}" "${task}" "${msg}"
+    fi
+  ) 94>"${THREAD_CONTROL}/locks/.history"
+
+  if [ "${status}" = "LOCKED" ]; then
+    echo "${PARALLEL_SEQ}" > "${THREAD_CONTROL}/locks/${pkg}.${task}.failed"
+    echo "${this_job} ${PARALLEL_SEQ} ${task} ${pkg}" >"${THREAD_CONTROL}/locks/${pkg}.${task}.owner"
+  elif [ "${status}" = "UNLOCK" ]; then
+    rm "${THREAD_CONTROL}/locks/${pkg}.${task}.owner"
+    rm "${THREAD_CONTROL}/locks/${pkg}.${task}.failed"
+  fi
+
+  return 0
+}
+
+update_dashboard() {
+  [ "${MTWITHLOCKS}" != "yes" ] && return 0
+
+  local status="$1" pkg="$2" task="$3" msg="$4"
+  local line sedline preamble num elapsed projdevarch
+  local boldred boldgreen boldyellow endcolor idwidth
+
+  sedline=$((MTJOBID + 2))
+
+  [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+
+  num=$(< "${THREAD_CONTROL}/status.max")
+  if [ ${num} -lt ${sedline} ]; then
+    echo ${sedline} >"${THREAD_CONTROL}/status.max"
+    for i in $(seq $((num + 1)) ${sedline}); do echo "" >>"${THREAD_CONTROL}/status"; done
+  fi
+
+  num=$(< "${THREAD_CONTROL}/progress.prev")
+  projdevarch="${PROJECT}/"
+  [ -n "${DEVICE}" ] && projdevarch+="${DEVICE}/"
+  projdevarch+="${TARGET_ARCH}"
+  [ -n "${BUILD_SUFFIX}" ] && projdevarch+=", ${BUILD_SUFFIX}"
+  TZ=UTC0 printf -v elapsed "%(%H:%M:%S)T" $(($(date +%s) - MTBUILDSTART))
+  printf -v preamble "%s Dashboard (%s) - %d of %d jobs completed, %s elapsed" "${DISTRONAME}" "${projdevarch}" $((num + 1)) ${MTMAXJOBS} "${elapsed}"
+  printf -v preamble "%b%-105s %s" "\e[2J\e[0;0H" "${preamble//\//\\/}" "$(date "+%Y-%m-%d %H:%M:%S")"
+
+  if [ "${DISABLE_COLORS}" != "yes" ]; then
+    boldred="\e[1;31m"
+    boldgreen="\e[1;32m"
+    boldyellow="\e[1;33m"
+    white="\e[0;37m"
+    endcolor="\e[0m"
+
+    case "${status}" in
+      IDLE)    color="${white}";;
+      STALLED) color="${boldyellow}";;
+      MUTEX/W) color="${boldyellow}";;
+      FAILED ) color="${boldred}";;
+      *)       color="${boldgreen}";;
+    esac
+  fi
+
+  printf -v line "[%0*d\/%0*d] %b%-7s%b %-7s %-35s" ${idwidth} ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status//\//\\/}" "${endcolor}" "${task}" "${pkg}"
+  [ -n "${msg}" ] && line+=" ${msg//\//\\/}"
+
+  sed -e "1s/.*/${preamble}/;${sedline}s/.*/${line}/" -i "${THREAD_CONTROL}/status"
+}
+
+# Thread concurrency helpers to avoid concurrency issues with some code,
+# eg. when Python installs directly into $TOOLCHAIN.
+acquire_exclusive_lock() {
+  [ "${MTWITHLOCKS}" != "yes" ] && return 0
+
+  local pkg="$1" task="$2" lockfile="${3:-global}"
+  local this_job="${MTJOBID}"
+  local lock_job lock_seq lock_task lock_pkg locked=no idwidth
+
+  exec 96>"${THREAD_CONTROL}/locks/.mutex.${lockfile}"
+  while [ : ]; do
+    read -r lock_job lock_seq lock_task lock_pkg <<<$(cat "${THREAD_CONTROL}/locks/.mutex.${lockfile}.owner" 2>/dev/null)
+    [ -n "${lock_job}" ] && break
+    flock --wait 1 --exclusive 96 && locked=yes && break
+  done
+
+  if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then
+    [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+    pkg_lock_status "MUTEX/W" "${pkg}" "${task}" "$(printf "mutex: %s; waiting on [%0*d] %s %s" "${lockfile}" ${idwidth} ${lock_job} "${lock_task}" "${lock_pkg}")"
+    flock --exclusive 96
+  fi
+
+  pkg_lock_status "MUTEX" "${pkg}" "${task}" "mutex: ${lockfile}"
+
+  echo "${this_job} ${PARALLEL_SEQ} ${task} ${pkg}" >"${THREAD_CONTROL}/locks/.mutex.${lockfile}.owner"
+}
+
+release_exclusive_lock() {
+  [ "${MTWITHLOCKS}" != "yes" ] && return 0
+
+  local pkg="$1" task="$2" lockfile="${3:-global}"
+
+  pkg_lock_status "ACTIVE" "${pkg}" "${task}"
+
+  rm "${THREAD_CONTROL}/locks/.mutex.${lockfile}.owner"
+  flock --unlock 96 2>/dev/null
+}
+
+# Execute single command using mutex
+exec_thread_safe() {
+  local result
+  acquire_exclusive_lock "${PKG_NAME:exec}" "execcmd"
+  $@
+  result=$?
+  release_exclusive_lock "${PKG_NAME:exec}" "execcmd"
+  return ${result}
+}
+
 # Use distribution functions if any
 if [ -f "distributions/$DISTRO/config/functions" ]; then
   . distributions/$DISTRO/config/functions

config/graphic

@@ -1,10 +1,10 @@
-if [ "$OPENGL" = no ]; then
+if [ "${OPENGL}" = no ]; then
   OPENGL_SUPPORT="no"
 else
   OPENGL_SUPPORT="yes"
 fi
 
-if [ "$OPENGLES" = no ]; then
+if [ "${OPENGLES}" = no ]; then
   OPENGLES_SUPPORT="no"
 else
   OPENGLES_SUPPORT="yes"
@@ -22,101 +22,109 @@ get_graphicdrivers() {
   VAAPI_SUPPORT="no"
   V4L2_SUPPORT="no"
 
-  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
+  if [ "${GRAPHIC_DRIVERS}" = "all" ]; then
     GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "i915"; then
-    DRI_DRIVERS="$DRI_DRIVERS,i915"
-    XORG_DRIVERS="$XORG_DRIVERS intel"
+  if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
+    GALLIUM_DRIVERS+=" etnaviv imx"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "freedreno"; then
+    GALLIUM_DRIVERS+=" freedreno"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "i915"; then
+    DRI_DRIVERS+=" i915"
+    XORG_DRIVERS+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "i965"; then
-    DRI_DRIVERS="$DRI_DRIVERS,i965"
-    XORG_DRIVERS="$XORG_DRIVERS intel"
+  if listcontains "${GRAPHIC_DRIVERS}" "i965"; then
+    DRI_DRIVERS+=" i965"
+    XORG_DRIVERS+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "nvidia"; then
-    XORG_DRIVERS="$XORG_DRIVERS nvidia"
+  if listcontains "${GRAPHIC_DRIVERS}" "lima"; then
+    GALLIUM_DRIVERS+=" kmsro lima"
+    V4L2_SUPPORT="yes"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
+    XORG_DRIVERS+=" nvidia"
     VDPAU_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "nvidia-legacy"; then
-    XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
+  if listcontains "${GRAPHIC_DRIVERS}" "nvidia-legacy"; then
+    XORG_DRIVERS+=" nvidia-legacy"
     VDPAU_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "r200"; then
-    DRI_DRIVERS="$DRI_DRIVERS,r200"
-    XORG_DRIVERS="$XORG_DRIVERS ati"
+  if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
+    GALLIUM_DRIVERS+=" kmsro panfrost"
+    V4L2_SUPPORT="yes"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "r200"; then
+    DRI_DRIVERS+=" r200"
+    XORG_DRIVERS+=" ati"
     COMPOSITE_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "r300"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
-    XORG_DRIVERS="$XORG_DRIVERS ati"
+  if listcontains "${GRAPHIC_DRIVERS}" "r300"; then
+    GALLIUM_DRIVERS+=" r300"
+    XORG_DRIVERS+=" ati"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
     VDPAU_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "r600"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
-    XORG_DRIVERS="$XORG_DRIVERS ati"
+  if listcontains "${GRAPHIC_DRIVERS}" "r600"; then
+    GALLIUM_DRIVERS+=" r600"
+    XORG_DRIVERS+=" ati"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
     VDPAU_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "radeonsi"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
-    XORG_DRIVERS="$XORG_DRIVERS ati amdgpu"
+  if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
+    GALLIUM_DRIVERS+=" radeonsi"
+    XORG_DRIVERS+=" ati amdgpu"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
     VDPAU_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "vmware"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
-    XORG_DRIVERS="$XORG_DRIVERS vmware"
+  if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
+    GALLIUM_DRIVERS+=" vc4 v3d kmsro"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "virtio"; then
+    GALLIUM_DRIVERS+=" virgl"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "vmware"; then
+    GALLIUM_DRIVERS+=" svga"
+    XORG_DRIVERS+=" vmware"
     COMPOSITE_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "virtio"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,virgl"
-  fi
-
-  if listcontains "$GRAPHIC_DRIVERS" "vc4"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
-  fi
-
-  if listcontains "$GRAPHIC_DRIVERS" "freedreno"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,freedreno"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
-  fi
-
-  if listcontains "$GRAPHIC_DRIVERS" "etnaviv"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,etnaviv,imx"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
-  fi
-
-  # remove leading comma if present
-  [[ $GALLIUM_DRIVERS =~ ^, ]] && GALLIUM_DRIVERS="${GALLIUM_DRIVERS:1}"
-  [[ $DRI_DRIVERS =~ ^, ]] && DRI_DRIVERS="${DRI_DRIVERS:1}"
-
   # remove duplicate entries
-  XORG_DRIVERS="$(echo $XORG_DRIVERS | xargs -n1 | sort -u | xargs)"
+  GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  DRI_DRIVERS="$(echo ${DRI_DRIVERS} | xargs -n1 | sort -u | xargs)"
 }

config/multithread

@@ -0,0 +1,165 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+THREADCOUNT=${THREADCOUNT:-100%}
+
+# This function is passed a list of package.mk paths to be processed.
+# Each package.mk is sourced with relevant variables output in JSON format.
+json_worker() {
+  local packages="$@"
+  local pkgpath hierarchy exited
+
+  exit() { exited=1; }
+
+  . config/options ""
+
+  for pkgpath in ${packages}; do
+    pkgpath="${pkgpath%%@*}"
+
+    exited=0
+    if ! source_package "${pkgpath}/package.mk" &>/dev/null; then
+      unset -f exit
+      die "$(print_color CLR_ERROR "FAILURE: sourcing package ${pkgpath}/package.mk")"
+    fi
+
+    [ ${exited} -eq 1 ] && continue
+
+    [[ ${pkgpath} =~ ^${ROOT}/${PACKAGES}/ ]] && hierarchy="global" || hierarchy="local"
+
+    cat <<EOF
+  {
+    "name": "${PKG_NAME}",
+    "hierarchy": "${hierarchy}",
+    "section": "${PKG_SECTION}",
+    "bootstrap": "${PKG_DEPENDS_BOOTSTRAP}",
+    "init": "${PKG_DEPENDS_INIT}",
+    "host": "${PKG_DEPENDS_HOST}",
+    "target": "${PKG_DEPENDS_TARGET}"
+  },
+EOF
+  done
+}
+export -f json_worker
+
+# This function is passed the build instruction for a single job.
+# The function will run either "build <package>" or "install <package>".
+# ${slot} is the job slot number, ie. 1-8 when THREADCOUNT=8.
+# ${job} is the sequence within the total number of ${jobs}.
+package_worker() {
+  local slot=$1 job=$2 jobs=$3 args="$4"
+  local task pkgname result status
+  local addon istarget isaddon
+
+  export MTJOBID=${slot} MTMAXJOBS=${jobs}
+
+  read -r task pkgname <<< "${args}"
+
+  . config/options "${pkgname}"
+
+  [ ! -f "${THREAD_CONTROL}/parallel.pid" ] && echo "${PARALLEL_PID}" >"${THREAD_CONTROL}/parallel.pid"
+
+  ${SCRIPTS}/${task} ${pkgname} 2>&1 && result=0 || result=1
+
+  [[ ${pkgname} =~ :target$ || "${pkgname//:/}" = "${pkgname}" ]] && istarget="yes" || istarget="no"
+
+  [[ "${MTADDONBUILD}" = "yes" && ( "${PKG_IS_ADDON}" = "yes" || "${PKG_IS_ADDON}" = "embedded" ) ]] && isaddon="yes" || isaddon="no"
+
+  if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then
+    if [ ${result} -eq 0 ]; then
+      ${SCRIPTS}/install_addon ${pkgname} 2>&1 && result=0 || result=1
+    fi
+
+    if [ ${result} -ne 0 ]; then
+      if [ -d "${THREAD_CONTROL}/logs" ]; then
+        echo "${PKG_NAME} ${THREAD_CONTROL}/logs/${job}/stdout" >>"${THREAD_CONTROL}/addons.failed"
+      else
+        echo "${PKG_NAME}" >>"${THREAD_CONTROL}/addons.failed"
+      fi
+    fi
+  fi
+
+  (
+    flock --exclusive 95
+    [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
+    num=$(< "${THREAD_CONTROL}/progress")
+    mv "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev"
+    num=$((num + 1))
+    echo ${num} >"${THREAD_CONTROL}/progress"
+    printf "[%0*d/%0*d] [%-4s] %-7s %s\n" ${#jobs} ${num} ${#jobs} ${jobs} "${status}" "${task}" "${pkgname}" >&2
+  ) 95>"${THREAD_CONTROL}/locks/.progress"
+
+  if [ ${result} -eq 0 ]; then
+    pkg_lock_status "IDLE"
+  else
+    pkg_lock_status "FAILED" "${pkgname}" "${task}"
+
+    print_color CLR_ERROR "FAILURE: $SCRIPTS/${task} ${pkgname} has failed!\n"
+
+    if [ -d "${THREAD_CONTROL}/logs" ]; then
+      cat >&2 <<EOF
+
+The following logs for this failure are available:
+  stdout: ${THREAD_CONTROL}/logs/${job}/stdout
+  stderr: ${THREAD_CONTROL}/logs/${job}/stderr
+
+EOF
+    fi
+  fi
+
+  return ${result}
+}
+export -f package_worker
+
+start_multithread_build() {
+  local singlethread buildopts result=0
+
+  # init thread control folder
+  rm -rf "${THREAD_CONTROL}"
+  mkdir -p "${THREAD_CONTROL}/locks"
+  echo -1 >"${THREAD_CONTROL}/progress.prev"
+  echo 0 >"${THREAD_CONTROL}/progress"
+  echo 0 >"${THREAD_CONTROL}/status.max"
+  touch "${THREAD_CONTROL}/status"
+
+  # Increase file descriptors if building one thread/package
+  [ "${THREADCOUNT}" = "0" ] && ulimit -n ${ULIMITN:-10240}
+
+  # Bootstrap GNU parallel
+  MTWITHLOCKS=no $SCRIPTS/build parallel:host 2>&1 || die "Unable to bootstrap parallel package"
+
+  # determine number of available slots for the given THREADCOUNT - optimise logging for single threaded builds
+  [ $(seq 1 32 | ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-procs ${THREADCOUNT} echo {%} | sort -n | tail -1) -eq 1 ] && singlethread=yes || singlethread=no
+
+  # create a single log file by default for a single threaded build (or the builder is a masochist)
+  if [ "${singlethread}" = "yes" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
+    buildopts+=" --ungroup"
+  else
+    mkdir -p "${THREAD_CONTROL}/logs"
+    buildopts+=" --group --results ${THREAD_CONTROL}/logs/{#}/"
+  fi
+
+  # When building addons, don't halt on error - keep building all packages/addons
+  [ "${MTADDONBUILD}" = "yes" ] && buildopts+=" --halt never" || buildopts+=" --halt now,fail=1"
+
+  # pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
+  set -o pipefail
+
+  cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
+    ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-args 30 --halt now,fail=1 json_worker | \
+    ${SCRIPTS}/genbuildplan.py --no-reorder --show-wants --build ${@} > "${THREAD_CONTROL}"/plan || result=1
+
+  if [ ${result} -eq 0 ]; then
+    save_build_config
+
+    cat "${THREAD_CONTROL}"/plan | awk '{print $1 " " $2}' | \
+      MTBUILDSTART=$(date +%s) MTWITHLOCKS=yes ${TOOLCHAIN}/bin/parallel \
+        --plain --no-notice --max-procs ${THREADCOUNT} --joblog="${THREAD_CONTROL}/joblog" --plus ${buildopts} \
+        package_worker {%} {#} {##} {} || result=1
+
+    rm -f "${THREAD_CONTROL}/parallel.pid"
+  fi
+
+  set +o pipefail
+
+  return ${result}
+}

config/noobs/os.json

@@ -6,6 +6,6 @@
   "description": "@DESCRIPTION@",
   "username": "root",
   "password": "@ROOT_PASSWORD@",
-  "supported_models": [@NOOBS_SUPPORTED_MODELS@],
-  "supported_hex_revisions": "@NOOBS_HEX@"
+  "supported_hex_revisions": "@NOOBS_HEX@",
+  "supported_models": [@NOOBS_SUPPORTED_MODELS@]
 }

config/optimize

@@ -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

@@ -4,6 +4,14 @@ if [[ "${EUID}" -eq 0 ]]; then
   exit 1
 fi
 
+# Spaces in paths are verboten
+if [[ ${PWD} =~ [[:space:]] ]]; then
+  echo "Current PWD: \"${PWD}\"" 1>&2
+  echo 1>&2
+  echo "Building in a folder that includes spaces is NOT supported. Use a folder without spaces." 1>&2
+  exit 1
+fi
+
 # set default language for buildsystem
 export LC_ALL=C
 
@@ -78,7 +86,12 @@ VERBOSE="${VERBOSE:-yes}"
 # directory.
 CCACHE_CACHE_SIZE="10G"
 
-# read options from $HOME if available
+# read local persistent options from $ROOT if available
+if [ -f "${ROOT}/.libreelec/options" ]; then
+  . "${ROOT}/.libreelec/options"
+fi
+
+# read global persistent options from $HOME if available
 if [ -f "${HOME}/.libreelec/options" ]; then
   . "${HOME}/.libreelec/options"
 fi
@@ -88,9 +101,15 @@ if [ "${OEM}" = "yes" -o "${OEM}" = "no" ]; then
   OEM_SUPPORT="${OEM}"
 fi
 
-[ -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)
@@ -26,6 +29,8 @@ if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
 fi
 
+THREAD_CONTROL=${BUILD}/.threads
+
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"
 STAMPS_NOARCH=.stamps
@@ -37,12 +42,12 @@ SYSROOT_PREFIX=$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
 TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
 
-# use linaro toolchain on 64/32 split builds
-if [ -z "$KERNEL_LINARO_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  KERNEL_LINARO_TOOLCHAIN="aarch64-linux-gnu"
+# use ARM toolchain on 64/32 split builds
+if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
+  KERNEL_TOOLCHAIN="aarch64-linux-gnu"
 fi
-if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then
-  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_LINARO_TOOLCHAIN/bin/$KERNEL_LINARO_TOOLCHAIN-
+if [ -n "$KERNEL_TOOLCHAIN" ]; then
+  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN-
 else
   TARGET_KERNEL_PREFIX=$TARGET_PREFIX
 fi
@@ -57,80 +62,6 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
 . config/sources
 
 MAKE="$TOOLCHAIN/bin/make"
-MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
-
-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
@@ -151,21 +82,20 @@ fi
 
 VERSION_SUFFIX=$TARGET_ARCH
 
+# redirect formatted output
+export BUILD_INDENT_SIZE=4
 SILENT_OUT=3
 VERBOSE_OUT=4
+
 if [ "$VERBOSE" = yes ]; then
   exec 3>&1
-  exec 4>&2
+  exec 4>&1
 else
   exec 3>&2
   exec 4>/dev/null
 fi
-BUILD_INDENT_SIZE=4
 
-# 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
-  pkg_call_optional configure_package
-fi
+unset LD_LIBRARY_PATH
 
 # multilib? nah
 unset CONFIG_SITE

config/show_config

@@ -53,7 +53,6 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT"
-  config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
   config_message="$config_message\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"
   config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
@@ -96,6 +95,7 @@ show_config() {
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
+  config_message="$config_message\n - WireGuard support:\t\t\t $WIREGUARD_SUPPORT"
 
   # OS configuration
 
@@ -105,10 +105,6 @@ show_config() {
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  if [ "$BOOTLOADER" = "u-boot" ]; then
-    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
-    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
-  fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
   for config_package in $ADDITIONAL_PACKAGES; do

distributions/LibreELEC/options

@@ -115,6 +115,9 @@
 # build and install OpenVPN support (yes / no)
   OPENVPN_SUPPORT="yes"
 
+# build and install WireGuard support (yes / no)
+  WIREGUARD_SUPPORT="yes"
+
 # build and install diskmounter support (udevil)
 # this service provide auto mounting support for external drives in the
 # mediacenter also automount internally drives at boottime via udev (yes / no)
@@ -140,9 +143,6 @@
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
 
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="yes"
-
 # build and install Joystick support (yes / no)
   JOYSTICK_SUPPORT="yes"
 
@@ -225,3 +225,5 @@
 # IR remote keymaps supported in default config
   IR_REMOTE_KEYMAPS="rc6_mce xbox_360 xbox_one"
 
+# debug tty path
+  DEBUG_TTY="/dev/tty3"

distributions/LibreELEC/version

@@ -2,7 +2,7 @@
   LIBREELEC_VERSION="devel"
 
 # OS_VERSION: OS Version
-  OS_VERSION="9.0"
+  OS_VERSION="9.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="9.0"
+  ADDON_VERSION="9.2.0"

licenses/LibPNG2.txt

@@ -4,8 +4,8 @@ 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) 1995-2019 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2019 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.
@@ -13,7 +13,7 @@ PNG Reference Library License version 2
 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
+non-infringement.  In no event 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
@@ -39,7 +39,7 @@ subject to the following restrictions:
 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
+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

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_ADS1x15"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_ADXL345"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_BMP"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_CharLCD"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_DHT"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_GPIO"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_LED_Backpack"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_LSM303"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_MCP3008"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_MCP4725"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_PCA9685"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_PureIO"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_SI1145"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_SSD1306"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_TCS34725"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_VCNL40xx"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="Adafruit_Python_WS2801"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="argtable2"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bash"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libXcomposite)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libXcomposite"
 PKG_LONGDESC="libXcomposite for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXcomposite"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libXdamage)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libXdamage"
 PKG_LONGDESC="libXdamage for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXdamage"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libXfixes)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libXfixes"
 PKG_LONGDESC="libXfixes for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXfixes"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libXi)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libXi"
 PKG_LONGDESC="libXi for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXi"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libXrender)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libXrender"
 PKG_LONGDESC="libXrender for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXrender"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libXtst)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libXtst"
 PKG_LONGDESC="libXtst for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXtst"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory libxcb)/package.mk
@@ -6,16 +6,17 @@
 PKG_NAME="chrome-libxcb"
 PKG_LONGDESC="libxcb for chrome"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libxcb"
+
+PKG_CONFIGURE_OPTS_TARGET="$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

@@ -12,11 +12,6 @@ PKG_DEPENDS_TARGET="toolchain openssl zlib"
 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 \
@@ -24,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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gdk-pixbuf"
-PKG_VERSION="2.36.12"
-PKG_SHA256="fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334"
+PKG_VERSION="2.38.0"
+PKG_SHA256="dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47"
 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

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gtk3"
-PKG_VERSION="3.22.30"
-PKG_SHA256="a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567"
+PKG_VERSION="3.24.4"
+PKG_SHA256="d84f59ff02a87cc90c9df4a572a13eca4e3506e2bf511e2b9cbdb4526fa0cb9c"
 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"
@@ -25,8 +25,9 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-cups \
 
 pre_configure_target() {
   LIBS="$LIBS -lXcursor"
-  export PKG_CONFIG_PATH="$(get_build_dir pango)/.$TARGET_NAME"
-  export CFLAGS="$CFLAGS -I$(get_build_dir pango) -L$(get_build_dir pango)/.$TARGET_NAME/pango"
+  export PKG_CONFIG_PATH="$(get_build_dir pango)/.$TARGET_NAME/meson-private:$(get_build_dir gdk-pixbuf)/.$TARGET_NAME/meson-private:$(get_build_dir shared-mime-info)/.$TARGET_NAME"
+  export CFLAGS="$CFLAGS -I$(get_build_dir pango) -I$(get_build_dir pango)/.$TARGET_NAME -L$(get_build_dir pango)/.$TARGET_NAME/pango"
+  export GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_MKENUMS=glib-mkenums GLIB_GENMARSHAL=glib-genmarshal
 }
 
 makeinstall_target() {

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="icu"
@@ -7,6 +7,7 @@ PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
 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_DEPENDS_HOST="gcc:host"
 PKG_DEPENDS_TARGET="toolchain icu:host"
 PKG_LONGDESC="International Components for Unicode library."
 
@@ -18,15 +19,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/libxss/package.mk

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libxss"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pango"
-PKG_VERSION="1.42.1"
-PKG_SHA256="915a6756b298578ff27c7a6393f8c2e62e6e382f9411f2504d7af1a13c7bce32"
+PKG_VERSION="1.43.0"
+PKG_SHA256="d2c0c253a5328a0eccb00cdd66ce2c8713fabd2c9836000b6e22a8b06ba3ddd2"
 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/shared-mime-info/package.mk

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="shared-mime-info"
@@ -7,7 +7,7 @@ PKG_SHA256="5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83"
 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"
-PKG_DEPENDS_TARGET="toolchain libxml2"
+PKG_DEPENDS_TARGET="toolchain glib libxml2"
 PKG_LONGDESC="The shared-mime-info package contains the core database of common types."
 PKG_BUILD_FLAGS="-parallel"
 

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="unclutter"

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

@@ -1,18 +1,18 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="comskip"
-PKG_VERSION="6030aa0d3b589161ec96c6c986c48aa826fb9f72"
-PKG_SHA256="df0b4b0354aef5acc17e4e94a20a396fa69c474af7579c94aad09dd490e0ee38"
+PKG_VERSION="84fcd7388394c95fc8a7e558642bbadb43134507"
+PKG_SHA256="4d45d30335ce1c28fb4de8865ada57f81de18d83a77950e9ab7c3ea26d24a883"
 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_DEPENDS_TARGET="toolchain argtable2 ffmpeg gnutls"
 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"
+  LDFLAGS+=" -ldl"
 
   export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src"
   export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2"

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

@@ -3,24 +3,24 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="c4446665cb9c30056f4998ed953e6d4ff22c7c39" # v1.2.0
-PKG_SHA256="0bd3370f769c25f077445b77266a0afba6fe60b9caa443153e604d8727f2a891"
+PKG_VERSION="1.2.7"
+PKG_SHA256="7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"
-PKG_URL="https://github.com/containerd/containerd/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_LONGDESC="A daemon to control runC, built for performance and density."
 PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
-  case $TARGET_ARCH in
+  case ${TARGET_ARCH} in
     x86_64)
       export GOARCH=amd64
       ;;
     arm)
       export GOARCH=arm
 
-      case $TARGET_CPU in
+      case ${TARGET_CPU} in
         arm1176jzf-s)
           export GOARM=6
           ;;
@@ -37,27 +37,26 @@ pre_make_target() {
   export GOOS=linux
   export CGO_ENABLED=1
   export CGO_NO_EMULATION=1
-  export CGO_CFLAGS=$CFLAGS
-  # Update CONTAINERD_VERSION if you update the PKG_VERSION
-  export CONTAINERD_VERSION=v1.2.0
-  export CONTAINERD_REVISION=$PKG_VERSION
+  export CGO_CFLAGS=${CFLAGS}
+  export CONTAINERD_VERSION=v${PKG_VERSION}
+  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
-  export PATH=$PATH:$GOROOT/bin
+  export GOLANG=${TOOLCHAIN}/lib/golang/bin/go
+  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
+  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/containerd/containerd
+  ln -fs ${PKG_BUILD} ${PKG_BUILD}/.gopath/src/github.com/containerd/containerd
 }
 
 make_target() {
   mkdir -p bin
-  $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
+  ${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

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cxxtools"
 PKG_VERSION="2.2.1"
@@ -7,8 +8,8 @@ PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342"
 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_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_TARGET="toolchain cxxtools:host"
 PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes."
 PKG_BUILD_FLAGS="+pic"
 

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

@@ -1,10 +1,11 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 . $(get_pkg_directory curl)/package.mk
 
 PKG_NAME="curl3"
 PKG_URL=""
+PKG_DEPENDS_UNPACK+=" curl"
 PKG_LONGDESC="curl for dotnet"
 
 unpack() {

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="krb5"
-PKG_VERSION="1.16.2-final"
-PKG_SHA256="92f62e5a54404d22aa2a7eee9fba64d1be8d10d8dd3aa052e1799993208acce4"
+PKG_VERSION="1.18.1-final"
+PKG_SHA256="5d11bfcc8151a8a752177636e10cdcc6ace88407662949b5f031dd44ec42ffc7"
 PKG_LICENSE="MIT"
 PKG_SITE="http://web.mit.edu/kerberos/"
 PKG_URL="https://github.com/krb5/krb5/archive/krb5-$PKG_VERSION.tar.gz"

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="lttng-ust"
-PKG_VERSION="2.10.2"
-PKG_SHA256="015452be6f94e4468315d0478cd5a4d01d9e52672bcea122b4ff7426198d5803"
+PKG_VERSION="2.12.0"
+PKG_SHA256="ae9a7c7a9730deabacc6c690dcf1ba1c988f7f474326ba33d30b3f339d27a059"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://lttng.org/"
 PKG_URL="https://github.com/lttng/lttng-ust/archive/v$PKG_VERSION.tar.gz"
@@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain userspace-rcu"
 PKG_LONGDESC="LTTng is an open source tracing framework for Linux"
 PKG_TOOLCHAIN="autotools"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages"
+PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages --disable-numa"
 
 makeinstall_target() {
   make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="userspace-rcu"
-PKG_VERSION="0.10.1"
-PKG_SHA256="4ddbca9927b459b7a295dec612cf43df5886d398161d50c59d0097995e368a3b"
+PKG_VERSION="0.12.0"
+PKG_SHA256="6b0cdee07a651c56daea8d03285f379afab898ebc83c785a23927320e45a3012"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="http://liburcu.org"
 PKG_URL="https://github.com/urcu/userspace-rcu/archive/v$PKG_VERSION.tar.gz"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="blindscan-s2"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bitstream"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libev"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvbsnoop"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mumudvb"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="szap-s2"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="t2scan"
@@ -10,14 +10,6 @@ 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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tune-s2"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="w_scan"
@@ -11,14 +11,6 @@ PKG_DEPENDS_TARGET="toolchain"
 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 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/emby-depends/imagemagick/package.mk

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="imagemagick"
-PKG_VERSION="7.0.8-11"
-PKG_SHA256="95e4da5fa109bc8b59b5e7a54cdfcf1af3230067c95adf608ff21c08eca1de20"
+PKG_VERSION="7.0.10-9"
+PKG_SHA256="ea08c7379b0ce40217656699e664d51a93eac819dde778f50ca457b110ffc5e3"
 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"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="enet"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="enum34"

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

@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="fdk-aac"
-PKG_VERSION="0.1.6"
-PKG_SHA256="adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3"
-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_LONGDESC="A standalone library of the Fraunhofer FDK AAC code from Android."
-PKG_TOOLCHAIN="autotools"

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

@@ -1,15 +1,19 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libvpx"
-PKG_VERSION="1.7.0"
-PKG_SHA256="1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238"
+PKG_VERSION="1.8.1"
+PKG_SHA256="df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e"
 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"
 PKG_LONGDESC="WebM VP8/VP9 Codec"
 
+if [ "$TARGET_ARCH" = "x86_64" ]; then
+  PKG_DEPENDS_TARGET+=" nasm:host"
+fi
+
 configure_target() {
 
   case $ARCH in
@@ -20,7 +24,6 @@ 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

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x264"
-PKG_VERSION="545de2ffec6ae9a80738de1b2c8cf820249a2530"
-PKG_SHA256="74725cf7036b2c96387c2c014ef00d181942d00230f21e16277f11d2d9683adc"
+PKG_VERSION="d4099dd4c722f52c4f3c14575d7d39eb8fadb97f"
+PKG_SHA256="9b6688b81e13cf342fc9b6b7adf1759eebd300c243c0707566ffe7ea9f0ccc7e"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
 PKG_URL="http://repo.or.cz/x264.git/snapshot/$PKG_VERSION.tar.gz"
@@ -20,7 +20,6 @@ pre_configure_target() {
 
   if [ "$TARGET_ARCH" = "x86_64" ]; then
     export AS="$TOOLCHAIN/bin/nasm"
-    PKG_X264_ASM="--enable-asm"
   else
     PKG_X264_ASM="--disable-asm"
   fi

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x265"
-PKG_VERSION="2.9"
-PKG_SHA256="ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024"
+PKG_VERSION="3.2"
+PKG_SHA256="364d79bcd56116a9e070fdeb1d9d2aaef1a786b4970163fb56ff0991a183133b"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.videolan.org/developers/x265.html"

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

@@ -1,13 +1,13 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="4.1"
-PKG_SHA256="7afb163d6974693cdad742aa1224c33683c50845c67ee5ae35506efc631ac121"
+PKG_VERSION="4.2.1"
+PKG_SHA256="cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
-PKG_URL="https://github.com/FFmpeg/FFmpeg/archive/n${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain aom bzip2 fdk-aac libvorbis openssl opus x264 x265 zlib"
+PKG_URL="https://ffmpeg.org/releases/ffmpeg-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-gold"
 
@@ -19,7 +19,7 @@ if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
 fi
 
 if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET+=" nasm:host"
+  PKG_DEPENDS_TARGET+=" nasm:host intel-vaapi-driver x265"
 fi
 
 if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then
@@ -35,8 +35,13 @@ pre_configure_target() {
   cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
+  # pass gnutls to build
+  PKG_CONFIG_PATH="$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/pkgconfig"
+  CFLAGS="$CFLAGS -I$(get_build_dir gnutls)/.INSTALL_PKG/usr/include"
+  LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"
+
   if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
-    CFLAGS="-DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux $CFLAGS"
+    CFLAGS="$CFLAGS -DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL"
     PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
   fi
 
@@ -61,14 +66,14 @@ pre_configure_target() {
   if [[ "$TARGET_ARCH" = "x86_64" ]]; then
     PKG_FFMPEG_HW_ENCODERS_GENERIC="\
     `#Video encoders` \
-    --enable-encoder=h264_nvenc \
     --enable-encoder=h264_vaapi \
-    --enable-encoder=hevc_nvenc \
     --enable-encoder=hevc_vaapi \
     --enable-encoder=mjpeg_vaapi \
     --enable-encoder=mpeg2_vaapi \
     --enable-encoder=vp8_vaapi \
     --enable-encoder=vp9_vaapi \
+    --disable-encoder=h264_nvenc \
+    --disable-encoder=hevc_nvenc \
     \
     `#Video hwaccel` \
     --enable-hwaccel=h263_vaapi \
@@ -97,10 +102,9 @@ pre_configure_target() {
     --enable-encoder=libaom_av1 \
     \
     `#Audio encoders` \
+    --enable-encoder=aac \
     --enable-encoder=ac3 \
     --enable-encoder=eac3 \
-    --enable-libfdk-aac \
-    --enable-encoder=libfdk-aac \
     --enable-encoder=flac \
     --enable-libmp3lame \
     --enable-encoder=libmp3lame \
@@ -134,7 +138,6 @@ configure_target() {
     \
     `#Licensing options` \
     --enable-gpl \
-    --enable-nonfree \
     \
     `#Documentation options` \
     --disable-doc \
@@ -171,7 +174,8 @@ configure_target() {
     --extra-ldflags="$LDFLAGS" \
     --extra-libs="$PKG_FFMPEG_LIBS" \
     --enable-pic \
-    --enable-openssl \
+    --enable-gnutls \
+    --disable-openssl \
     \
     `#Advanced options` \
     --disable-hardcoded-tables \

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bchunk"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ecm-tools"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="iat"

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="linuxconsoletools"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="go"
-PKG_VERSION="1.10.5"
-PKG_SHA256="afe38b3c6a91e7e6c2bae0cf7427d1080ed3b7d8c044504400db56c3b72bb082"
+PKG_VERSION="1.12.6"
+PKG_SHA256="d61ff8fa5685b911653c8153de6e6501728ec3aee26a9d5a56880bab3120426b"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
@@ -21,7 +21,7 @@ PKG_TOOLCHAIN="manual"
 
 configure_host() {
   export GOOS=linux
-  export GOROOT_FINAL=$TOOLCHAIN/lib/golang
+  export GOROOT_FINAL=${TOOLCHAIN}/lib/golang
   if [ -x /usr/lib/go/bin/go ]; then
     export GOROOT_BOOTSTRAP=/usr/lib/go
   else
@@ -31,16 +31,16 @@ configure_host() {
 }
 
 make_host() {
-  cd $PKG_BUILD/src
+  cd ${PKG_BUILD}/src
   bash make.bash --no-banner
 }
 
 pre_makeinstall_host() {
   # need to cleanup old golang version when updating to a new version
-  rm -rf $TOOLCHAIN/lib/golang
+  rm -rf ${TOOLCHAIN}/lib/golang
 }
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/golang
-  cp -av $PKG_BUILD/* $TOOLCHAIN/lib/golang/
+  mkdir -p ${TOOLCHAIN}/lib/golang
+  cp -av ${PKG_BUILD}/* ${TOOLCHAIN}/lib/golang/
 }

packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch

@@ -1,11 +1,10 @@
-diff -Naur go-1.9.2.orig/src/crypto/x509/root_unix.go go-1.9.2/src/crypto/x509/root_unix.go
---- go-1.9.2.orig/src/crypto/x509/root_unix.go	2017-11-03 14:58:53.655965257 +0100
-+++ go-1.9.2/src/crypto/x509/root_unix.go	2017-11-03 14:59:16.923786983 +0100
-@@ -19,6 +19,7 @@
- 	"/usr/local/share/certs",       // FreeBSD
+--- a/src/crypto/x509/root_unix.go
++++ b/src/crypto/x509/root_unix.go
+@@ -20,6 +20,7 @@
  	"/etc/pki/tls/certs",           // Fedora/RHEL
  	"/etc/openssl/certs",           // NetBSD
-+	"/etc/ssl",                     // LibreELEC
+ 	"/var/ssl/certs",               // AIX
++    "/etc/ssl",                     // LibreELEC
  }
  
  const (

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libconfuse"

packages/addons/addon-depends/jre-depends/apache-ant/package.mk

@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="apache-ant"
+PKG_VERSION="1.10.7"
+PKG_SHA256="c8d68b396d9e44b49668bafe0c82f8c89497915254b5395d73d6f6e41d7a0e25"
+PKG_LICENSE="Apache License 2.0"
+PKG_SITE="https://ant.apache.org/"
+PKG_URL="https://archive.apache.org/dist/ant/source/${PKG_NAME}-${PKG_VERSION}-src.tar.xz"
+PKG_DEPENDS_HOST="jdk-x86_64-zulu:host"
+PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
+PKG_TOOLCHAIN="manual"
+
+make_host() {
+  (
+  export JAVA_HOME=$(get_build_dir jdk-x86_64-zulu)
+
+  ./bootstrap.sh
+  ./bootstrap/bin/ant -f fetch.xml -Ddest=optional
+  ./build.sh -Ddist.dir=${PKG_BUILD}/binary dist
+  )
+}
+
+makeinstall_host() {
+  mkdir -p ${TOOLCHAIN}/bin
+    cp binary/bin/ant ${TOOLCHAIN}/bin
+    cp -r binary/lib ${TOOLCHAIN}
+}

packages/addons/addon-depends/jre-depends/jdk-aarch64-zulu/package.mk

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jdk-aarch64-zulu"
+PKG_VERSION="8.38.0.162-1.8.0_212"
+PKG_SHA256="2afa6b9a86fea6f9275856506b5cc1efd8420f674c5e2dc3e1b04e140d6ad852"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-embedded/"
+PKG_URL="http://cdn.azul.com/zulu-embedded/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch64.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f $PKG_BUILD/src.zip
+}

packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jdk-arm-zulu"
+PKG_VERSION="8.38.0.163-1.8.0_212"
+PKG_SHA256="bc45f41eab6e55c4e740e980001831c5e35db85745ec61a2b110e816e1074715"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-embedded/"
+PKG_URL="https://cdn.azul.com/zulu-embedded/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch32hf.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f $PKG_BUILD/src.zip
+
+  # libbluray needs arm/server
+  mv $PKG_BUILD/jre/lib/aarch32    $PKG_BUILD/jre/lib/arm
+  mv $PKG_BUILD/jre/lib/arm/client $PKG_BUILD/jre/lib/arm/server
+}

packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jdk-x86_64-zulu"
+PKG_VERSION="8.38.0.13-8.0.212"
+PKG_SHA256="568e7578f1b20b1e62a8ed2c374bad4eb0e75d221323ccfa6ba8d7bc56cf33cf"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-enterprise/"
+PKG_URL="https://cdn.azul.com/zulu/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_x64.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f $PKG_BUILD/src.zip
+}

packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+. $(get_pkg_directory libXinerama)/package.mk
+
+PKG_NAME="jre-libXinerama"
+PKG_LONGDESC="libXinerama for JRE"
+PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXinerama"
+
+PKG_CONFIGURE_OPTS_TARGET+=" --disable-static --enable-shared"
+
+unpack() {
+  mkdir -p $PKG_BUILD
+  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+. $(get_pkg_directory libbluray)/package.mk
+
+PKG_NAME="jre-libbluray"
+PKG_DEPENDS_TARGET+=" jdk-x86_64-zulu:host apache-ant:host"
+PKG_LONGDESC="libbluray jar for BD-J menus"
+PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libbluray"
+PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches"
+
+unpack() {
+  mkdir -p $PKG_BUILD
+  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+}
+
+pre_configure_target() {
+  # build also jar
+  PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET/disable-bdjava-jar/enable-bdjava-jar}"
+}
+
+make_target() {
+  (
+  export JAVA_HOME="$(get_build_dir jdk-x86_64-zulu)"
+
+  make all-local
+  )
+}
+
+makeinstall_target() {
+  :
+}

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libugpio"

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

@@ -26,16 +26,14 @@ pre_configure_target() {
   export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config
 }
 
-post_make_target() {
+makeinstall_target() {
   # copy necessary libs and headers to build serdisplib support
   # into the driver glcd from lcdproc
   mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib
   cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib
   mkdir -p $SYSROOT_PREFIX/usr/lib
   cp lib/libserdisp.so* $SYSROOT_PREFIX/usr/lib
-}
 
-makeinstall_target() {
   mkdir -p $INSTALL/usr/lib
   cp lib/libserdisp.so* $INSTALL/usr/lib
 }

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

@@ -1,4 +1,4 @@
-## SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libconfig"
@@ -15,3 +15,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
                            --disable-examples \
                            --with-sysroot=$SYSROOT_PREFIX"
+
+pre_configure_target() {
+  cd ..
+  rm -rf .$TARGET_NAME
+}

packages/addons/addon-depends/libconfig/patches/libconfig-0001_fix-include.patch

@@ -1,12 +0,0 @@
-diff -Naur a/tests/Makefile.am b/tests/Makefile.am
---- a/tests/Makefile.am	2014-03-04 03:04:17.000000000 +0100
-+++ b/tests/Makefile.am	2016-01-22 21:22:38.742833399 +0100
-@@ -3,7 +3,7 @@
- 
- libconfig_tests_SOURCES = tests.c
- 
--libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I../lib
-+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
- 
- libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
- 	-L$(top_builddir)/lib/.libs -lconfig

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

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libiconv"