Merge pull request #3488 from MilhouseVH/le92_backports1

backports: group PR for libreelec-9.2 updates

config/functions

@@ -357,11 +357,9 @@ setup_toolchain() {
 create_meson_conf() {
   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
 
@@ -380,12 +378,14 @@ 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
 }
@@ -1155,6 +1155,8 @@ done
 }
 
 install_addon_files() {
+  mkdir -p "$1"
+
   install_addon_source "$1"
   install_addon_images "$1"
   create_addon_xml "$1"
@@ -1190,7 +1192,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
@@ -1262,7 +1264,7 @@ pkg_lock() {
 
   # 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="$(cat "${THREAD_CONTROL}/locks/${pkg}.${task}.failed")"
+    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
@@ -1320,15 +1322,18 @@ update_dashboard() {
 
   sedline=$((MTJOBID + 2))
 
-  num=$(cat "${THREAD_CONTROL}/status" | wc -l)
-  while [ ${num} -lt ${sedline} ]; do echo "" >>"${THREAD_CONTROL}/status"; num=$((num + 1)); done
+  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=$(($(cat "${THREAD_CONTROL}/progress.prev") + 1))
+  num=$(< "${THREAD_CONTROL}/progress.prev")
   projdevarch="${PROJECT}/"
   [ -n "${DEVICE}" ] && projdevarch+="${DEVICE}/"
   projdevarch+="${TARGET_ARCH}"
   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} ${MTMAXJOBS} "${elapsed}"
+  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

config/multithread

@@ -107,8 +107,9 @@ package_worker() {
   (
     flock --exclusive 95
     [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
-    num=$(($(cat "${THREAD_CONTROL}/progress") + 1))
+    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"
@@ -143,6 +144,7 @@ start_multithread_build() {
   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"
 
   [ "${THREADCOUNT}" = "0" ] && THREADCOUNT=1

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"

distributions/LibreELEC/options

@@ -140,9 +140,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"
 

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

@@ -7,7 +7,7 @@ PKG_SHA256="4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62"
 PKG_LICENSE="GPLv3"
 PKG_SITE="http://lftp.yar.ru/"
 PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain readline openssl zlib"
+PKG_DEPENDS_TARGET="toolchain readline openssl zlib libidn2"
 PKG_LONGDESC="A sophisticated ftp/http client, and a file transfer program supporting a number of network protocols."
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \

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

@@ -10,6 +10,10 @@ PKG_URL="http://www.udpxy.com/download/1_23/${PKG_NAME}.${PKG_VERSION}-prod.tar.
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A UDP-to-HTTP multicast traffic relay daemon."
 
+configure_target() {
+  export CFLAGS+=" -Wno-stringop-truncation"
+}
+
 makeinstall_target() {
   :
 }

packages/addons/repository/repository.linuxserver.docker/package.mk

@@ -5,7 +5,6 @@ PKG_NAME="repository.linuxserver.docker"
 PKG_VERSION="9.0"
 PKG_REV="102"
 PKG_ARCH="any"
-PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play"
 PKG_LICENSE="GPL"
 PKG_SITE="https://linuxserver.io"
 PKG_URL=""

packages/addons/service/docker/package.mk

@@ -7,7 +7,6 @@ PKG_VERSION="18.09.5"
 PKG_SHA256="57f2a5d3374d86a8eb680c91df4351f5cb648351b9b32520c6fd2d66e7e97fd5"
 PKG_REV="125"
 PKG_ARCH="any"
-PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
 PKG_URL="https://github.com/docker/docker-ce/archive/v${PKG_VERSION}.tar.gz"

packages/addons/service/oscam/changelog.txt

@@ -1,3 +1,7 @@
+109
+- Update to version 11518
+- fixed missing Modules
+
 108
 - Update to version 11517
 

packages/addons/service/oscam/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="oscam"
-PKG_VERSION="a2ee0528f1de527748aaf7a79982ed112ffa3183"
-PKG_SHA256="24315471faea612a25b39fc14050f4fad4365715fde48dcb0032ebdce770282d"
-PKG_VERSION_NUMBER="11517"
-PKG_REV="108"
+PKG_VERSION="e8ce7359fa920ca8d63aca9dde4f0eeb1f1f72f1"
+PKG_SHA256="93610d3d61479cae87340a0a3d7dc8c04b326b662f58f4181ac08c87897bd80b"
+PKG_VERSION_NUMBER="11518"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"
@@ -19,17 +19,53 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="OSCam"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_CMAKE_OPTS_TARGET="-DLIBUSBDIR=$SYSROOT_PREFIX/usr \
-                       -DWITH_SSL=1 \
-                       -DHAVE_LIBCRYPTO=1 \
-                       -DHAVE_DVBAPI=1 \
-                       -DWITH_STAPI=0 \
-                       -DWEBIF=1 \
-                       -DWITH_DEBUG=0 \
-                       -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
-                       -DSTATIC_LIBUSB=1 \
-                       -DCLOCKFIX=0 \
-                       -DCARDREADER_DB2COM=OFF"
+PKG_CMAKE_OPTS_TARGET="\
+  `#Building` \
+  -DLIBUSBDIR=$SYSROOT_PREFIX/usr \
+  -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
+  \
+  `#Readers` \
+  -DCARDREADER_DB2COM=OFF \
+  -DCARDREADER_DRECAS=ON \
+  -DCARDREADER_INTERNAL=OFF \
+  -DCARDREADER_MP35=ON \
+  -DCARDREADER_PHOENIX=ON \
+  -DCARDREADER_SC8IN1=ON \
+  -DCARDREADER_SMARGO=ON \
+  -DCARDREADER_STAPI5=OFF \
+  -DCARDREADER_STAPI=OFF \
+  -DCARDREADER_STINGER=ON \
+  \
+  `#Protocol` \
+  -DMODULE_CAMD33=OFF \
+  -DMODULE_CAMD35=ON \
+  -DMODULE_CAMD35_TCP=ON \
+  -DMODULE_CCCAM=ON \
+  -DMODULE_CCCSHARE=ON \
+  -DMODULE_CONSTCW=ON \
+  -DMODULE_GBOX=ON \
+  -DMODULE_GHTTP=ON \
+  -DMODULE_NEWCAMD=ON \
+  -DMODULE_PANDORA=ON \
+  -DMODULE_RADEGAST=ON \
+  -DMODULE_SCAM=ON \
+  -DMODULE_SERIAL=ON \
+  \
+  `#Features` \
+  -DCLOCKFIX=0 \
+  -DCS_ANTICASC=ON \
+  -DCS_CACHEEX=ON \
+  -DCW_CYCLE_CHECK=ON \
+  -DHAVE_DVBAPI=1 \
+  -DHAVE_LIBCRYPTO=1 \
+  -DSTATIC_LIBUSB=1 \
+  -DTOUCH=ON \
+  -DWEBIF=1 \
+  -DWEBIF_LIVELOG=1 \
+  -DWEBIF_JQUERY=1 \
+  -DWITH_DEBUG=0 \
+  -DWITH_SSL=1 \
+  -DWITH_STAPI=0"
 
 pre_configure_target() {
   export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER"

packages/addons/service/slice/package.mk

@@ -20,9 +20,7 @@ PKG_ADDON_PROJECTS="Slice Slice3"
 PKG_ADDON_TYPE="xbmc.service"
 
 makeinstall_target() {
-  PKG_ADDON_INSTALL_DIR="${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME}"
-  mkdir -p "${PKG_ADDON_INSTALL_DIR}"
-    install_addon_files "${PKG_ADDON_INSTALL_DIR}"
+  install_addon_files "${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME}"
 }
 
 addon() {

packages/addons/service/tvheadend42/changelog.txt

@@ -1,3 +1,6 @@
+119
+- Use system libidn2
+
 118
 - update to 4.2.7-44
 - fix tv_grab_file usage of & in urls

packages/addons/service/tvheadend42/package.mk

@@ -5,7 +5,7 @@ PKG_NAME="tvheadend42"
 PKG_VERSION="5c218500579d5bd1c1f7e7a4b5f7f0fb35baa626"
 PKG_SHA256="a9fe5a4c36aa185e3f0a73a709f0dc05794ae9c12f5d888985b559ff68a2508d"
 PKG_VERSION_NUMBER="4.2.7-44"
-PKG_REV="118"
+PKG_REV="119"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
@@ -114,7 +114,6 @@ addon() {
   cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -PL $(get_build_dir libidn2)/.install_pkg/usr/lib/libidn2.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib
 
   # set only version (revision will be added by buildsystem)

packages/addons/service/tvmosaic/package.mk

@@ -5,7 +5,6 @@ PKG_NAME="tvmosaic"
 PKG_VERSION="1.0.0-16296"
 PKG_SHA256="63d48e7b0912f2efb6e894252a13d8312679cdcb155ebe3fa758dc88b4f91816"
 PKG_REV="100"
-PKG_ARCH="any"
 PKG_ARCH="arm"
 PKG_LICENSE="Prop."
 PKG_SITE="https://tv-mosaic.com"

packages/addons/tools/dotnet-runtime/package.mk

@@ -36,11 +36,6 @@ PKG_ADDON_NAME=".Net Core Runtime"
 PKG_ADDON_TYPE="xbmc.python.script"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
-unpack() {
-  mkdir -p $PKG_BUILD
-  $SCRIPTS/extract $PKG_NAME $PKG_BUILD
-}
-
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -r $PKG_BUILD/$PKG_NAME-$PKG_VERSION/* \

packages/addons/tools/ffmpeg-tools/changelog.txt

@@ -1,3 +1,6 @@
+106
+- Use system libidn2
+
 105
 - Removed FDK-AAC
 - Build with GNUTLS

packages/addons/tools/ffmpeg-tools/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="ffmpeg-tools"
 PKG_VERSION="1.0"
-PKG_REV="105"
+PKG_REV="106"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -25,7 +25,6 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
     cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib
     cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib
-    cp -PL $(get_build_dir libidn2)/.install_pkg/usr/lib/libidn2.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib
     cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib
     cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib
 }

packages/audio/alsa-lib/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.1.8"
-PKG_SHA256="3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf"
+PKG_VERSION="1.1.9"
+PKG_SHA256="488373aef5396682f3a411a6d064ae0ad196b9c96269d0bb912fbdeec94b994b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$PKG_VERSION.tar.bz2"

packages/audio/alsa-utils/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="alsa-utils"
-PKG_VERSION="1.1.8"
-PKG_SHA256="fd9bf528922b3829a91913b89a1858c58a0b24271a7b5f529923aa9ea12fa4cf"
+PKG_VERSION="1.1.9"
+PKG_SHA256="5ddf2cbddb4bd1a4a2a6492a09c25898b08c3ad64893c3655be14194cf0a213a"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$PKG_VERSION.tar.bz2"

packages/audio/libmodplug/package.mk

@@ -1,9 +1,10 @@
 # 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="libmodplug"
-PKG_VERSION="0.8.8.5"
-PKG_SHA256="77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad"
+PKG_VERSION="0.8.9.0"
+PKG_SHA256="457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de"
 PKG_LICENSE="GPL"
 PKG_SITE="http://modplug-xmms.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/modplug-xmms/libmodplug/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"

packages/audio/libopenmpt/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libopenmpt"
-PKG_VERSION="0.3.1"
-PKG_SHA256="6fc5614926edd523d5585e40fdaf0b2ea08689d4dc91de49511d02503744cbb5"
+PKG_VERSION="0.4.5"
+PKG_SHA256="0b4cc0cc8fbbdabc6263a900ff3560dae7be43be011b6f2bc9913f7a0ed3a521"
 PKG_LICENSE="BSD"
 PKG_SITE="http://lib.openmpt.org/libopenmpt/"
 PKG_URL="http://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz"

packages/audio/libsamplerate/package.mk

@@ -1,9 +1,10 @@
 # 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="libsamplerate"
-PKG_VERSION="0.1.8"
-PKG_SHA256="93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06"
+PKG_VERSION="0.1.9"
+PKG_SHA256="0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mega-nerd.com/SRC/"
 PKG_URL="http://www.mega-nerd.com/SRC/$PKG_NAME-$PKG_VERSION.tar.gz"

packages/audio/rpi-cirrus-config/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rpi-cirrus-config"
-PKG_VERSION="0.0.1"
-PKG_SHA256="a2a580d9738aaf4e901d8215cedd1df5d95b1e057165cfd9b72335e0dc6c40e4"
+PKG_VERSION="0.0.2"
+PKG_SHA256="cc11c47f1f2b6d5e72dcdea828ba57e0dcaf74161f675a4a9f395054f5d82d31"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/HiassofT/rpi-cirrus-config"
 PKG_URL="https://github.com/HiassofT/rpi-cirrus-config/archive/$PKG_VERSION.tar.gz"