Merge pull request #8504 from HiassofT/le11-kodi-20.3

[le11] kodi: update to 20.3-Nexus

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,5 +1,5 @@
 ---
-name: Bug Report
+name: Bug report
 about: Describe this issue
 title: "[BUG]"
 labels: ISSUE NEEDS REVIEW
@@ -8,21 +8,21 @@ assignees: ''
 ---
 
 ### Describe the bug
-<!-- A clear description of what the bug is. -->
+<!--- A clear description of what the bug is. -->
 
-### How to reproduce
+### To Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Play '....'
 3. See error
 
-### Information
- - LibreELEC Version: [e.g. 9.2.1]
+### Informations
+ - LE Version: [e.g. 9.2.1]
  - Hardware Platform: [e.g. RPi3]
 
 ### Log file
-<!-- Add debug log files (https://libreelec.wiki/how_to/provide_logfile) that we can search for errors. -->
+<!-- Add log files (https://libreelec.wiki/how_to/provide_logfile) that we can search for errors. -->
 
-### Context
-<!-- Add any context about the problem here. -->
+### Additional context
+<!--- Add any other context about the problem here. -->
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: Help and Support
-    url: https://forum.libreelec.tv
-    about: Please ask for help and post questions in the forum
-  - name: Feature Requests
-    url: https://forum.libreelec.tv/board/18-feature-requests/
-    about: Please make feature requests via the forum

config/arch.x86_64

@@ -15,16 +15,16 @@
 
 # build with microarchitecture feature support defined by the TARGET_CPU value
 # see https://gitlab.com/x86-psABIs/x86-64-ABI/-/wikis/home for further details
-  if [ -z "${TARGET_FEATURES}" ]; then
-    TARGET_FEATURES="64bit cmov cx8 fpu fxsr mmx osfxsr sce sse sse2"
-    TARGET_FEATURES_X86_64_V2="cmpxchg16b lahf-sahf popcnt sse3 sse4_1 sse4_2 ssse3"
-    TARGET_FEATURES_X86_64_V3="avx avx2 bmi1 bmi2 f16c fma lzcnt movbe osxsave"
-    if [ "${TARGET_CPU}" = "x86-64" ]; then
-      TARGET_FEATURES+=" no_sahf"
-    elif [ "${TARGET_CPU}" = "x86-64-v2" ]; then
-      TARGET_FEATURES+=" ${TARGET_FEATURES_X86_64_V2}"
-    elif [ "${TARGET_CPU}" = "x86-64-v3" ]; then
-      TARGET_FEATURES+=" ${TARGET_FEATURES_X86_64_V2} ${TARGET_FEATURES_X86_64_V3}"
-    fi
+  TARGET_FEATURES="64bit cmov cx8 fpu fxsr mmx osfxsr sce sse sse2"
+  TARGET_FEATURES_X86_64_V2="cmpxchg16b lahf-sahf popcnt sse3 sse4_1 sse4_2 ssse3"
+  TARGET_FEATURES_X86_64_V3="avx avx2 bmi1 bmi2 f16c fma lzcnt movbe osxsave"
+  if [ "${TARGET_CPU}" = "x86-64" ]; then
+    TARGET_FEATURES+=" no_sahf"
+  elif [ "${TARGET_CPU}" = "x86-64-v2" ]; then
+    TARGET_FEATURES+=" ${TARGET_FEATURES_X86_64_V2}"
+  elif [ "${TARGET_CPU}" = "x86-64-v3" ]; then
+    TARGET_FEATURES+=" ${TARGET_FEATURES_X86_64_V2} ${TARGET_FEATURES_X86_64_V3}"
+  else
+    TARGET_FEATURES+=" UNKNOWN_ADDITIONAL_CPU_SPECIFIC_FEATURES"
   fi
   TARGET_FEATURES="$(echo ${TARGET_FEATURES} | xargs -n1 | sort -u | xargs)"

config/functions

@@ -580,7 +580,7 @@ c = '$CC'
 cpp = '$CXX'
 ar = '$AR'
 strip = '$STRIP'
-pkg-config = '$PKG_CONFIG'
+pkgconfig = '$PKG_CONFIG'
 llvm-config = '$TOOLCHAIN/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
@@ -618,7 +618,7 @@ c = '$TARGET_CC'
 cpp = '$TARGET_CXX'
 ar = '$TARGET_AR'
 strip = '$TARGET_STRIP'
-pkg-config = '$PKG_CONFIG'
+pkgconfig = '$PKG_CONFIG'
 llvm-config = '$SYSROOT_PREFIX/usr/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
@@ -641,7 +641,6 @@ $(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TAR
 $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
 
 [properties]
-ipc_rmid_deferred_release = true
 needs_exe_wrapper = true
 root = '$SYSROOT_PREFIX/usr'
 ${!properties}
@@ -1014,10 +1013,6 @@ get_pkg_version() {
   get_pkg_variable "$1" PKG_VERSION
 }
 
-get_pkg_sha256() {
-  get_pkg_variable "$1" PKG_SHA256
-}
-
 get_pkg_version_maj_min() {
   local pkg_version
 

config/options

@@ -35,6 +35,13 @@ fi
 export ARCH="${ARCH:-x86_64}"
 TARGET_ARCH="${ARCH}"
 
+# include arm-mem package on arm
+if [ "${TARGET_ARCH}" = "arm" ]; then
+  ARM_MEM_SUPPORT="yes"
+else
+  ARM_MEM_SUPPORT="no"
+fi
+
 # include helper functions
 . config/functions
 

config/show_config

@@ -33,7 +33,6 @@ show_config() {
   config_message+="\n - GOLD (Google Linker) Support:\t ${GOLD_SUPPORT}"
   config_message+="\n - MOLD (Modern Linker) Support:\t ${MOLD_SUPPORT}"
   config_message+="\n - Default Linker:\t\t\t ${DEFAULT_LINKER}"
-  config_message+="\n - Accelerated arm libc functions:\t ${ARM_MEM_SUPPORT}"
   config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}"
   config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}"
   config_message+="\n - CFLAGS:\t\t\t\t ${TARGET_CFLAGS}"
@@ -63,17 +62,6 @@ show_config() {
     config_message+="\n - Include firmware:\t\t\t ${config_firmware}"
   done
 
-  # Image Filsystem
-
-  config_message+="\n\n Image Filesystems:"
-  config_message+="\n ${dashes}${dashes}"
-  config_message+="\n - Flash Size (MiB): \t\t\t ${SYSTEM_SIZE}"
-  config_message+="\n - Storage Size (MiB): \t\t\t ${STORAGE_SIZE}"
-  config_message+="\n - SquashFS Compression Method: \t ${SQUASHFS_COMPRESSION}"
-  if [ -n "${SQUASHFS_COMPRESSION_OPTION}" ]; then
-    config_message+="\n - SquashFS Compression Options: \t ${SQUASHFS_COMPRESSION_OPTION}"
-  fi
-
   # Misc. Filesystems
 
   config_message+="\n\n Misc. Filesystems:"
@@ -83,6 +71,7 @@ show_config() {
   if [ "${SWAP_SUPPORT}" = "yes" ]; then
     config_message+="\n   - Swapfile default size:\t\t ${SWAPFILESIZE}"
   fi
+  config_message+="\n - Install HFS Tools:\t\t\t ${HFSTOOLS}"
 
   # Network service configuration
 

distributions/LibreELEC/kernel_options

@@ -24,8 +24,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
 
 # packages/network/iwd
 CONFIG_CRYPTO_USER_API_HASH=y
@@ -62,7 +60,6 @@ CONFIG_WIREGUARD=m
 # packages/sysutils/systemd
 CONFIG_DEVTMPFS=y
 CONFIG_CGROUPS=y
-CONFIG_FB_DEVICE=y
 CONFIG_INOTIFY_USER=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -78,7 +75,7 @@ CONFIG_SYSFS_DEPRECATED=n
 CONFIG_UEVENT_HELPER=n
 CONFIG_FW_LOADER_USER_HELPER=n
 CONFIG_IPV6=y
-CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_EXT4_FS_POSIX_ACL=y

distributions/LibreELEC/options

@@ -53,13 +53,6 @@
 # Install glibc locales to the build (yes / no)
   GLIBC_LOCALES="yes"
 
-# Install arm-mem package on ARM32 (yes / no)
-  if [ "${TARGET_ARCH}" = "arm" ]; then
-    ARM_MEM_SUPPORT="yes"
-  else
-    ARM_MEM_SUPPORT="no"
-  fi
-
 # additional drivers to install:
 # for a list of additional drivers see packages/linux-drivers
 # Space separated list is supported,
@@ -72,9 +65,6 @@
 # Default system partition offset, in sectors, eg. 2048
   SYSTEM_PART_START=8192
 
-# Size of storage partition, in MB. Must be >=32
-  STORAGE_SIZE=32
-
 # build with swap support (yes / no)
   SWAP_SUPPORT="yes"
 
@@ -193,6 +183,9 @@
   DEBUG_GROUPS="kodi+=kodi+,kodi-platform+,p8-platform+,!mesa"
   DEBUG_GROUP_YES="kodi+"
 
+# wireless daemon to use (wpa_supplicant/iwd)
+  WIRELESS_DAEMON="iwd"
+
 # build and install iSCSI support - iscsistart (yes / no)
   ISCSI_SUPPORT="no"
 
@@ -223,6 +216,9 @@
 # This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
   INITRAMFS_PARTED_SUPPORT="no"
 
+# build and install hfs filesystem utilities (yes / no)
+  HFSTOOLS="yes"
+
 # build and install nano text editor (yes / no)
   NANO_EDITOR="yes"
 

distributions/LibreELEC/version

@@ -2,7 +2,7 @@
   LIBREELEC_VERSION="devel"
 
 # OS_VERSION: OS Version
-  OS_VERSION="12.0"
+  OS_VERSION="11.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="12.0.0"
+  ADDON_VERSION="11.0.0"

licenses/0BSD.txt

@@ -1,11 +0,0 @@
-Permission to use, copy, modify, and/or distribute this
-software for any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

licenses/Unlicense.txt

@@ -1,25 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-

licenses/fdk-aac.txt

@@ -1,92 +0,0 @@
-Software License for The Fraunhofer FDK AAC Codec Library for Android
-
-© Copyright  1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
-Forschung e.V. All rights reserved.
-
- 1.    INTRODUCTION
-The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software
-that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding
-scheme for digital audio. This FDK AAC Codec software is intended to be used on
-a wide variety of Android devices.
-
-AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient
-general perceptual audio codecs. AAC-ELD is considered the best-performing
-full-bandwidth communications codec by independent studies and is widely
-deployed. AAC has been standardized by ISO and IEC as part of the MPEG
-specifications.
-
-Patent licenses for necessary patent claims for the FDK AAC Codec (including
-those of Fraunhofer) may be obtained through Via Licensing
-(www.vialicensing.com) or through the respective patent owners individually for
-the purpose of encoding or decoding bit streams in products that are compliant
-with the ISO/IEC MPEG audio standards. Please note that most manufacturers of
-Android devices already license these patent claims through Via Licensing or
-directly from the patent owners, and therefore FDK AAC Codec software may
-already be covered under those patent licenses when it is used for those
-licensed purposes only.
-
-Commercially-licensed AAC software libraries, including floating-point versions
-with enhanced sound quality, are also available from Fraunhofer. Users are
-encouraged to check the Fraunhofer website for additional applications
-information and documentation.
-
-2.    COPYRIGHT LICENSE
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted without payment of copyright license fees provided that you
-satisfy the following conditions:
-
-You must retain the complete text of this software license in redistributions of
-the FDK AAC Codec or your modifications thereto in source code form.
-
-You must retain the complete text of this software license in the documentation
-and/or other materials provided with redistributions of the FDK AAC Codec or
-your modifications thereto in binary form. You must make available free of
-charge copies of the complete source code of the FDK AAC Codec and your
-modifications thereto to recipients of copies in binary form.
-
-The name of Fraunhofer may not be used to endorse or promote products derived
-from this library without prior written permission.
-
-You may not charge copyright license fees for anyone to use, copy or distribute
-the FDK AAC Codec software or your modifications thereto.
-
-Your modified versions of the FDK AAC Codec must carry prominent notices stating
-that you changed the software and the date of any change. For modified versions
-of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android"
-must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK
-AAC Codec Library for Android."
-
-3.    NO PATENT LICENSE
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without
-limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE.
-Fraunhofer provides no warranty of patent non-infringement with respect to this
-software.
-
-You may use this FDK AAC Codec software or modifications thereto only for
-purposes that are authorized by appropriate patent licenses.
-
-4.    DISCLAIMER
-
-This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright
-holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
-including but not limited to the implied warranties of merchantability and
-fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary,
-or consequential damages, including but not limited to procurement of substitute
-goods or services; loss of use, data, or profits, or business interruption,
-however caused and on any theory of liability, whether in contract, strict
-liability, or tort (including negligence), arising in any way out of the use of
-this software, even if advised of the possibility of such damage.
-
-5.    CONTACT INFORMATION
-
-Fraunhofer Institute for Integrated Circuits IIS
-Attention: Audio and Multimedia Departments - FDK AAC LL
-Am Wolfsmantel 33
-91058 Erlangen, Germany
-
-www.iis.fraunhofer.de/amm
-amm-info@iis.fraunhofer.de
-

licenses/gpgme.txt

@@ -1,38 +0,0 @@
-Additional license notices for GPGME.                    -*- org -*-
-
-This file contains the copying permission notices for various files in
-the GPGME distribution which are not covered by the GNU Lesser
-General Public License (LGPL) or the GNU General Public License (GPL).
-
-These notices all require that a copy of the notice be included
-in the accompanying documentation and be distributed with binary
-distributions of the code, so be sure to include this file along
-with any binary distributions derived from the GNU C Library.
-
-* MIT License
-
-  For files:
-  - cJSON.c, cJSON.h
-
-#+begin_quote
-  Copyright (c) 2009 Dave Gamble
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a opy of this software and associated documentation files (the
-  "Software"), to eal in the Software without restriction, including
-  without limitation the ights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING ROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#+end_quote

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

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_ADS1x15"
+PKG_VERSION="a963cc0ee83e2ba6d671b02df5febf7250f626aa"
+PKG_SHA256="2f81a9a6b7b7f46b79faa5b01df0c25fa5f16af80842d74e35b5fbf01ab0c619"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi."
+PKG_TOOLCHAIN="manual"
+

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_ADXL345"
+PKG_VERSION="dca3d90b5477a304fa130f5cc90ea59e3968ce6f"
+PKG_SHA256="22ec0fc6679cc3e9b5f0aff5cfeef34cbbf13e59aecfb829c2f0dc2d90b5fb8b"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_BMP"
+PKG_VERSION="e8521e969afae3321d9789353d7e92ea9a5e9a56"
+PKG_SHA256="e5e140c34e312f6a00c62b1bd47ebe3f1857009b1c202c18c7b092ebb2e1eb9c"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_CharLCD"
+PKG_VERSION="bc75cad284766240424f29dc8e7b84d0caceb72e"
+PKG_SHA256="eae4b446162feb533a469a9dacf6e750250f925561c9f7983a11d340e1dd98d4"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_DHT"
+PKG_VERSION="18846deec6a96572b3f2c4a9edfb5bac55b46f5b"
+PKG_SHA256="9125f8f42b4874db257a45184b866e8b424aa67230d2ffbc734b53686da7817f"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi."
+PKG_TOOLCHAIN="manual"
+
+pre_make_target() {
+  export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
+  export LDSHARED="${CC} -shared"
+}
+
+make_target() {
+  case "${PROJECT}:${DEVICE}" in
+    "RPi:RPi")
+      PKG_RPI_VERSION="--force-pi"
+      ;;
+    "RPi:RPi2")
+      PKG_RPI_VERSION="--force-pi2"
+      ;;
+    *)
+      PKG_RPI_VERSION=""
+  esac
+
+  python3 setup.py build ${PKG_RPI_VERSION} --cross-compile
+}

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_GPIO"
+PKG_VERSION="c543d1df9c0a71bafb9f0a1f9dceecd79a920e74"
+PKG_SHA256="d3cb74fd033ebe5aea1786a584d64ef5eb8082ef2bf0a568b01691612cd04e88"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi ."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_LED_Backpack"
+PKG_VERSION="e34b9548e86e63747563a94f02b65b2980fdefff"
+PKG_SHA256="244d2625cdaebdc68e299fedde276efa5c9f7c143681c4ee056fb8350a4f7167"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python library for controlling LED backpack displays."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_LSM303"
+PKG_VERSION="37d288844515d7bb62a2329982eb033e92dceceb"
+PKG_SHA256="609591f2add15e849d3bba320417c705a50a3ed077632baf20c12c8b740d5331"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_MCP3008"
+PKG_VERSION="e721d26e650c99b0f6d3efd4ec30444e1adf5ccd"
+PKG_SHA256="f5e4c847a87716c16f0209df95c281b5071549644a79a143a77b212f25c464dc"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_MCP4725"
+PKG_VERSION="4d028bbcf58b011a8f14c5d95057b7e1dcc1064e"
+PKG_SHA256="6ebbd1f76807b01dc2b723064e52b0c82fc45388265b8ec867e0a42a46a6e926"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_PCA9685"
+PKG_VERSION="f86db2ca5de379748afd71e379ce2155f47d21e7"
+PKG_SHA256="46e11dcfbfaab5756ddeb6ab31740cf8c7419ec1d32be2519f19882e7d86e426"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_PureIO"
+PKG_VERSION="6f4976d91c52d70b67b28bba75a429b5328a52c1"
+PKG_SHA256="891a4d077fe6610de6aa4b0dc5b9933a6c7db3492072df60c0383662f28c2ae9"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_SI1145"
+PKG_VERSION="18c400643b39dbf29ab7ff8e74ab0c5c36ef5cf1"
+PKG_SHA256="0238b2c01cfbb2890ae78468d2fc19c815748fc94860a4eb92b649d074476264"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/THP-JOE/Python_SI1145"
+PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi"
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_SSD1306"
+PKG_VERSION="8819e2d203df49f2843059d981b7347d9881c82b"
+PKG_SHA256="ed1163dee2fe6c0c2065a429e1d93cff7397a309071ff83714c84566739680a2"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_TCS34725"
+PKG_VERSION="6306f90b4601237a852acef89eeecc1261ce38b3"
+PKG_SHA256="f2c3218551da55d7fdbe2499a6ffa3a0b8ed1709e4402c6b0e0f37b17d4aa81f"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_VCNL40xx"
+PKG_VERSION="5c72575b7390fbedfae0b5fb2a881ca9efe9ca22"
+PKG_SHA256="78346836965562720248138203a4af9dc6aa18815bda2a5b7842e3b9af9d1ea8"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="Adafruit_Python_WS2801"
+PKG_VERSION="d0c190715ffef1b00e5ffa2d7b7560e7f8ed4263"
+PKG_SHA256="6219edb5c1d767ff950f5020bacdfb5ba608b4995eb14d6073fdec2f17f584cb"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi."
+PKG_TOOLCHAIN="manual"

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

@@ -3,11 +3,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ccid"
-PKG_VERSION="1.6.0"
-PKG_SHA256="cdca7c22c45169cfc300d65d5362b7644ee195289f4fb8bf475a6cd321752c2c"
+PKG_VERSION="1.5.2"
+PKG_SHA256="13934487e6f8b48f699a16d367cc7a1af7a3ca874de721ac6e9633beb86e7219"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://ccid.apdu.fr"
-PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain pcsc-lite"
 PKG_LONGDESC="A generic USB Chip/Smart Card Interface Devices driver."
 PKG_TOOLCHAIN="autotools"

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

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2017 Escalade
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="at-spi2-atk"
+PKG_VERSION="2.38.0"
+PKG_SHA256="cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.gnome.org/"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain at-spi2-core atk libX11 libxml2"
+PKG_LONGDESC="A GTK+ module that bridges ATK to D-Bus at-spi."

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

@@ -3,30 +3,18 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="at-spi2-core"
-PKG_VERSION="2.52.0"
-PKG_SHA256="0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab"
+PKG_VERSION="2.47.1"
+PKG_SHA256="c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.gnome.org/"
 PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain atk dbus glib libxml2"
+PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
 PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."
 
-configure_package() {
-  # Build with x11 support
-  if [ ${DISPLAYSERVER} = "x11" ]; then
-    PKG_DEPENDS_TARGET+=" libXtst"
-  fi
-}
+PKG_MESON_OPTS_TARGET="-Ddocs=false \
+                       -Dintrospection=disabled \
+                       -Ddbus_daemon=/usr/bin/dbus-daemon"
 
 pre_configure_target() {
-  PKG_MESON_OPTS_TARGET="-Ddocs=false \
-                         -Dintrospection=disabled \
-                         -Ddbus_daemon=/usr/bin/dbus-daemon"
-
-  if [ ${DISPLAYSERVER} = "x11" ]; then
-    PKG_MESON_OPTS_TARGET+="-Dx11=true"
-    TARGET_LDFLAGS="${LDFLAGS} -lXext"
-  else
-    PKG_MESON_OPTS_TARGET+="-Dx11=false"
-  fi
+  TARGET_LDFLAGS="${LDFLAGS} -lXext"
 }

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

@@ -8,7 +8,7 @@ PKG_SHA256="ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain glib"
+PKG_DEPENDS_TARGET="toolchain glib glib:host"
 PKG_LONGDESC="Provides the set of accessibility interfaces that are implemented by other applications."
 PKG_BUILD_FLAGS="+pic"
 

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

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }

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

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cups"
-PKG_VERSION="2.4.10"
-PKG_SHA256="f51b9edd631db1830b967101b51f0045c8c239ae799dff89f0399f3e47a95c02"
+PKG_VERSION="2.4.2"
+PKG_SHA256="7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
 PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"

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

@@ -3,12 +3,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gtk3"
-PKG_VERSION="3.24.42"
-PKG_SHA256="50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2"
+PKG_VERSION="3.24.36"
+PKG_SHA256="27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691"
 PKG_LICENSE="LGPL"
-PKG_SITE="https://www.gtk.org/"
+PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain at-spi2-core atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon"
+PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon"
 PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info"
 PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System."
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/chrome-depends/harfbuzz-icu/patches/harfbuzz-icu-4734-fix-build-with-icu-75.patch

@@ -1,26 +0,0 @@
-From 93d58f8315fc3cbb2b15a4ff79329a1022ca8d54 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 28 May 2024 11:39:27 +0200
-Subject: [PATCH] meson: set -std=c++17 when building with icu >= 75
-
-Fixes:
-https://github.com/harfbuzz/harfbuzz/issues/4671
----
- meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index d8d8424e7b9..9e6f8de9c50 100644
---- a/meson.build
-+++ b/meson.build
-@@ -174,6 +174,10 @@ else
-   endif
- endif
- 
-+if icu_dep.found() and icu_dep.version().version_compare('>=75.1') and (get_option('cpp_std') == 'c++11' or get_option('cpp_std') == 'c++14')
-+  add_project_arguments('-std=c++17', language: 'cpp')
-+endif
-+
- if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
-   icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '').split()
-   if icu_defs.length() > 0

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXcursor"
-PKG_VERSION="1.2.2"
-PKG_SHA256="53d071bd2cc56e517a30998d5e685c8a74556ddada43c6985d14da9a023a88ee"
+PKG_VERSION="1.2.1"
+PKG_SHA256="46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.xz"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXft"
-PKG_VERSION="2.3.8"
-PKG_SHA256="5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49"
+PKG_VERSION="2.3.7"
+PKG_SHA256="79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.xz"

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="comskip"
-PKG_VERSION="6e66de54358498aa276d233f5b3e7fa673526af1"
-PKG_SHA256="412f0cc543cbe327b36b0354c00ace260c996e95dd95cb585ca58dd52c926607"
+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"

packages/addons/addon-depends/comskip/patches/Comskip-0001-Fix-compilation-with-gcc10.patch

@@ -0,0 +1,12 @@
+diff --git a/mpeg2dec.c b/mpeg2dec.c
+index 3013dc1..5b79227 100755
+--- a/mpeg2dec.c
++++ b/mpeg2dec.c
+@@ -161,7 +161,6 @@ int64_t pev_best_effort_timestamp = 0;
+ 
+ int video_stream_index = -1;
+ int audio_stream_index = -1;
+-int width, height;
+ int have_frame_rate ;
+ int stream_index;
+ 

packages/addons/addon-depends/comskip/patches/comskip-ffmpeg6.patch

@@ -1,58 +0,0 @@
-From 3f940e6f8e83fbb0cbbca6a4f55b506ccec8d3c4 Mon Sep 17 00:00:00 2001
-From: bsperduto <brian.sperduto@gmail.com>
-Date: Sun, 3 Dec 2023 08:50:41 -0600
-Subject: [PATCH 1/2] Fix for deprecation of DECLARE_ALIGNED #164
-
----
- comskip.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/comskip.c b/comskip.c
-index 08ffd5e..e85f61a 100644
---- a/comskip.c
-+++ b/comskip.c
-@@ -733,9 +733,9 @@ int					sceneChangePercent;
- bool				lastFrameWasBlack = false;
- bool				lastFrameWasSceneChange = false;
- 
--#include <libavutil/avutil.h>  // only for DECLARE_ALIGNED
--static DECLARE_ALIGNED(32, long, histogram)[256];
--static DECLARE_ALIGNED(32, long, lastHistogram)[256];
-+
-+static long histogram[256];
-+static long lastHistogram[256];
- 
- #define				MAXCSLENGTH		400*300
- #define				MAXCUTSCENES	8
-@@ -10097,7 +10097,7 @@ void LoadCutScene(const char *filename)
- #define OWN_HISTOGRAM_WIDTH 4
- #define OWN_HISTOGRAM_HEIGHT 256
- 
--static DECLARE_ALIGNED(32, int, own_histogram)[OWN_HISTOGRAM_WIDTH][OWN_HISTOGRAM_HEIGHT];
-+static int own_histogram[OWN_HISTOGRAM_WIDTH][OWN_HISTOGRAM_HEIGHT];
- int scan_step;
- 
- #define SCAN_MULTI
-
-From eae0b430d7c9317333fb8759bd67369fd71a085a Mon Sep 17 00:00:00 2001
-From: bsperduto <brian.sperduto@gmail.com>
-Date: Sun, 10 Dec 2023 13:32:57 +0100
-Subject: [PATCH 2/2] [PATCH] Update mpeg2dec.c
-
----
- mpeg2dec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mpeg2dec.c b/mpeg2dec.c
-index 626a991..bb2fa2b 100755
---- a/mpeg2dec.c
-+++ b/mpeg2dec.c
-@@ -349,7 +349,7 @@ static void signal_handler (int sig)
- #define AUDIOBUFFER	1600000
- 
- static double base_apts = 0.0, apts, top_apts = 0.0;
--static DECLARE_ALIGNED(16, short, audio_buffer[AUDIOBUFFER]);
-+static short audio_buffer[AUDIOBUFFER];
- static short *audio_buffer_ptr = audio_buffer;
- static int audio_samples = 0;
- #define ISSAME(T1,T2) (fabs((T1) - (T2)) < 0.001)

packages/addons/addon-depends/docker/cli/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="cli"
 PKG_VERSION="$(get_pkg_version moby)"
-PKG_SHA256="f992e895c949852686abef9a6fa9efd622826c4f4d70b83876569a4641c4c8fc"
+PKG_SHA256="b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9"
 PKG_LICENSE="ASL"
 PKG_SITE="https://github.com/docker/cli"
 PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz"
@@ -11,8 +11,8 @@ PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_LONGDESC="The Docker CLI"
 PKG_TOOLCHAIN="manual"
 
-# Git commit of the matching tag https://github.com/docker/cli/tags
-export PKG_GIT_COMMIT="7d4bcd863a4c863e650eed02a550dfeb98560b83"
+# Git commit of the matching release https://github.com/docker/cli/releases
+export PKG_GIT_COMMIT="ef23cbc4315ae76c744e02d687c09548ede461bd"
 
 configure_target() {
   go_configure

packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch

@@ -1,13 +1,11 @@
 --- a/cli-plugins/manager/manager_unix.go	2023-02-03 11:54:16.746399916 +0000
 +++ b/cli-plugins/manager/manager_unix.go	2023-02-03 11:59:04.528175595 +0000
-@@ -13,8 +13,6 @@
- //
- // [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs
+@@ -4,6 +4,6 @@
+ package manager
+ 
  var defaultSystemPluginDirs = []string{
--	"/usr/local/lib/docker/cli-plugins",
--	"/usr/local/libexec/docker/cli-plugins",
--	"/usr/lib/docker/cli-plugins",
--	"/usr/libexec/docker/cli-plugins",
+-	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
+-	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
 +	"/storage/.kodi/addons/service.system.docker/cli-plugins",
 +	"/storage/.kodi/userdata/addon_data/service.system.docker/docker/cli-plugins",
  }

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="1.7.19"
-PKG_SHA256="152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62"
+PKG_VERSION="1.7.1"
+PKG_SHA256="fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.io"
 PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
@@ -13,7 +13,7 @@ PKG_LONGDESC="A daemon to control runC, built for performance and density."
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/containerd/containerd/releases
-export PKG_GIT_COMMIT="2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41"
+PKG_GIT_COMMIT="78f51771157abb6c9ed224c22013cdf09962315d"
 
 pre_make_target() {
 
@@ -30,8 +30,6 @@ pre_make_target() {
     mv ${PKG_BUILD}/vendor ${GOPATH}/src
   fi
 
-  mv ${GOPATH}/src/github.com/containerd/containerd/api ${PKG_BUILD}/api-vendor-duplicate
-  rmdir ${GOPATH}/src/github.com/containerd/containerd
   ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd
 }
 

packages/addons/addon-depends/docker/ctop/package.mk

@@ -12,7 +12,7 @@ PKG_LONGDESC="Top-like interface for container metrics"
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/bcicen/ctop/releases
-export PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
+PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
 
 pre_make_target() {
   go_configure

packages/addons/addon-depends/docker/moby/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="moby"
-PKG_VERSION="27.0.3"
-PKG_SHA256="db02d9b5d98e85284538d6ead43b549c025acf937e98c09d18395bb331c1e607"
+PKG_VERSION="23.0.6"
+PKG_SHA256="3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e"
 PKG_LICENSE="ASL"
 PKG_SITE="https://mobyproject.org/"
 PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
@@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/moby/moby
-export PKG_GIT_COMMIT="662f78c0b1bb5114172427cfcb40491d73159be2"
+export PKG_GIT_COMMIT="9dbdbd4b6d7681bd18c897a6ba0376073c2a72ff"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \
@@ -40,7 +40,7 @@ EOF
   GO111MODULE=auto ${GOLANG} mod tidy -modfile 'vendor.mod' -compat 1.18
   GO111MODULE=auto ${GOLANG} mod vendor -modfile vendor.mod
 
-  source hack/make/.go-autogen
+  bash hack/make/.go-autogen
 }
 
 make_target() {

packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch

@@ -4,9 +4,9 @@
 #
 #
 diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
---- a/cmd/dockerd/daemon_unix.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/cmd/dockerd/daemon_unix.go	2024-01-06 03:43:42.144311172 +0000
-@@ -23,7 +23,7 @@
+--- a/cmd/dockerd/daemon_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/cmd/dockerd/daemon_unix.go	2022-06-07 14:28:05.510327911 -0700
+@@ -25,7 +25,7 @@
  
  func getDefaultDaemonConfigDir() (string, error) {
  	if !honorXDG {
@@ -15,53 +15,32 @@ diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
  	}
  	// NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because
  	// ~/.docker was not designed to store daemon configurations.
-diff -Naur a/cmd/dockerd/options.go b/cmd/dockerd/options.go
---- a/cmd/dockerd/options.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/cmd/dockerd/options.go	2024-01-06 03:43:42.144311172 +0000
-@@ -39,7 +39,7 @@
- 	//
- 	//   - DOCKER_CONFIG only affects TLS certificates, but does not change the
- 	//     location for the actual *daemon configuration* (which defaults to
--	//     "/etc/docker/daemon.json").
-+	//     "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json").
- 	//   - If no value is set, configDir uses "~/.docker/" as default, but does
- 	//     not take $XDG_CONFIG_HOME into account (it uses pkg/homedir.Get, which
- 	//     is not XDG_CONFIG_HOME-aware).
-@@ -52,7 +52,7 @@
- 	// We should:
- 	//
- 	//   - deprecate DOCKER_CONFIG for the daemon
--	//   - decide where the TLS certs should live by default ("/etc/docker/"?)
-+	//   - decide where the TLS certs should live by default ("/storage/.kodi/userdata/addon_data/service.system.docker/config/"?)
- 	//   - look at "when" (and when _not_) XDG_CONFIG_HOME should be used. Its
- 	//     needed for rootless, but perhaps could be used for non-rootless(?)
- 	//   - When changing  the location for TLS config, (ideally) they should
 diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go
---- a/integration/plugin/authz/authz_plugin_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration/plugin/authz/authz_plugin_test.go	2024-01-06 03:43:42.100977532 +0000
+--- a/integration/plugin/authz/authz_plugin_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration/plugin/authz/authz_plugin_test.go	2022-06-07 14:28:05.570328822 -0700
 @@ -56,15 +56,15 @@
- 
  	ctrl = &authorizationController{}
+ 	teardown := setupTest(t)
  
--	err := os.MkdirAll("/etc/docker/plugins", 0o755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
  	assert.NilError(t, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", testAuthZPlugin)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", testAuthZPlugin)
- 	err = os.WriteFile(fileName, []byte(server.URL), 0o644)
+ 	err = os.WriteFile(fileName, []byte(server.URL), 0644)
  	assert.NilError(t, err)
  
- 	t.Cleanup(func() {
+ 	return func() {
 -		err := os.RemoveAll("/etc/docker/plugins")
 +		err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
  		assert.NilError(t, err)
- 		ctrl = nil
- 	})
+ 
+ 		teardown()
 diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go
---- a/integration/plugin/graphdriver/external_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration/plugin/graphdriver/external_test.go	2024-01-06 03:43:42.100977532 +0000
-@@ -87,7 +87,7 @@
+--- a/integration/plugin/graphdriver/external_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration/plugin/graphdriver/external_test.go	2022-06-07 14:28:05.570328822 -0700
+@@ -80,7 +80,7 @@
  
  	sserver.Close()
  	jserver.Close()
@@ -70,37 +49,37 @@ diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugi
  	assert.NilError(t, err)
  }
  
-@@ -351,10 +351,10 @@
+@@ -345,10 +345,10 @@
  		respond(w, &graphDriverResponse{Size: size})
  	})
  
--	err = os.MkdirAll("/etc/docker/plugins", 0o755)
-+	err = os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
+-	err = os.MkdirAll("/etc/docker/plugins", 0755)
++	err = os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
  	assert.NilError(t, err)
  
 -	specFile := "/etc/docker/plugins/" + name + "." + ext
 +	specFile := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/" + name + "." + ext
- 	err = os.WriteFile(specFile, b, 0o644)
+ 	err = os.WriteFile(specFile, b, 0644)
  	assert.NilError(t, err)
  }
 diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integration-cli/docker_cli_external_volume_driver_test.go
---- a/integration-cli/docker_cli_external_volume_driver_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration-cli/docker_cli_external_volume_driver_test.go	2024-01-06 03:43:42.487646940 +0000
-@@ -262,10 +262,10 @@
+--- a/integration-cli/docker_cli_external_volume_driver_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration-cli/docker_cli_external_volume_driver_test.go	2022-06-07 14:28:05.556328610 -0700
+@@ -258,10 +258,10 @@
  		send(w, `{"Capabilities": { "Scope": "global" }}`)
  	})
  
--	err := os.MkdirAll("/etc/docker/plugins", 0o755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
  	assert.NilError(c, err)
  
--	err = os.WriteFile("/etc/docker/plugins/"+name+".spec", []byte(s.Server.URL), 0o644)
-+	err = os.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/"+name+".spec", []byte(s.Server.URL), 0o644)
+-	err = os.WriteFile("/etc/docker/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
++	err = os.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
  	assert.NilError(c, err)
  	return s
  }
-@@ -273,7 +273,7 @@
- func (s *DockerExternalVolumeSuite) TearDownSuite(ctx context.Context, c *testing.T) {
+@@ -269,7 +269,7 @@
+ func (s *DockerExternalVolumeSuite) TearDownSuite(c *testing.T) {
  	s.volumePlugin.Close()
  
 -	err := os.RemoveAll("/etc/docker/plugins")
@@ -108,37 +87,37 @@ diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integra
  	assert.NilError(c, err)
  }
  
-@@ -367,7 +367,7 @@
+@@ -359,7 +359,7 @@
  
  // Make sure a request to use a down driver doesn't block other requests
  func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *testing.T) {
 -	specPath := "/etc/docker/plugins/down-driver.spec"
 +	specPath := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/down-driver.spec"
- 	err := os.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0o644)
+ 	err := os.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
  	assert.NilError(c, err)
  	defer os.RemoveAll(specPath)
 diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
---- a/integration-cli/docker_cli_network_unix_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration-cli/docker_cli_network_unix_test.go	2024-01-06 03:43:42.487646940 +0000
-@@ -201,14 +201,14 @@
+--- a/integration-cli/docker_cli_network_unix_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration-cli/docker_cli_network_unix_test.go	2022-06-07 14:28:05.558328640 -0700
+@@ -196,14 +196,14 @@
  		}
  	})
  
--	err := os.MkdirAll("/etc/docker/plugins", 0o755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
  	assert.NilError(c, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
- 	err = os.WriteFile(fileName, []byte(url), 0o644)
+ 	err = os.WriteFile(fileName, []byte(url), 0644)
  	assert.NilError(c, err)
  
 -	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
 +	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
- 	err = os.WriteFile(ipamFileName, []byte(url), 0o644)
+ 	err = os.WriteFile(ipamFileName, []byte(url), 0644)
  	assert.NilError(c, err)
  }
-@@ -220,7 +220,7 @@
+@@ -215,7 +215,7 @@
  
  	s.server.Close()
  
@@ -148,27 +127,27 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  }
  
 diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
---- a/integration-cli/docker_cli_swarm_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration-cli/docker_cli_swarm_test.go	2024-01-06 03:43:42.494313654 +0000
-@@ -793,14 +793,14 @@
+--- a/integration-cli/docker_cli_swarm_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration-cli/docker_cli_swarm_test.go	2022-06-07 14:28:05.561328685 -0700
+@@ -770,14 +770,14 @@
  		}
  	})
  
--	err := os.MkdirAll("/etc/docker/plugins", 0o755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
  	assert.NilError(c, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
- 	err = os.WriteFile(fileName, []byte(url), 0o644)
+ 	err = os.WriteFile(fileName, []byte(url), 0644)
  	assert.NilError(c, err)
  
 -	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
 +	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
- 	err = os.WriteFile(ipamFileName, []byte(url), 0o644)
+ 	err = os.WriteFile(ipamFileName, []byte(url), 0644)
  	assert.NilError(c, err)
  }
-@@ -813,7 +813,7 @@
+@@ -789,7 +789,7 @@
  	setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin)
  	defer func() {
  		s.server.Close()
@@ -178,8 +157,8 @@ diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_c
  	}()
  
 diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remote/driver_test.go
---- a/libnetwork/drivers/remote/driver_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/libnetwork/drivers/remote/driver_test.go	2024-01-06 03:43:42.480980226 +0000
+--- a/libnetwork/drivers/remote/driver_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/libnetwork/drivers/remote/driver_test.go	2022-06-07 14:28:05.586329065 -0700
 @@ -41,7 +41,7 @@
  }
  
@@ -190,8 +169,8 @@ diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remot
  		specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
  	}
 diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/remote_test.go
---- a/libnetwork/ipams/remote/remote_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/libnetwork/ipams/remote/remote_test.go	2024-01-06 03:43:42.470980156 +0000
+--- a/libnetwork/ipams/remote/remote_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/libnetwork/ipams/remote/remote_test.go	2022-06-07 14:28:05.591329141 -0700
 @@ -36,7 +36,7 @@
  }
  
@@ -202,54 +181,29 @@ diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/re
  		specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
  	}
 diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_test.go
---- a/libnetwork/libnetwork_unix_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/libnetwork/libnetwork_unix_test.go	2024-01-06 03:43:42.484313584 +0000
-@@ -2,4 +2,4 @@
+--- a/libnetwork/libnetwork_unix_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/libnetwork/libnetwork_unix_test.go	2022-06-07 14:28:05.592329156 -0700
+@@ -3,4 +3,4 @@
  
  package libnetwork_test
  
 -var specPath = "/etc/docker/plugins"
 +var specPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
-diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
---- a/pkg/plugins/discovery.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/pkg/plugins/discovery.go	2024-01-06 03:43:42.107644246 +0000
-@@ -120,12 +120,12 @@
- //
- // On Unix in non-rootless mode:
- //
--//   - "/etc/docker/plugins"
-+//   - "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
- //   - "/usr/lib/docker/plugins"
- //
- // On Unix in rootless-mode:
- //
--//   - "$XDG_CONFIG_HOME/docker/plugins" (or "/etc/docker/plugins" if $XDG_CONFIG_HOME is not set)
-+//   - "$XDG_CONFIG_HOME/docker/plugins" (or "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins" if $XDG_CONFIG_HOME is not set)
- //   - "$HOME/.local/lib/docker/plugins" (pr "/usr/lib/docker/plugins" if $HOME is set)
- func SpecsPaths() []string {
- 	return specsPaths()
 diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
---- a/pkg/plugins/discovery_unix.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/pkg/plugins/discovery_unix.go	2024-01-06 03:43:42.107644246 +0000
-@@ -12,7 +12,7 @@
- 	if configHome, err := homedir.GetConfigHome(); err != nil {
- 		return filepath.Join(configHome, "docker/plugins")
- 	}
--	return "/etc/docker/plugins"
-+	return "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
- }
+--- a/pkg/plugins/discovery_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/pkg/plugins/discovery_unix.go	2022-06-07 14:28:05.615329505 -0700
+@@ -9,7 +9,7 @@
+ 	"github.com/docker/docker/pkg/rootless"
+ )
  
- func rootlessLibPluginsPath() string {
-@@ -27,5 +27,5 @@
- 	if rootless.RunningWithRootlessKit() {
- 		return []string{rootlessConfigPluginsPath(), rootlessLibPluginsPath()}
- 	}
--	return []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"}
-+	return []string{"/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", "/usr/lib/docker/plugins"}
- }
+-const globalConfigPluginsPath = "/etc/docker/plugins"
++const globalConfigPluginsPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
+ const globalLibPluginsPath = "/usr/lib/docker/plugins"
+ 
+ var globalSpecsPaths = []string{globalConfigPluginsPath, globalLibPluginsPath}
 diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
---- a/pkg/plugins/plugins.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/pkg/plugins/plugins.go	2024-01-06 03:43:42.107644246 +0000
+--- a/pkg/plugins/plugins.go	2022-06-03 10:30:24.000000000 -0700
++++ b/pkg/plugins/plugins.go	2022-06-07 14:28:05.616329521 -0700
 @@ -4,7 +4,7 @@
  // Docker discovers plugins by looking for them in the plugin directory whenever
  // a user or container tries to use one by name. UNIX domain socket files must
@@ -260,9 +214,9 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
  // its name if it exists.
  //
 diff -Naur a/registry/config_unix.go b/registry/config_unix.go
---- a/registry/config_unix.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/registry/config_unix.go	2024-01-06 03:43:42.487646940 +0000
-@@ -5,7 +5,7 @@
+--- a/registry/config_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/registry/config_unix.go	2022-06-07 14:28:05.626329672 -0700
+@@ -6,7 +6,7 @@
  // defaultCertsDir is the platform-specific default directory where certificates
  // are stored. On Linux, it may be overridden through certsDir, for example, when
  // running in rootless mode.
@@ -271,15 +225,15 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
  
  // cleanPath is used to ensure that a directory name is valid on the target
  // platform. It will be passed in something *similar* to a URL such as
-diff -Naur a/registry/search_endpoint_v1.go b/registry/search_endpoint_v1.go
---- a/registry/search_endpoint_v1.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/registry/search_endpoint_v1.go	2024-01-06 03:43:42.487646940 +0000
-@@ -54,7 +54,7 @@
+diff -Naur a/registry/endpoint_v1.go b/registry/endpoint_v1.go
+--- a/registry/endpoint_v1.go	2022-06-03 10:30:24.000000000 -0700
++++ b/registry/endpoint_v1.go	2022-06-07 14:28:05.627329688 -0700
+@@ -63,7 +63,7 @@
  		if endpoint.IsSecure {
  			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
- 			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fall back to HTTP.
--			return nil, invalidParamf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /etc/docker/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
-+			return nil, invalidParamf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /storage/.kodi/userdata/addon_data/service.system.docker/config/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
+ 			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.
+-			return invalidParamf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /etc/docker/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
++			return invalidParamf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /storage/.kodi/userdata/addon_data/service.system.docker/config/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
  		}
  
- 		// registry is insecure and HTTPS failed, fallback to HTTP.
+ 		// If registry is insecure and HTTPS failed, fallback to HTTP.

packages/addons/addon-depends/docker/moby/patches/moby-002-use-unconfined-seccomp-profile-as-default.patch

@@ -1,8 +1,8 @@
 --- a/daemon/config/config.go	2022-06-03 10:30:24.000000000 -0700
 +++ b/daemon/config/config.go	2022-06-07 14:29:36.755713207 -0700
-@@ -60,7 +60,7 @@
- 	// by [minAPIVersion].
- 	defaultMinAPIVersion = "1.24"
+@@ -59,7 +59,7 @@
+ 	LinuxV2RuntimeName = "io.containerd.runc.v2"
+ 
  	// SeccompProfileDefault is the built-in default seccomp profile.
 -	SeccompProfileDefault = "builtin"
 +	SeccompProfileDefault = "unconfined"
@@ -11,10 +11,10 @@
  	SeccompProfileUnconfined = "unconfined"
 --- a/daemon/daemon_unix.go	2022-06-03 10:30:24.000000000 -0700
 +++ b/daemon/daemon_unix.go	2022-06-07 14:34:55.315558083 -0700
-@@ -1463,8 +1463,6 @@
+@@ -1711,8 +1711,6 @@
  
- func (daemon *Daemon) setupSeccompProfile(cfg *config.Config) error {
- 	switch profile := cfg.SeccompProfile; profile {
+ func (daemon *Daemon) setupSeccompProfile() error {
+ 	switch profile := daemon.configStore.SeccompProfile; profile {
 -	case "", config.SeccompProfileDefault:
 -		daemon.seccompProfilePath = config.SeccompProfileDefault
  	case config.SeccompProfileUnconfined:

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aspnet6-runtime"
-PKG_VERSION="6.0.32"
+PKG_VERSION="6.0.24"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
 PKG_DEPENDS_TARGET="toolchain"
@@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual"
 
 case "${ARCH}" in
   "aarch64")
-    PKG_SHA256="70d7035083bc2b330709eb6208d082a3cfc18839425b31bccff032aadc66c212"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/7b3ead1a-441d-42b9-ac91-1253ed8aee48/044d517eaff9f65e18e3e27f4d825d34/aspnetcore-runtime-6.0.32-linux-arm64.tar.gz"
+    PKG_SHA256="ee6b660b3c8b3fb88eb64690ac78a47752dae68c21647fccdc5f810bc68829ab"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d562ba2b-8e2c-48e5-9853-f8616a9cb4e4/f4e251ba67b718083c28017e3b0c6349/aspnetcore-runtime-6.0.24-linux-arm64.tar.gz"
     ;;
   "arm")
-    PKG_SHA256="1500178b218dc218c1465b9b60b248c8780dccb15b62a56641d03c8d816eff16"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d5106f1a-d140-4c8c-b480-001824b72768/7e9cf426bf45040eadfcc8bb20227b6d/aspnetcore-runtime-6.0.32-linux-arm.tar.gz"
+    PKG_SHA256="634b0ecd7312e8a46adedcbff6e1b23e514fa153f7135a6b9f6aefb5851f9d88"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/9c00fe25-e1e0-4390-9061-77d07e95356f/09886ffeaed522c3fa8803e879ce070c/aspnetcore-runtime-6.0.24-linux-arm.tar.gz"
     ;;
   "x86_64")
-    PKG_SHA256="ee937f7c03f4e908c3dcb0f1c063bd911bc08f7a30d49ea41f084fa403b923f0"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/99f90118-96b4-4d06-97ad-d779715319f6/aecf393f9b9d362b66b93a47d90cfa8d/aspnetcore-runtime-6.0.32-linux-x64.tar.gz"
+    PKG_SHA256="022dc914af7490bcd2d885edeb5d4c1faa4b771b503b8059d5181f130191cf2c"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/8f5a65c0-9bc8-497d-9ce2-4658c461dc55/b6c01c3cd060552d987501ba6bbde09f/aspnetcore-runtime-6.0.24-linux-x64.tar.gz"
     ;;
 esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

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

@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="aspnet8-runtime"
-PKG_VERSION="8.0.7"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="ASP.NET Core Runtime enables you to run existing web/server applications."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="61a21ef486e0075ba2c68aaceee0429d731414611d2291e1c7056cd3e5d955bb"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/421d499f-85cb-43dd-97b2-8ebfd06dda8a/61b03be4662125e4af044c7881e66f0e/aspnetcore-runtime-8.0.7-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="9ad9398327a6cb239e7bda239f29a9db64838676113d5a2e54d9319b443f52e7"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d37fc703-70c6-46f2-a5a1-b60f45fd71d0/6a74aa0bb89feb7f795df1ea92d030bf/aspnetcore-runtime-8.0.7-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="e55bc969b1cb58f96b927127b5c448a15ea844cfc94387f6e35ab585d94abc93"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/06cbb934-ef54-4627-8848-a24a879f2130/52d4247944cee754ec8f4fd617d502a6/aspnetcore-runtime-8.0.7-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/dtv-scan-tables/package.mk

@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="dtv-scan-tables"
-PKG_VERSION="2022-04-30-57ed29822750"
-PKG_SHA256="6a6268aa392459378fa3a13922fc015a3fa63ff822f4b0d64d33d71350a6ec9e"
-PKG_LICENSE="GPL"
-PKG_SITE="https://git.linuxtv.org/dtv-scan-tables.git"
-PKG_URL="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Digital TV scan tables."
-PKG_TOOLCHAIN="manual"
-PKG_BUILD_FLAGS="-sysroot"
-
-makeinstall_target() {
-  make -C share/dvb install DATADIR=${INSTALL}/usr/share
-}

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/patches/dvb-apps-60-compat-fixes.patch

@@ -1,37 +0,0 @@
-From e6ff7da39edd44fe6bb14bcba29c0fc5a02957a8 Mon Sep 17 00:00:00 2001
-From: CrazyCat <crazycat69@narod.ru>
-Date: Sun, 20 May 2018 21:22:24 +0300
-Subject: [PATCH] Some compat fixes.
-
----
- lib/libdvbapi/dvbnet.c   | 4 ++++
- lib/libdvbapi/dvbvideo.c | 1 -
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/libdvbapi/dvbnet.c b/lib/libdvbapi/dvbnet.c
-index 25c09ad..7ddaabe 100644
---- a/lib/libdvbapi/dvbnet.c
-+++ b/lib/libdvbapi/dvbnet.c
-@@ -29,6 +29,10 @@
- #include <errno.h>
- #include "dvbnet.h"
- 
-+#ifndef DVB_NET_FEEDTYPE_GSE
-+#define DVB_NET_FEEDTYPE_GSE 2  /* generic stream  encapsulation */
-+#endif
-+
- int dvbnet_open(int adapter, int netdeviceid)
- {
- 	char filename[PATH_MAX+1];
-diff --git a/lib/libdvbapi/dvbvideo.c b/lib/libdvbapi/dvbvideo.c
-index f1ffbe8..18a4d3a 100644
---- a/lib/libdvbapi/dvbvideo.c
-+++ b/lib/libdvbapi/dvbvideo.c
-@@ -26,7 +26,6 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <linux/types.h>
--#include <linux/dvb/video.h>
- #include <errno.h>
- #include "dvbvideo.h"
- 

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/patches/dvb-apps-61-compat-fixes.patch

@@ -1,49 +0,0 @@
---- a/lib/libdvbapi/dvbaudio.c	2021-07-27 22:57:28.723492743 +1000
-+++ b/lib/libdvbapi/dvbaudio.c	2021-07-27 23:07:08.672581030 +1000
-@@ -25,10 +25,13 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
--#include <linux/dvb/audio.h>
- #include <errno.h>
- #include "dvbaudio.h"
- 
-+#ifndef AUDIO_SET_BYPASS_MODE
-+#define AUDIO_SET_BYPASS_MODE	_IO('o', 8)
-+#endif
-+
- int dvbaudio_open(int adapter, int audiodeviceid)
- {
- 	char filename[PATH_MAX+1];
---- a/test/test_av.c	2021-07-27 23:11:51.105535377 +1000
-+++ b/test/test_av.c	2021-07-27 23:12:05.035519211 +1000
-@@ -31,8 +31,6 @@
- #include <unistd.h>
- 
- #include <linux/types.h>
--#include <linux/dvb/audio.h>
--#include <linux/dvb/video.h>
- 
- int audioStop(int fd, char *arg)
- {
---- a/util/szap/szap.c	2021-07-27 23:26:32.667530471 +1000
-+++ b/util/szap/szap.c	2021-07-27 23:26:46.154138354 +1000
-@@ -46,7 +46,6 @@
- 
- #include <linux/dvb/frontend.h>
- #include <linux/dvb/dmx.h>
--#include <linux/dvb/audio.h>
- #include "lnb.h"
- #include "util.h"
- 
-@@ -57,6 +56,10 @@
- #define FALSE (1==0)
- #endif
- 
-+#ifndef AUDIO_SET_BYPASS_MODE
-+#define AUDIO_SET_BYPASS_MODE  _IO('o', 8)
-+#endif
-+
- /* location of channel list file */
- #define CHANNEL_FILE "channels.conf"
- 

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvbsnoop"
-PKG_VERSION="72a64d59b6b00272fbfbeebdc9da9d6e8ace67da" # 2021-12-12
-PKG_SHA256="7364c04b05e3ce311c14544fd01ca8ad846f4cfab5951815bdec64fe6cc35a0c"
+PKG_VERSION="badf61fcdab1177c1162747be06d035a2b671e9b"
+PKG_SHA256="7f0f5d9ca15c5caae3ca249d95a5fc30cececd16f63e00a1404e0d2368ce56fa"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dvbsnoop.sourceforge.net/"
 PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="szap-s2"
-PKG_VERSION="c4e6ff29c7371c42653edce152d50d18066a4ae7"
-PKG_SHA256="4c512c891fa4a1e4326632956b60a96eca3d1341f862ae10c1ef2c98676e4c4b"
+PKG_VERSION="69ff3584caf9b46f7a551b39b9f9956f8461377c"
+PKG_SHA256="eea8d99d2d5d6403d624acdd9df908a2dd7767dd5469b44e9a281ff863096b32"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/crazycat69/szap-s2"
-PKG_URL="https://github.com/crazycat69/szap-s2/archive/${PKG_VERSION}.tar.gz"
+PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
+PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
 PKG_BUILD_FLAGS="-sysroot"

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

@@ -3,15 +3,24 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="faad2"
-PKG_VERSION="2.11.1"
-PKG_SHA256="72dbc0494de9ee38d240f670eccf2b10ef715fd0508c305532ca3def3225bb06"
+PKG_VERSION="2.10.1"
+PKG_SHA256="4c16c71295ca0cbf7c3dfe98eb11d8fa8d0ac3042e41604cfd6cc11a408cf264"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/knik0/faad2/"
 PKG_URL="https://github.com/knik0/faad2/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="An MPEG-4 AAC decoder."
+PKG_TOOLCHAIN="configure"
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --without-drm \
+                           --with-gnu-ld \
+                           --without-mpeg4ip \
+                           --without-xmms"
+pre_configure_target() {
+  ./bootstrap
+}
 
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/bin

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

@@ -1,9 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x264"
-PKG_VERSION="7ed753b10a61d0be95f683289dfb925b800b0676"
-PKG_SHA256="1bdf238ef065e711c4cf436046917de4a7a3e920a0b0ae1fa0f528ab23f17b12"
+PKG_VERSION="baee400fa9ced6f5481a728138fed6e867b0ff7f" # r3095 stable 2022-06-01
+PKG_SHA256="ce6623b8b289765daee04a297c2fd1a293cb2565a1749c76d66c8d72c7ddc1ab"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
 PKG_URL="https://code.videolan.org/videolan/x264/-/archive/${PKG_VERSION}/x264-${PKG_VERSION}.tar.bz2"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x265"
-PKG_VERSION="3.6"
-PKG_SHA256="eccd9ee41ba64c55bb906ea79d28b563fdfb4fd3b7626746a0e5f8c9581491b5"
+PKG_VERSION="3.5"
+PKG_SHA256="7ebc5d2de6ce5dfefb434e422e59a0c4715fe939c784ac2f3d41af5775adc706"
 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-only
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="6.0.1"
-PKG_SHA256="9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623"
-PKG_LICENSE="GPL-3.0-only"
+PKG_VERSION="4.4.3"
+PKG_SHA256="6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e"
+PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis libxml2 opus x264 zlib"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-sysroot"
 
@@ -64,9 +64,9 @@ pre_configure_target() {
 
     PKG_FFMPEG_X26x_GENERIC="\
     --enable-libx264 \
-    --enable-encoder=libx264 \
+    --enable-encoder=x264 \
     --enable-libx265 \
-    --enable-encoder=libx265"
+    --enable-encoder=x265"
   fi
 
 # Encoders
@@ -134,6 +134,7 @@ configure_target() {
     ${PKG_FFMPEG_ENCODERS} \
     \
     `#General options` \
+    --enable-avresample \
     --disable-lzma \
     --disable-alsa \
     ${PKG_FFMPEG_X11_GRAB} \
@@ -162,7 +163,6 @@ configure_target() {
     --enable-pic \
     --disable-gnutls \
     --enable-openssl \
-    --enable-libxml2 \
     \
     `#Advanced options` \
     --disable-hardcoded-tables \

packages/addons/addon-depends/ffmpegx/patches/ffmpeg-openssl3.patch

@@ -0,0 +1,44 @@
+From 1d23e125b6f76e74b754560c3b6931507cacddce Mon Sep 17 00:00:00 2001
+From: Timo Rothenpieler <timo@rothenpieler.org>
+Date: Tue, 7 Sep 2021 19:35:31 +0200
+Subject: [PATCH] configure: account for openssl3 license change
+
+---
+ configure | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index c87a010387..ed7345b2c1 100755
+--- a/configure
++++ b/configure
+@@ -1765,7 +1765,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+ EXTERNAL_LIBRARY_NONFREE_LIST="
+     decklink
+     libfdk_aac
+-    openssl
+     libtls
+ "
+ 
+@@ -1857,6 +1856,7 @@ EXTERNAL_LIBRARY_LIST="
+     mediacodec
+     openal
+     opengl
++    openssl
+     pocketsphinx
+     vapoursynth
+ "
+@@ -6572,7 +6572,10 @@ enabled omx_rpi           && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR
+                                die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
+                              enable omx
+ enabled omx               && require_headers OMX_Core.h
+-enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
++enabled openssl           && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl &&
++                                 { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
++                               { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
++                               check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
+                                check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
+                                check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+-- 
+2.34.1
+

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.22.4"
-PKG_SHA256="8e035e7418ae53a20a4c9eedc906e5c43e8c31f5bfc044d2f9f70dc409cd88b1"
+PKG_VERSION="1.20.3"
+PKG_SHA256="991a67cecebb7b9b1237fdbca76c4754a9f5e1669d5d49b58a9931813047e905"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
@@ -13,14 +13,14 @@ PKG_LONGDESC="An programming language that makes it easy to build simple, reliab
 PKG_TOOLCHAIN="manual"
 
 configure_host() {
+  export GOOS=linux
   export GOROOT_FINAL=${TOOLCHAIN}/lib/golang
-  if [ -x /usr/local/go/bin/go ]; then
-    export GOROOT_BOOTSTRAP=/usr/local/go
-  elif [ -x /usr/lib/go/bin/go ]; then
+  if [ -x /usr/lib/go/bin/go ]; then
     export GOROOT_BOOTSTRAP=/usr/lib/go
   else
     export GOROOT_BOOTSTRAP=/usr/lib/golang
   fi
+  export GOARCH=amd64
 
   if [ ! -d ${GOROOT_BOOTSTRAP} ]; then
     cat <<EOF

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

@@ -2,11 +2,9 @@ diff --git a/src/crypto/x509/root_linux.go b/src/crypto/x509/root_linux.go
 index ad6ce5cae7..763c686fed 100644
 --- a/src/crypto/x509/root_linux.go
 +++ b/src/crypto/x509/root_linux.go
-@@ -20,6 +20,7 @@ var certDirectories = []string{
- var certDirectories = []string{
- 	"/etc/ssl/certs",     // SLES10/SLES11, https://golang.org/issue/12139
- 	"/etc/pki/tls/certs", // Fedora/RHEL
-+	"/etc/ssl",           // LibreELEC
+@@ -20,4 +20,5 @@ var certDirectories = []string{
+ 	"/etc/ssl/certs",               // SLES10/SLES11, https://golang.org/issue/12139
+ 	"/etc/pki/tls/certs",           // Fedora/RHEL
+ 	"/system/etc/security/cacerts", // Android
++	"/etc/ssl",                     // LibreELEC
  }
- 
- func init() {

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="icu"
-PKG_VERSION="75-1"
-PKG_SHA256="925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e"
+PKG_VERSION="72.1"
+PKG_SHA256="43cbad628d98f37a3f95f6c34579f9144ef4bde60248fa6004a4f006d7487e69"
 PKG_LICENSE="Custom"
 PKG_SITE="https://icu.unicode.org"
-PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain icu:host"
 PKG_LONGDESC="International Components for Unicode library."

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

@@ -3,12 +3,12 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="apache-ant"
-PKG_VERSION="1.10.14"
-PKG_SHA256="a0456ecbf934b41dca74747413f2da7eafe40355fbdf5bfd38d8f3713dd828cd"
+PKG_VERSION="1.10.12"
+PKG_SHA256="6115c940367e50755cf806de5816f20a1db1321b1cb734e2c34ab20ef6682b9b"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
-PKG_URL="https://archive.apache.org/dist/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
-PKG_DEPENDS_UNPACK="jdk-${MACHINE_HARDWARE_NAME}-zulu"
+PKG_URL="https://downloads.apache.org/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
+PKG_DEPENDS_UNPACK="jdk-x86_64-zulu"
 PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
 PKG_TOOLCHAIN="manual"
 

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

@@ -7,7 +7,7 @@ PKG_NAME="jre-libbluray"
 PKG_DEPENDS_TARGET+=" apache-ant:host"
 PKG_LONGDESC="libbluray jar for BD-J menus"
 PKG_URL=""
-PKG_DEPENDS_UNPACK+=" jdk-${MACHINE_HARDWARE_NAME}-zulu libbluray"
+PKG_DEPENDS_UNPACK+=" jdk-x86_64-zulu libbluray"
 PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches"
 PKG_BUILD_FLAGS="-sysroot"
 
@@ -17,7 +17,7 @@ unpack() {
 }
 
 pre_configure_target() {
-  export JAVA_HOME="$(get_build_dir jdk-${MACHINE_HARDWARE_NAME}-zulu)"
+  export JAVA_HOME="$(get_build_dir jdk-x86_64-zulu)"
 
   # build also jar
   PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET/disable-bdjava-jar/enable-bdjava-jar}"

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

@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libimobiledevice-glue"
-PKG_VERSION="1.2.0"
-PKG_SHA256="ff9cbc240c9780edfa43914a057b86362054053721b65fb04f54a25023b92b62"
-PKG_LICENSE="LGPL-2.1"
-PKG_SITE="http://www.libimobiledevice.org"
-PKG_URL="https://github.com/libimobiledevice/libimobiledevice-glue/releases/download/${PKG_VERSION}/libimobiledevice-glue-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libplist"
-PKG_LONGDESC="A library with common code used by libraries and tools around the libimobiledevice project"
-PKG_TOOLCHAIN="autotools"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared \
-                           --disable-largefile"
-
-post_configure_target() {
-  libtool_remove_rpath libtool
-}
-
-post_makeinstall_target() {
-  mkdir -p "${SYSROOT_PREFIX}/usr/include/lib/libimobiledevice-glue"
-    cp ${PKG_BUILD}/include/libimobiledevice-glue/utils.h "${SYSROOT_PREFIX}/usr/include/libimobiledevice-glue"
-}

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

@@ -2,12 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libimobiledevice"
-PKG_VERSION="73b6fd183872096f20e6d1007429546a317a7cb1"
-PKG_SHA256="854cb9e2671fdf5a2fca609e5e247ab498218b1659a2e5e2b47cf7c1392cec46"
+PKG_VERSION="1.3.0"
+PKG_SHA256="53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libimobiledevice.org"
-PKG_URL="https://github.com/libimobiledevice/libimobiledevice/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libimobiledevice-glue libplist libusbmuxd openssl"
+PKG_URL="https://github.com/libimobiledevice/libimobiledevice/releases/download/${PKG_VERSION}/libimobiledevice-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libusbmuxd openssl"
 PKG_LONGDESC="A cross-platform software library that talks the protocols to support Apple devices."
 PKG_TOOLCHAIN="autotools"
 
@@ -16,11 +16,11 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --without-cython \
                            --disable-largefile"
 
-configure_package() {
-  # if using a git hash as a package version - set RELEASE_VERSION
-  export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}"
-}
-
 post_configure_target() {
   libtool_remove_rpath libtool
 }
+
+post_makeinstall_target() {
+  mkdir -p "${SYSROOT_PREFIX}/usr/include/lib/libimobiledevice"
+    cp ${PKG_BUILD}/common/utils.h "${SYSROOT_PREFIX}/usr/include/libimobiledevice"
+}

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmpdclient"
-PKG_VERSION="2.22"
-PKG_SHA256="eac15b82b5ba5ed0648af580221eb74657394f7fe768e966d9e9ebb27435429f"
+PKG_VERSION="2.20"
+PKG_SHA256="18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz"

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

@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="librepfunc"
-PKG_VERSION="1.10.0"
-PKG_SHA256="cf44d9c2e70b06318eda5a6f9e0449f70d1ac71de577c3cc92f513893952a896"
-PKG_LICENSE="GPL-2.0"
-PKG_SITE="https://github.com/wirbel-at-vdr-portal/librepfunc"
-PKG_URL="https://github.com/wirbel-at-vdr-portal/librepfunc/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="librepfunc - a collection of functions, classes used by wirbel-at-vdr-portal"
-PKG_BUILD_FLAGS="-sysroot"
-
-pre_configure_target() {
-  sed -i -e 's/^install:/install-shared:/' -e 's/^install-static:/install:/' Makefile
-}

packages/addons/addon-depends/librepfunc/patches/fix-cross-compile.patch

@@ -1,20 +0,0 @@
---- a/Makefile	2023-11-12 14:10:50.207821109 +0000
-+++ b/Makefile	2023-11-12 14:14:02.385846184 +0000
-@@ -32,7 +32,7 @@
- #/******************************************************************************
- # * if you prefer verbose non-coloured build messages, remove the '@' here:
- # *****************************************************************************/
--CXX = @g++
-+CXX ?= @g++
- CXXFLAGS += -g -O3 -fPIC -Wall -Wextra -Werror=overloaded-virtual -Wfatal-errors
- CXXFLAGS += -DVERSION=\"$(VERSION)\"
- DEFINES   = -D_POSIX_C_SOURCE
-@@ -61,7 +61,7 @@
- #/******************************************************************************
- # * programs, override if on different paths.
- # *****************************************************************************/
--AR               = @ar
-+AR              ?= @ar
- CD              ?= cd
- CP              ?= cp
- CHMOD           ?= chmod

packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="rustup.rs"
+PKG_VERSION="1.25.1"
+PKG_SHA256="4d062c77b08309bd212f22dd7da1957c1882509c478e57762f34ec4fb2884c9a"
+PKG_LICENSE="MIT"
+PKG_SITE="https://www.rust-lang.org"
+PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="The Rust toolchain installer."
+PKG_TOOLCHAIN="manual"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libseccomp"
-PKG_VERSION="2.5.5"
-PKG_SHA256="248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375"
+PKG_VERSION="2.5.4"
+PKG_SHA256="d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://github.com/seccomp/libseccomp"
 PKG_URL="https://github.com/seccomp/libseccomp/releases/download/v${PKG_VERSION}/libseccomp-${PKG_VERSION}.tar.gz"

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

@@ -2,25 +2,19 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libusbmuxd"
-PKG_VERSION="2.1.0"
-PKG_SHA256="3bda6abb2167e7818bd449aa03c5cfe175c6f965bab3979fda6d58e698df19af"
+PKG_VERSION="2.0.2"
+PKG_SHA256="cc6a808553da4efa9fa5638be256d5ae020498795d9d260d280b87074e799b20"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libimobiledevice.org"
-PKG_URL="https://github.com/libimobiledevice/libusbmuxd/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libimobiledevice-glue libplist"
+PKG_URL="https://github.com/libimobiledevice/libusbmuxd/releases/download/${PKG_VERSION}/libusbmuxd-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libplist"
 PKG_LONGDESC="A USB multiplex daemon."
-PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
                            --enable-static \
                            --disable-shared"
 
-configure_package() {
-  # if using a git hash as a package version - set RELEASE_VERSION
-  export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}"
-}
-
 post_configure_target() {
   libtool_remove_rpath libtool
 }

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libvpx"
-PKG_VERSION="1.14.1"
-PKG_SHA256="901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977"
+PKG_VERSION="1.12.0"
+PKG_SHA256="f1acc15d0fd0cb431f4bf6eac32d5e932e40ea1186fe78e074254d6d003957bb"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
 PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/mpd-mpc/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd-mpc"
-PKG_VERSION="0.35"
-PKG_SHA256="382959c3bfa2765b5346232438650491b822a16607ff5699178aa1386e3878d4"
+PKG_VERSION="0.34"
+PKG_SHA256="691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmediainfo"
-PKG_VERSION="24.06"
-PKG_SHA256="0683f28a2475dc2417205ba528debccc407da4d9fa6516eb4b75b3ff7244e96e"
+PKG_VERSION="23.07"
+PKG_SHA256="60456c8b2ab8769a6081d96fd7be86db4fe32520e4a022397cb22cacf47ce820"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="https://mediaarea.net/download/source/libmediainfo/${PKG_VERSION}/libmediainfo_${PKG_VERSION}.tar.xz"

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

@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libplacebo"
-PKG_VERSION="6.338.2"
-PKG_SHA256="2f1e624e09d72a8c9db70f910f7560e764a1c126dae42acc5b3bcef836a7aec6"
-PKG_LICENSE="LGPLv2.1"
-PKG_SITE="https://code.videolan.org/videolan/libplacebo"
-PKG_URL="https://github.com/haasn/libplacebo/archive/refs/tags/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain glad:host"
-PKG_DEPENDS_UNPACK="vulkan-headers"
-PKG_LONGDESC="Reusable library for GPU-accelerated image/video processing primitives and shaders"
-PKG_BUILD_FLAGS="-sysroot"
-
-PKG_MESON_OPTS_TARGET="-Ddefault_library=static \
-                       -Dprefer_static=true \
-                       -Dvulkan=disabled \
-                       -Dvk-proc-addr=disabled \
-                       -Dd3d11=disabled \
-                       -Dglslang=disabled \
-                       -Dshaderc=disabled \
-                       -Dlcms=disabled \
-                       -Ddovi=disabled \
-                       -Dlibdovi=disabled \
-                       -Ddemos=false"
-
-if [ "${OPENGL_SUPPORT}" = "yes" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL}"
-  PKG_MESON_OPTS_TARGET+=" -Dopengl=enabled -Dgl-proc-addr=enabled"
-else
-  PKG_MESON_OPTS_TARGET+=" -Dopengl=disabled -Dgl-proc-addr=disabled"
-fi
-
-pre_configure_target() {
-  export TARGET_CFLAGS+=" -I$(get_build_dir vulkan-headers)/include"
-}
-
-post_makeinstall_target() {
-  sed 's/^Libs:.*-lplacebo/& -lstdc++/' -i ${INSTALL}/usr/lib/pkgconfig/libplacebo.pc
-}

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mediainfo"
-PKG_VERSION="24.06"
-PKG_SHA256="32f4a82a31e386e177fdf6e4c237053e475b501089269ab2c729452a09313520"
+PKG_VERSION="23.07"
+PKG_SHA256="b6d7da9e29995fd34a22100825b843e74c32c7bc67adb01166b1beedea49f5d0"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="https://mediaarea.net/download/source/mediainfo/${PKG_VERSION}/mediainfo_${PKG_VERSION}.tar.xz"

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

@@ -2,16 +2,19 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa-demos"
-PKG_VERSION="9.0.0"
-PKG_SHA256="3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b"
+PKG_VERSION="8.4.0"
+PKG_SHA256="01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d"
 PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"
-PKG_SITE="https://www.mesa3d.org/"
-PKG_URL="https://archive.mesa3d.org/demos/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_SITE="http://www.mesa3d.org/"
+PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libX11 mesa glu glew"
 PKG_LONGDESC="Mesa 3D demos - installed are the well known glxinfo and glxgears."
+PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-sysroot"
 
+PKG_CONFIGURE_OPTS_TARGET="--without-glut"
+
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
     cp -P src/xdemos/glxdemo ${INSTALL}/usr/bin

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

@@ -2,14 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpg123"
-PKG_VERSION="1.32.6"
-PKG_SHA256="ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6"
+PKG_VERSION="1.31.3"
+PKG_SHA256="1ca77d3a69a5ff845b7a0536f783fee554e1041139a6b978f6afe14f5814ad1a"
 PKG_LICENSE="LGPLv2"
 PKG_SITE="https://www.mpg123.org/"
 PKG_URL="https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_LONGDESC="A console based real time MPEG Audio Player for Layer 1, 2 and 3."
-PKG_BUILD_FLAGS="-sysroot +pic"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --enable-static"

packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk

@@ -2,32 +2,32 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpv-drmprime"
-PKG_VERSION="0.38.0"
-PKG_SHA256="86d9ef40b6058732f67b46d0bbda24a074fae860b3eaae05bab3145041303066"
+PKG_VERSION="0.36.0"
+PKG_SHA256="29abc44f8ebee013bb2f9fe14d80b30db19b534c679056e4851ceadf5a5e8bf6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mpv.io/"
 PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa ffmpeg libass libdrm libplacebo lua52"
+PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm lua52"
 PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types."
+PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_MESON_OPTS_TARGET="--prefix=/usr \
-                        -Dlibarchive=disabled \
-                        -Dlua=enabled \
-                        -Djavascript=disabled \
-                        -Duchardet=disabled \
-                        -Drubberband=disabled \
-                        -Dlcms2=disabled \
-                        -Dvapoursynth=disabled \
-                        -Djack=disabled \
-                        -Dwayland=disabled \
-                        -Dx11=disabled \
-                        -Dvulkan=disabled \
-                        -Dcaca=disabled \
-                        -Ddrm=enabled \
-                        -Dgbm=enabled \
-                        -Degl-drm=enabled \
-                        -Dmanpage-build=disabled"
+PKG_MANUAL_OPTS_TARGET="--prefix=/usr \
+                        --disable-libarchive \
+                        --enable-lua \
+                        --disable-javascript \
+                        --disable-uchardet \
+                        --disable-rubberband \
+                        --disable-lcms2 \
+                        --disable-vapoursynth \
+                        --disable-jack \
+                        --disable-wayland \
+                        --disable-x11 \
+                        --disable-vulkan \
+                        --disable-caca \
+                        --enable-drm \
+                        --enable-gbm \
+                        --enable-egl-drm"
 
 if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
@@ -39,25 +39,40 @@ fi
 
 if [ "${VAAPI_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" libva"
-  PKG_MESON_OPTS_TARGET+=" -Dvaapi=enabled -Dvaapi-drm=enabled"
+  PKG_MANUAL_OPTS_TARGET+=" --enable-vaapi --enable-vaapi-drm"
 else
-  PKG_MESON_OPTS_TARGET+=" -Dvaapi=disabled"
+  PKG_MANUAL_OPTS_TARGET+=" --disable-vaapi"
 fi
 
 if [ "${PULSEAUDIO_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" pulseaudio"
-  PKG_MESON_OPTS_TARGET+=" -Dpulse=enabled"
+  PKG_MANUAL_OPTS_TARGET+=" --enable-pulse"
 else
-  PKG_MESON_OPTS_TARGET+=" -Dpulse=disabled"
+  PKG_MANUAL_OPTS_TARGET+=" --disable-pulse"
 fi
 
 if [ "${KODI_BLURAY_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" libbluray"
-  PKG_MESON_OPTS_TARGET+=" -Dlibbluray=enabled"
+  PKG_MANUAL_OPTS_TARGET+=" --enable-libbluray"
 else
-  PKG_MESON_OPTS_TARGET+=" -Dlibbluray=disabled"
+  PKG_MANUAL_OPTS_TARGET+=" --disable-libbluray"
 fi
 
 pre_configure_target() {
-  export PKG_CONFIG_PATH="$(get_install_dir libplacebo)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
+#mpv does not build in the .TARGET_NAME
+  cd ${PKG_BUILD}
+    rm -rf .${TARGET_NAME}
+}
+
+configure_target() {
+  waf configure ${PKG_MANUAL_OPTS_TARGET}
+}
+
+make_target() {
+  waf build
+}
+
+makeinstall_target() {
+  waf install --destdir=${INSTALL}
+  rm -r ${INSTALL}/usr/share
 }

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

@@ -2,14 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="squeezelite"
-PKG_VERSION="c751ef146265c243cdbd7c0353dd0b70ab51730c"
-PKG_SHA256="19fd23ca52039b4e216ff74e7d93b7fd8079ab8bfd63d5fb2286bfb743e334ed"
+PKG_VERSION="bc72c0de3fff771540a2a45aaafafed539387b3c" # 2022-04-10 # 1.9.9.1403
+PKG_SHA256="5aa312d678a593b9a08f79e080a6ebe329d8fc40e6507e28b6705807c408bf7a"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
 PKG_URL="https://github.com/ralph-irving/squeezelite/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac libmad libvorbis mpg123 soxr libogg"
 PKG_DEPENDS_CONFIG="mpg123"
-PKG_LONGDESC="A client for the Lyrion Music Server."
+PKG_LONGDESC="A client for the Logitech Media Server."
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libpcap"
-PKG_VERSION="1.10.4"
-PKG_SHA256="ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f"
+PKG_VERSION="1.10.3"
+PKG_SHA256="2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.tcpdump.org/"
 PKG_URL="https://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="iperf"
-PKG_VERSION="3.17.1"
-PKG_SHA256="105b4fe7fbce31c9b94a3fec10c46e3b4b298adc076e1e3af52b990e1faf2db9"
+PKG_VERSION="3.13"
+PKG_SHA256="a49d23fe0d3b1482047ad7f3b9e384c69657a63b486c4e3f0ce512a077d94434"
 PKG_LICENSE="BSD"
 PKG_SITE="http://software.es.net/iperf/"
 PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="irssi"
-PKG_VERSION="1.4.5"
-PKG_SHA256="72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062"
+PKG_VERSION="1.4.3"
+PKG_SHA256="b93f715223a322e67f42b61a08a512ae29e34bd4a53d7f223766660aaa5a0434"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"
 PKG_URL="https://github.com/irssi/irssi/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ncftp"
-PKG_VERSION="3.2.7"
-PKG_SHA256="d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8"
+PKG_VERSION="3.2.6"
+PKG_SHA256="5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
 PKG_LICENSE="GPLv3"
 PKG_SITE="http://www.ncftp.com/ncftp/"
-PKG_URL="https://www.ncftp.com/public_ftp/ncftp/ncftp-${PKG_VERSION}-src.tar.xz"
+PKG_URL="ftp://ftp.ncftp.com/ncftp/ncftp-${PKG_VERSION}-src.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="NcFTP is a set of application programs implementing the File Transfer Protocol."
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/network-tools-depends/ncftp/patches/ncftpd-gcc10-build-fix.patch

@@ -0,0 +1,12 @@
+diff -Nur a/sh_util/gpshare.c b/sh_util/gpshare.c
+--- a/sh_util/gpshare.c	2016-11-13 00:53:39.000000000 +0100
++++ b/sh_util/gpshare.c	2020-06-22 20:24:08.160203885 +0200
+@@ -28,7 +28,7 @@
+ 
+ static int gIsAtty1 = 1, gIsAtty2 = 1;
+ extern int gLoadedBm, gBookmarkMatchMode;
+-Bookmark gBm;
++extern Bookmark gBm;
+ 
+ double
+ FileSize(double size, const char **uStr0, double *uMult0)

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmap"
-PKG_VERSION="7.95"
-PKG_SHA256="e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778"
+PKG_VERSION="7.93"
+PKG_SHA256="55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651"
 PKG_LICENSE="GPL"
 PKG_SITE="https://nmap.org/"
 PKG_URL="https://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -18,9 +18,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-libdnet=included \
                            --with-liblua=included \
                            --with-liblinear=included \
-                           --with-openssl=${SYSROOT_PREFIX} \
-                           --with-ndiff=no \
-                           --with-zenmap=no"
+                           --with-openssl=${SYSROOT_PREFIX}"
 
 pre_configure_target() {
 # nmap fails to build in subdirs

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

@@ -2,15 +2,14 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rar2fs"
-PKG_VERSION="1.29.7"
-PKG_SHA256="a875d138b7ed7e3353b5de2f0c5ec02ef6a32c310fe3b07886bc95314d7875ba"
+PKG_VERSION="1.29.6"
+PKG_SHA256="ba3a0b649f2322498d54168f03d2e8bca9b1c96d70d0d97d83ea336a7525d4cb"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/hasse69/rar2fs"
-PKG_URL="https://github.com/hasse69/rar2fs/archive/refs/tags/v${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse unrar"
 PKG_LONGDESC="FUSE file system for reading RAR archives"
 PKG_BUILD_FLAGS="-sysroot"
-PKG_TOOLCHAIN="autotools"
 
 pre_configure_target() {
   PKG_CONFIGURE_OPTS_TARGET="--with-unrar=${PKG_BUILD}/unrar \

packages/addons/addon-depends/network-tools-depends/rar2fs/patches/001-remove-man-pages-1.29.3.patch

@@ -7,3 +7,15 @@ diff -Nur rar2fs-1.29.3.orig/Makefile.am rar2fs-1.29.3/Makefile.am
 +SUBDIRS = src
  
  EXTRA_DIST = get-version.sh rarconfig.example
+diff -Nur rar2fs-1.29.3.orig/Makefile.in rar2fs-1.29.3/Makefile.in
+--- rar2fs-1.29.3.orig/Makefile.in	2020-12-15 13:06:30.000000000 +0000
++++ rar2fs-1.29.3/Makefile.in	2021-01-01 11:34:20.496533359 +0000
+@@ -233,7 +233,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = src man
++SUBDIRS = src
+ EXTRA_DIST = get-version.sh rarconfig.example
+ all: all-recursive
+ 

packages/addons/addon-depends/network-tools-depends/rar2fs/patches/002-fix-configure.patch

@@ -1,27 +0,0 @@
-From 80ebe4efb52ca2d51c62f3cdef8855e1356b35b7 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Thu, 4 Jul 2024 19:35:58 +1000
-Subject: [PATCH] Update configure.ac to support newer autotools
-
-Fixes:
-- configure.ac:506: error: required file 'config/config.rpath' not found
-
-explicitly require GETTEXT version
-This is required by `autopoint` executed by `autoreconf`
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index bee9255..80f77cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -504,6 +504,8 @@ fi
- ########################################################
- 
- AM_ICONV
-+AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.14.4])
- 
- AC_MSG_CHECKING(for commit hash in git repo)
- GITHEAD=$BUILDDIR/.git/$(cat $BUILDDIR/.git/HEAD 2>/dev/null | cut -d" " -f2)

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tcpdump"
-PKG_VERSION="4.99.4"
-PKG_SHA256="0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea"
+PKG_VERSION="4.99.3"
+PKG_SHA256="ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3"
 PKG_SITE="https://www.tcpdump.org/"
 PKG_URL="https://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap libtirpc"

packages/addons/addon-depends/pcsc-lite/package.mk

@@ -2,20 +2,20 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="2.2.3"
-PKG_SHA256="cab1e62755713f62ce1b567954dbb0e9a7e668ffbc3bbad3ce85c53f8f4e00a4"
+PKG_VERSION="1.9.9"
+PKG_SHA256="cbcc3b34c61f53291cecc0d831423c94d437b188eb2b97b7febc08de1c914e8a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pcsclite.apdu.fr"
-PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libusb polkit"
+PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)."
 
-PKG_MESON_OPTS_TARGET="-Ddefault_library=static \
-                       -Dlibudev=false \
-                       -Dlibusb=true \
-                       -Dpolkit=true \
-                       -Dusbdropdir=/storage/.kodi/addons/service.pcscd/drivers"
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
+            --enable-static \
+            --disable-libudev \
+            --enable-libusb \
+            --enable-usbdropdir=/storage/.kodi/addons/service.pcscd/drivers"
 
-pre_configure_target() {
-  export PKG_CONFIG_PATH="$(get_install_dir polkit)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
+post_configure_target() {
+  libtool_remove_rpath libtool
 }

packages/addons/addon-depends/podman/conmon/package.mk

@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="conmon"
-PKG_VERSION="2.1.10"
-PKG_SHA256="455fabcbd4a5a5dc5e05374a71b62dc0b08ee865c2ba398e9dc9acac1ea1836a"
-PKG_LICENSE="Apache-2.0"
-PKG_SITE="https://github.com/containers/conmon"
-PKG_URL="https://github.com/containers/conmon/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain glib libseccomp systemd"
-PKG_LONGDESC="An OCI container runtime monitor"
-
-# Git commit of the matching release https://github.com/containers/conmon
-export PKG_GIT_COMMIT="2dcd736e46ded79a53339462bc251694b150f870"
-
-pre_configure_target() {
-  export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
-  export GIT_COMMIT=${PKG_GIT_COMMIT}
-}

packages/addons/addon-depends/podman/gpgme/package.mk

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="gpgme"
-PKG_VERSION="1.23.2"
-PKG_SHA256="9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"
-PKG_LICENSE="gpgme"
-PKG_SITE="https://gnupg.org/software/gpgme/index.html"
-PKG_URL="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libassuan libgpg-error"
-PKG_LONGDESC="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications"
-PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-languages=cl \
-                           --disable-static \
-                           --enable-shared \
-                           --disable-glibtest \
-                           --disable-gpgconf-test \
-                           --disable-gpg-test \
-                           --disable-gpgsm-test \
-                           --disable-g13-test \
-                           --with-pic \
-                           --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr \
-                           --with-libassuan-prefix=$(get_install_dir libassuan)/usr"
-
-pre_configure_target() {
-  CFLAGS="${CFLAGS} -I$(get_install_dir libassuan)/usr/include"
-  LDFLAGS="${LDFLAGS} -L$(get_install_dir libassuan)/usr/lib"
-}

packages/addons/addon-depends/podman/libassuan/package.mk

@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libassuan"
-PKG_VERSION="2.5.7"
-PKG_SHA256="0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"
-PKG_LICENSE="LGPLv2.1+"
-PKG_SITE="https://gnupg.org/software/libassuan/index.html"
-PKG_URL="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libgpg-error"
-PKG_LONGDESC="Libassuan is a small library implementing the so-called Assuan protocol"
-PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared \
-                           --with-gnu-ld \
-                           --with-pic \
-                           --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr"