Merge pull request #5826 from HiassofT/le10-kernel-5.10.76

[le10] linux (RPi): update to 5.10.76-581049d, temp revert video callback limit commit

distributions/LibreELEC/version

@@ -5,4 +5,4 @@
   OS_VERSION="10.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="9.80.11"
+  ADDON_VERSION="10.0.0"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="at-spi2-core"
-PKG_VERSION="2.40.0"
-PKG_SHA256="4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429"
+PKG_VERSION="2.40.3"
+PKG_SHA256="e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gdk-pixbuf"
-PKG_VERSION="2.42.4"
-PKG_SHA256="fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d"
+PKG_VERSION="2.42.6"
+PKG_SHA256="c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-${PKG_VERSION}.tar.xz"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gtk3"
-PKG_VERSION="3.24.28"
-PKG_SHA256="b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6"
+PKG_VERSION="3.24.30"
+PKG_SHA256="ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz"

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

@@ -12,14 +12,16 @@ PKG_DEPENDS_CONFIG="icu"
 PKG_DEPENDS_UNPACK+=" harfbuzz"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_MESON_OPTS_TARGET="-Dcairo=enabled \
+PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
+                       -Dcairo=enabled \
                        -Ddocs=disabled \
                        -Dfontconfig=enabled \
                        -Dfreetype=enabled \
                        -Dglib=enabled \
                        -Dgobject=disabled \
                        -Dgraphite=disabled \
-                       -Dicu=enabled"
+                       -Dicu=enabled \
+                       -Dtests=disabled"
 
 unpack() {
   mkdir -p ${PKG_BUILD}

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

@@ -2,10 +2,11 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="itstool"
-PKG_VERSION="2.0.6"
-PKG_SHA256="6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
+PKG_VERSION="2.0.7"
+PKG_SHA256="6b9a7cd29a12bb95598f5750e8763cee78836a1a207f85b74d8b3275b27e87ca"
 PKG_LICENSE="GPLv3"
 PKG_SITE="http://itstool.org"
 PKG_URL="http://files.itstool.org/itstool/itstool-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="toolchain libxml2:host"
 PKG_LONGDESC="ITS Tool allows you to translate your XML documents with PO files."
+PKG_TOOLCHAIN="autotools"

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.3"
-PKG_SHA256="225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216"
+PKG_VERSION="2.3.4"
+PKG_SHA256="57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.bz2"

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

@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pango"
-PKG_VERSION="1.48.4"
-PKG_SHA256="418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a"
+PKG_VERSION="1.49.1"
+PKG_SHA256="c4266dc06c01bf0133d3815502426d209de5ea7abd895899e73e7edebaf48f6f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz"
+PKG_URL="https://download.gnome.org/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain cairo freetype fontconfig fribidi glib harfbuzz libX11 libXft"
 PKG_DEPENDS_CONFIG="libXft cairo"
 PKG_LONGDESC="The Pango library for layout and rendering of internationalized text."

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

@@ -23,6 +23,7 @@ pre_make_target() {
   export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
   export CONTAINERD_PKG=github.com/containerd/containerd
   export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}"
+  export GO111MODULE=off
 
   mkdir -p ${GOPATH}
   if [ -d ${PKG_BUILD}/vendor ]; then

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.14.15"
-PKG_SHA256="8167eeb636eeef6010dc004e5ab4a0af77ea3e1c9fe8b3c2fef38c3ddb72bc7d"
+PKG_VERSION="1.16.6"
+PKG_SHA256="498cd89c5c965ea2f2e23eef589e0a2dcb4b94f31c3f7dac575d4c35ae89caf7"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"

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

@@ -1,10 +1,10 @@
---- a/src/crypto/x509/root_unix.go
-+++ b/src/crypto/x509/root_unix.go
-@@ -20,6 +20,7 @@
+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,4 +20,5 @@ var certDirectories = []string{
+ 	"/etc/ssl/certs",               // SLES10/SLES11, https://golang.org/issue/12139
  	"/etc/pki/tls/certs",           // Fedora/RHEL
- 	"/etc/openssl/certs",           // NetBSD
- 	"/var/ssl/certs",               // AIX
-+    "/etc/ssl",                     // LibreELEC
+ 	"/system/etc/security/cacerts", // Android
++	"/etc/ssl",                     // LibreELEC
  }
- 
- const (

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="icu"
-PKG_VERSION="68.2"
-PKG_SHA256="f790b0202facbbf19c5581a7a5f21b2b4b6ed70ba3e4bef8d5560868e5e82476"
+PKG_VERSION="69.1"
+PKG_SHA256="39ce83dd5d15c7539dde261733e106a391923f82caf1ce52ecaebb72d93b4579"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.icu-project.org"
 PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz"

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

@@ -1,18 +1,17 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="jasper"
-PKG_VERSION="1.900.1"
-PKG_SHA256="6e9a959bf4f8cb02f77f42d1b9880b8e85d021ac51f43d8787b5438fd2b7a1c5"
+PKG_VERSION="2.0.33"
+PKG_SHA256="38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"
-PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://github.com/jasper-software/jasper/archive/refs/tags/version-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libjpeg-turbo"
 PKG_LONGDESC="A implementation of the ISO/IEC 15444-1 also known as JPEG-2000 standard for image compression."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
-
-post_makeinstall_target() {
-  rm -rf ${INSTALL}/usr/bin
-}
+PKG_CMAKE_OPTS_TARGET="-DJAS_ENABLE_DOC=false \
+                       -DJAS_ENABLE_PROGRAMS=false \
+                       -DJAS_ENABLE_SHARED=false"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="apache-ant"
-PKG_VERSION="1.10.9"
-PKG_SHA256="42f12ea7dc854b69aac0bd05c5767252dddd297888503e69b8aae0a1dc791cf5"
+PKG_VERSION="1.10.11"
+PKG_SHA256="baa049855cdecbefa62539555824058e52412e5ebe8f102e1db944cb762e06d9"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
 PKG_URL="https://downloads.apache.org/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"

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

@@ -17,6 +17,7 @@ pre_make_target() {
 
   export CGO_ENABLED=0
   export LDFLAGS="-extld ${CC}"
+  export GO111MODULE=off
 
   mkdir -p ${GOPATH}
   if [ -d ${PKG_BUILD}/vendor ]; then

packages/addons/addon-depends/librespot-depends/rust/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rust"
-PKG_VERSION="1.50.0"
+PKG_VERSION="1.54.0"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_DEPENDS_TARGET="toolchain rustup.rs"
@@ -25,11 +25,13 @@ make_target() {
       ;;
   esac
   "$(get_build_dir rustup.rs)/rustup-init.sh" \
-    --default-toolchain "${PKG_VERSION}" \
+    --default-toolchain none \
     --no-modify-path \
     --profile minimal \
     --target "${RUST_TARGET_TRIPLE}" \
     -y
+  cargo/bin/rustup toolchain install ${PKG_VERSION} --allow-downgrade --profile minimal --component clippy
+  cargo/bin/rustup target add ${RUST_TARGET_TRIPLE}
 
   cat <<EOF >"${CARGO_HOME}/config"
 [build]
@@ -43,6 +45,15 @@ EOF
   cat <<EOF >"${CARGO_HOME}/env"
 export CARGO_HOME="${CARGO_HOME}"
 export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}"
+if [ "${HOSTTYPE}" = "${TARGET_ARCH}" ]; then
+  # Until target-applies-to-host is incorporated into stable this
+  # option is required for a matching host-target triple to be compiled
+  # by the cross compiler. Read more here.
+  # https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host
+  export __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly"
+  export CARGO_TARGET_APPLIES_TO_HOST="false"
+  export CARGO_Z_TARGET_APPLIES_TO_HOST="-Z target-applies-to-host"
+fi
 export PATH="${CARGO_HOME}/bin:${PATH}"
 export PKG_CONFIG_ALLOW_CROSS="1"
 export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}"

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

@@ -10,6 +10,7 @@ PKG_URL="https://archive.mozilla.org/pub/opus/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Codec designed for interactive speech and audio transmission over the Internet."
 PKG_TOOLCHAIN="configure"
+PKG_BUILD_FLAGS="+pic"
 
 if [ "${TARGET_ARCH}" = "arm" ]; then
   PKG_FIXED_POINT="--enable-fixed-point"

packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk

@@ -7,7 +7,7 @@ PKG_SHA256="c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/mikebrady/shairport-sync"
 PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon openssl popt pulseaudio soxr"
+PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon libsndfile openssl popt pulseaudio soxr"
 PKG_LONGDESC="AirPlay audio player."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-sysroot"
@@ -18,6 +18,7 @@ PKG_CONFIGURE_OPTS_TARGET="--with-alsa \
                            --with-metadata \
                            --with-pa \
                            --with-pipe \
+                           --with-pkg-config \
                            --with-soxr \
                            --with-ssl=openssl \
                            --with-stdout \

packages/addons/addon-depends/snapcast-depends/shairport-sync/patches/fix-libsnfile-dependencies.patch

@@ -0,0 +1,20 @@
+--- a/configure.ac	2021-04-26 20:35:11.000000000 +1000
++++ b/configure.ac	2021-09-29 20:31:32.372329878 +1000
+@@ -302,9 +302,16 @@
+ # Look for Convolution flag
+ AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])])
+ if test "x$with_convolution" = "xyes" ; then
++  if test "x${with_pkg_config}" = "xyes" ; then
++    PKG_CHECK_MODULES(
++      [sndfile], [sndfile],
++      [CFLAGS="${sndfile_CFLAGS} ${CFLAGS}"
++      LIBS="${sndfile_LIBS} ${LIBS}"], AC_MSG_ERROR(Convolution support requires the sndfile library.))
++  else
++    AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
++  fi
+   AM_INIT_AUTOMAKE([subdir-objects])
+   AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.])
+-  AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
+ fi
+ AM_CONDITIONAL([USE_CONVOLUTION], [test "x$with_convolution" = "xyes"])
+ 

packages/addons/addon-depends/system-tools-depends/bottom/package.mk

@@ -14,6 +14,7 @@ PKG_TOOLCHAIN="manual"
 make_target() {
   . "$(get_build_dir rust)/cargo/env"
   cargo build \
+    ${CARGO_Z_TARGET_APPLIES_TO_HOST} \
     --release \
     --locked \
     --all-features

packages/addons/addon-depends/system-tools-depends/mc/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mc"
-PKG_VERSION="4.8.26"
-PKG_SHA256="c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27"
+PKG_VERSION="4.8.27"
+PKG_SHA256="31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
 PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
@@ -38,6 +38,7 @@ PKG_CONFIGURE_OPTS_TARGET=" \
 
 pre_configure_target() {
   LDFLAGS+=" -lcrypto -lssl"
+  CFLAGS+=' -DNCURSES_WIDECHAR=0'
 }
 
 post_makeinstall_target() {

packages/addons/addon-depends/system-tools-depends/mc/patches/mc-001-ticket_4200_ncurses_disable_widec.patch

@@ -0,0 +1,71 @@
+See https://midnight-commander.org/ticket/4200
+
+diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
+index 5cddf5059..2c117ef4b 100644
+--- a/lib/tty/tty-ncurses.c
++++ b/lib/tty/tty-ncurses.c
+@@ -560,6 +560,7 @@ tty_fill_region (int y, int x, int rows, int cols, unsigned char ch)
+ void
+ tty_colorize_area (int y, int x, int rows, int cols, int color)
+ {
++#ifdef ENABLE_SHADOWS
+     cchar_t *ctext;
+     wchar_t wch[10];            /* TODO not sure if the length is correct */
+     attr_t attrs;
+@@ -585,6 +586,13 @@ tty_colorize_area (int y, int x, int rows, int cols, int color)
+     }
+ 
+     g_free (ctext);
++#else
++    (void) y;
++    (void) x;
++    (void) rows;
++    (void) cols;
++    (void) color;
++#endif /* ENABLE_SHADOWS */
+ }
+ 
+ /* --------------------------------------------------------------------------------------------- */
+diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h
+index d75df9533..8feb17ccd 100644
+--- a/lib/tty/tty-ncurses.h
++++ b/lib/tty/tty-ncurses.h
+@@ -30,6 +30,11 @@
+ #define NCURSES_CONST const
+ #endif
+ 
++/* do not draw shadows if NCurses is built with --disable-widec */
++#if defined(NCURSES_WIDECHAR) && NCURSES_WIDECHAR
++#define ENABLE_SHADOWS 1
++#endif
++
+ /*** typedefs(not structures) and defined constants **********************************************/
+ 
+ /*** enums ***************************************************************************************/
+diff --git a/lib/tty/tty-slang.h b/lib/tty/tty-slang.h
+index c36785ffc..15fd00a94 100644
+--- a/lib/tty/tty-slang.h
++++ b/lib/tty/tty-slang.h
+@@ -27,6 +27,8 @@
+ #define COLS  SLtt_Screen_Cols
+ #define LINES SLtt_Screen_Rows
+ 
++#define ENABLE_SHADOWS 1
++
+ /*** enums ***************************************************************************************/
+ 
+ enum
+diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
+index ed16d04dd..4c1f5ba84 100644
+--- a/src/filemanager/boxes.c
++++ b/src/filemanager/boxes.c
+@@ -280,7 +280,9 @@ appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm
+     switch (msg)
+     {
+     case MSG_INIT:
++#ifdef ENABLE_SHADOWS
+         if (!tty_use_colors ())
++#endif
+         {
+             Widget *shadow;
+ 

packages/addons/browser/chrome/changelog.txt

@@ -1,3 +1,19 @@
+108
+- chrome: update to 93.0.4577.63
+- harfbuzz: update to 2.9.0
+- icu: update to 69.1
+- itstool: to 2.0.7
+- jasper: update to 2.0.33
+- libXft: update to 2.3.4
+- pango: update to 1.49.1
+
+107
+- chrome: update to 92.0.4515.107
+- at-spi2-core: update to 2.40.3
+- gdk-pixbuf: update to 2.42.6
+- gtk3: update to 3.24.30
+- pango: update to 1.48.7
+
 106
 - chrome: update to 91.0.4472.114
 

packages/addons/browser/chrome/package.mk

@@ -4,8 +4,8 @@
 PKG_NAME="chrome"
 PKG_VERSION="1.0"
 # curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version
-PKG_VERSION_NUMBER="91.0.4472.114"
-PKG_REV="106"
+PKG_VERSION_NUMBER="93.0.4577.63"
+PKG_REV="108"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.google.com/chrome"

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,6 @@
+8.0.106
+- updates for Python 3
+  
 8.0.105
 - use new output from mediaclient
   use xmlstartlet to parse settings.xml file

packages/addons/driver/sundtek-mediatv/package.mk

@@ -4,7 +4,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="7.0"
-PKG_REV="105"
+PKG_REV="106"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh

@@ -47,7 +47,7 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
+ARCH=$(sed -n 's|[^.]*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
 if [ "$ARCH" = "x86_64" ]; then
   INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
 elif [ "$ARCH" = "arm" ]; then

packages/addons/driver/sundtek-mediatv/source/resources/actions.py

@@ -19,14 +19,14 @@ __update_sh__     = xbmcvfs.translatePath(os.path.join(__cwd__, 'bin', 'sundtek-
 
 if len(sys.argv) == 2:
   if sys.argv[1] == 'refresh_tuners':
-    print "sundtek refresh tuners"
+    print('sundtek refresh tuners')
     sys.path.append(__resources_lib__)
     from functions import refresh_sundtek_tuners
     refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
     __settings__.openSettings()
   elif sys.argv[1] == 'update_driver':
-    print "sundtek update driver"
+    print('sundtek update driver')
     proc = subprocess.Popen([__update_sh__], shell = True)
     return_code = proc.wait()
-    print "sundtek update driver return value " + str(return_code)
+    print('sundtek update driver return value', return_code)
     __settings__.openSettings()

packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <string id="1000">General</string>
-  <string id="1014">Extra delay [sec]</string>
-  <string id="1015">Run user script</string>
-  <string id="1030">Enable hardware PID filter</string>
-  <string id="1035">Enable IR receiver</string>
-  <string id="1040">Lowest adapter number (/dev/dvb/adapterX/)</string>
-  <string id="1050">Enable suspend/resume the driver</string>
-
-  <string id="2000">Networking</string>
-  <string id="2005">Share local tuner over network</string>
-  <string id="2010">Use network shared tuners</string>
-  <string id="2020">Server 1 IP address</string>
-  <string id="2021">    # of tuners</string>
-  <string id="2030">Server 2 IP address</string>
-  <string id="2031">    # of tuners</string>
-  <string id="2040">Server 3 IP address</string>
-  <string id="2041">    # of tuners</string>
-  <string id="2050">Server 4 IP address</string>
-  <string id="2051">    # of tuners</string>
-  <string id="2060">Server 5 IP address</string>
-  <string id="2061">    # of tuners</string>
-
-  <string id="9000">Tuner settings</string>
-  <string id="9005">Enable modifying settings</string>
-  <string id="9010"><![CDATA[       >>> Refresh tuners <<< ]]></string>
-  <string id="9020">    IR protocol</string>
-  <string id="9030">    keymap filename</string>
-
-  <string id="3000">Driver</string>
-  <string id="3005">Driver version</string>
-  <string id="3020">Check for new driver version at boot</string>
-  <string id="3010"><![CDATA[       >>> Update driver now <<< ]]></string>
-</strings>

packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <string id="1000">Allgemein</string>
-  <string id="1014">Verzögerung bevor Treiber gestartet wird [Sek.]</string>
-  <string id="1015">Skript welches vom Treiber-Stack gestartet werden soll</string>
-  <string id="1030">Hardware PID Filter einschalten</string>
-  <string id="1035">Fernbedienung unterstützen</string>
-  <string id="1040">Niedrigste Adapter Nummer (/dev/dvb/adapterX/)</string>
-  <string id="1050">Suspend / Resume des Treibers zulassen</string>
-
-  <string id="2000">Netzwerksupport</string>
-  <string id="2005">Netzwerkserver aktivieren</string>
-  <string id="2010">Mit Netzwerk-Tunern verbinden</string>
-  <string id="2020">Server 1 IP Adresse</string>
-  <string id="2021">    # Tuner ID</string>
-  <string id="2030">Server 2 IP Adresse</string>
-  <string id="2031">    # Tuner ID</string>
-  <string id="2040">Server 3 IP Adresse</string>
-  <string id="2041">    # Tuner ID</string>
-  <string id="2050">Server 4 IP Adresse</string>
-  <string id="2051">    # Tuner ID</string>
-  <string id="2060">Server 5 IP Adresse</string>
-  <string id="2061">    # Tuner ID</string>
-
-  <string id="9000">Geräte Einstellungen</string>
-  <string id="9005">Geräte-Einstellung ändern</string>
-  <string id="9010"><![CDATA[       >>> Tuner-Liste aktualisieren <<< ]]></string>
-  <string id="9020">    IR Protokoll</string>
-  <string id="9030">    Keymap Datei</string>
-
-  <string id="3000">Treiber</string>
-  <string id="3005">Treiber-Version</string>
-  <string id="3020">Bei Neustart auf neue Treiber-Version prüfen</string>
-  <string id="3010"><![CDATA[       >>> Treiber jetzt aktualisieren <<< ]]></string>
-</strings>

packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.de_de/strings.po

@@ -0,0 +1,134 @@
+# Kodi Media Center language file
+# Addon Name: Sundtek MediaTV
+# Addon id: driver.dvb.sundtek-mediatv
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: https://forum.libreelec.tv\n"
+"POT-Creation-Date: 2021-09-02 20:00+CEST\n"
+"PO-Revision-Date: 2021-09-02 20:00+CEST\n"
+"Last-Translator: vpeter\n"
+"Language-Team: Team LibreELEC\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#1000"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "#1014"
+msgid "Extra delay [sec]"
+msgstr "Verzögerung bevor Treiber gestartet wird [Sek.]"
+
+msgctxt "#1015"
+msgid "Run user script"
+msgstr "Skript welches vom Treiber-Stack gestartet werden soll"
+
+msgctxt "#1030"
+msgid "Enable hardware PID filter"
+msgstr "Hardware PID Filter einschalten"
+
+msgctxt "#1035"
+msgid "Enable IR receiver"
+msgstr "Fernbedienung unterstützen"
+
+msgctxt "#1040"
+msgid "Lowest adapter number (/dev/dvb/adapterX/)"
+msgstr "Niedrigste Adapter Nummer (/dev/dvb/adapterX/)"
+
+msgctxt "#1050"
+msgid "Enable suspend/resume the driver"
+msgstr "Suspend / Resume des Treibers zulassen"
+
+msgctxt "#2000"
+msgid "Networking"
+msgstr "Netzwerksupport"
+
+msgctxt "#2005"
+msgid "Share local tuner over network"
+msgstr "Netzwerkserver aktivieren"
+
+msgctxt "#2010"
+msgid "Use network shared tuners"
+msgstr "Mit Netzwerk-Tunern verbinden"
+
+msgctxt "#2020"
+msgid "Server 1 IP address"
+msgstr "Server 1 IP Adresse"
+
+msgctxt "#2021"
+msgid "    # of tuners"
+msgstr "    # Tuner ID"
+
+msgctxt "#2030"
+msgid "Server 2 IP address"
+msgstr "Server 2 IP Adresse"
+
+msgctxt "#2031"
+msgid "    # of tuners"
+msgstr "    # Tuner ID"
+
+msgctxt "#2040"
+msgid "Server 3 IP address"
+msgstr "Server 3 IP Adresse"
+
+msgctxt "#2041"
+msgid "    # of tuners"
+msgstr "    # Tuner ID"
+
+msgctxt "#2050"
+msgid "Server 4 IP address"
+msgstr "Server 4 IP Adresse"
+
+msgctxt "#2051"
+msgid "    # of tuners"
+msgstr "    # Tuner ID"
+
+msgctxt "#2060"
+msgid "Server 5 IP address"
+msgstr "Server 5 IP Adresse"
+
+msgctxt "#2061"
+msgid "    # of tuners"
+msgstr "    # Tuner ID"
+
+msgctxt "#3000"
+msgid "Driver"
+msgstr "Treiber"
+
+msgctxt "#3005"
+msgid "Driver version"
+msgstr "Treiber-Version"
+
+msgctxt "#3010"
+msgid "       >>> Update driver now <<< "
+msgstr "       >>> Treiber jetzt aktualisieren <<< "
+
+msgctxt "#3020"
+msgid "Check for new driver version at boot"
+msgstr "Bei Neustart auf neue Treiber-Version prüfen"
+
+msgctxt "#9000"
+msgid "Tuner settings"
+msgstr "Geräte Einstellungen"
+
+msgctxt "#9005"
+msgid "Enable modifying settings"
+msgstr "Geräte-Einstellung ändern"
+
+msgctxt "#9010"
+msgid "       >>> Refresh tuners <<< "
+msgstr "       >>> Tuner-Liste aktualisieren <<<"
+
+msgctxt "#9020"
+msgid "    IR protocol"
+msgstr "    IR Protokoll"
+
+msgctxt "#9030"
+msgid "    Keymap filename"
+msgstr "    Keymap Date"
+

packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.en_gb/strings.po

@@ -0,0 +1,134 @@
+# Kodi Media Center language file
+# Addon Name: Sundtek MediaTV
+# Addon id: driver.dvb.sundtek-mediatv
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: https://forum.libreelec.tv\n"
+"POT-Creation-Date: 2021-09-02 20:00+CEST\n"
+"PO-Revision-Date: 2021-09-02 20:00+CEST\n"
+"Last-Translator: vpeter\n"
+"Language-Team: Team LibreELEC\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#1000"
+msgid "General"
+msgstr ""
+
+msgctxt "#1014"
+msgid "Extra delay [sec]"
+msgstr ""
+
+msgctxt "#1015"
+msgid "Run user script"
+msgstr ""
+
+msgctxt "#1030"
+msgid "Enable hardware PID filter"
+msgstr ""
+
+msgctxt "#1035"
+msgid "Enable IR receiver"
+msgstr ""
+
+msgctxt "#1040"
+msgid "Lowest adapter number (/dev/dvb/adapterX/)"
+msgstr ""
+
+msgctxt "#1050"
+msgid "Enable suspend/resume the driver"
+msgstr ""
+
+msgctxt "#2000"
+msgid "Networking"
+msgstr ""
+
+msgctxt "#2005"
+msgid "Share local tuner over network"
+msgstr ""
+
+msgctxt "#2010"
+msgid "Use network shared tuners"
+msgstr ""
+
+msgctxt "#2020"
+msgid "Server 1 IP address"
+msgstr ""
+
+msgctxt "#2021"
+msgid "    # of tuners"
+msgstr ""
+
+msgctxt "#2030"
+msgid "Server 2 IP address"
+msgstr ""
+
+msgctxt "#2031"
+msgid "    # of tuners"
+msgstr ""
+
+msgctxt "#2040"
+msgid "Server 3 IP address"
+msgstr ""
+
+msgctxt "#2041"
+msgid "    # of tuners"
+msgstr ""
+
+msgctxt "#2050"
+msgid "Server 4 IP address"
+msgstr ""
+
+msgctxt "#2051"
+msgid "    # of tuners"
+msgstr ""
+
+msgctxt "#2060"
+msgid "Server 5 IP address"
+msgstr ""
+
+msgctxt "#2061"
+msgid "    # of tuners"
+msgstr ""
+
+msgctxt "#3000"
+msgid "Driver"
+msgstr ""
+
+msgctxt "#3005"
+msgid "Driver version"
+msgstr ""
+
+msgctxt "#3010"
+msgid "       >>> Update driver now <<< "
+msgstr ""
+
+msgctxt "#3020"
+msgid "Check for new driver version at boot"
+msgstr ""
+
+msgctxt "#9000"
+msgid "Tuner settings"
+msgstr ""
+
+msgctxt "#9005"
+msgid "Enable modifying settings"
+msgstr ""
+
+msgctxt "#9010"
+msgid "       >>> Refresh tuners <<< "
+msgstr ""
+
+msgctxt "#9020"
+msgid "    IR protocol"
+msgstr ""
+
+msgctxt "#9030"
+msgid "    Keymap filename"
+msgstr ""
+

packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py

@@ -23,7 +23,7 @@ def settings_restore(settings_xml):
   try:
     shutil.copyfile(settings_xml + '_orig', settings_xml)
   except IOError as e:
-    print 'Error restoring file:', settings_xml
+    print('Error restoring file:', settings_xml)
 
 ######################################################################################################
 # get hdhomerun supported devices on a system (only name like 101ADD2B-0)
@@ -37,7 +37,7 @@ def get_devices_hdhomerun(hdhomerun_log):
         name = name[2].strip()
         tuners.append(name)
   except IOError:
-    print 'Error reading hdhomerun log file', hdhomerun_log
+    print('Error reading hdhomerun log file', hdhomerun_log)
   return tuners
 
   """
@@ -74,7 +74,7 @@ def get_devices_sundtek(mediaclient_e):
 
         if str.startswith('[DVB'):
           types_arr = tuners[len(tuners)-1][2]
-          str = str.translate(None, '[]:')
+          str = str.translate(dict.fromkeys(map(ord, '[]:'), None))
           types = str.split(",")
           for i in range(len(types)):
             if types[i] == 'DVB-C':
@@ -89,7 +89,7 @@ def get_devices_sundtek(mediaclient_e):
           tuners[len(tuners)-1][2] = types_arr
 
   except IOError:
-    print 'Error getting sundtek tuners info'
+    print('Error getting sundtek tuners info')
   return tuners
 
   """
@@ -144,7 +144,7 @@ def parse_settings(settings_xml):
     category = xmldoc.getElementsByTagName('category')
     return xmldoc
   except Exception as inst:
-    print 'Error parse settings file', settings_xml
+    print('Error parse settings file', settings_xml)
     return None
 
 ######################################################################################################
@@ -274,7 +274,7 @@ def save_settings(settings_xml, xmldoc):
     xmlpp.pprint(xmldoc.toxml(), output = outputfile, indent=2, width=500)
     outputfile.close()
   except IOError:
-    print 'Error saving file:', settings_xml
+    print('Error saving file:', settings_xml)
     settings_restore(settings_xml)
 
 ######################################################################################################
@@ -284,7 +284,7 @@ def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
   tuners = get_devices_hdhomerun(hdhomerun_log)
   xmldoc = parse_settings(settings_xml)
   if xmldoc == None:
-    print 'No hdhomerun tuners found'
+    print('No hdhomerun tuners found')
   else:
     remove_old_tuners(xmldoc)
     add_new_tuners(xmldoc, tuners, 'hdhomerun')
@@ -297,7 +297,7 @@ def refresh_sundtek_tuners(settings_xml, mediaclient_e):
   tuners = get_devices_sundtek(mediaclient_e)
   xmldoc = parse_settings(settings_xml)
   if xmldoc == None:
-    print 'No sundtek tuners found'
+    print('No sundtek tuners found')
   else:
     remove_old_tuners(xmldoc)
     add_new_tuners(xmldoc, tuners, 'sundtek')

packages/addons/service/docker/package.mk

@@ -36,6 +36,7 @@ configure_target() {
   PKG_GOPATH_ENGINE=${GOPATH}
   PKG_GOPATH_CLI=${GOPATH}_cli
   export GOPATH=${PKG_GOPATH_CLI}:${PKG_GOPATH_ENGINE}
+  export GO111MODULE=off
 
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}"
 

packages/addons/service/jellyfin/package.mk

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="jellyfin"
@@ -11,7 +11,7 @@ PKG_SITE="https://jellyfin.org/"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="service"
 PKG_SHORTDESC="Jellyfin: The Free Software Media System"
-PKG_LONGDESC="Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media. Stream to any device from your own server. Your media, your server, your way."
+PKG_LONGDESC="Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media. Stream to any device from your own server."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"

packages/addons/service/librespot/package.mk

@@ -25,6 +25,7 @@ PKG_MAINTAINER="Anton Voyl (awiouy)"
 make_target() {
   . $(get_build_dir rust)/cargo/env
   cargo build \
+    ${CARGO_Z_TARGET_APPLIES_TO_HOST} \
     --release \
     --no-default-features \
     --features "alsa-backend pulseaudio-backend with-dns-sd with-vorbis"

packages/addons/service/mariadb/package.mk

@@ -7,7 +7,7 @@ PKG_REV="104"
 PKG_SHA256="a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
-PKG_URL="https://downloads.mariadb.org/interstitial/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host ncurses:host"
 PKG_DEPENDS_TARGET="toolchain binutils bzip2 libaio libxml2 lzo ncurses openssl systemd zlib mariadb:host"
 PKG_SHORTDESC="MariaDB is a community-developed fork of the MySQL."

packages/addons/service/minisatip/changelog.txt

@@ -1,3 +1,9 @@
+107
+- upgrade to minisatip 1.1.44
+
+106
+- upgrade to minisatip 1.1.34
+
 105
 - upgrade to minisatip 1.1.24
 

packages/addons/service/minisatip/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="minisatip"
-PKG_VERSION="1.1.24"
-PKG_SHA256="a77caccb8b1d9be27f66895e01d28e1eb5f4cafd24f32bf9857571cf0728359d"
-PKG_REV="105"
+PKG_VERSION="1.1.44"
+PKG_SHA256="0f4785640b7d179d0c0a22951f42d9dca7eb5cae96790887cb1d74ea9078f0c4"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/catalinii/minisatip"

packages/addons/service/tvheadend43/changelog.txt

@@ -1,3 +1,7 @@
+102
+- Update to 4.3-1979
+- include missing x254 library for Generic
+
 101
 - Update to 4.3-1967
 

packages/addons/service/tvheadend43/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tvheadend43"
-PKG_VERSION="eb59284b8527e3c51eadfeca94ec1e9174cdbdb0"
-PKG_SHA256="df3d50cd46e7d6b9d951bc36950eb1a49ac82fd5c2b08c3abc37cf8fba15651c"
-PKG_VERSION_NUMBER="4.3-1967"
-PKG_REV="101"
+PKG_VERSION="8fc2dfa7e1b1b3b1e8ba6f78cd4a81f77fa6a736"
+PKG_SHA256="6c937acf17396580f65e2706b091024a7a61e7e4969d1484d76e63c061f6487f"
+PKG_VERSION_NUMBER="4.3-1979"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
@@ -37,19 +37,19 @@ PKG_TVH_TRANSCODING="\
   --enable-libfdkaac \
   --enable-libopus \
   --enable-libvorbis \
-  --enable-libvpx \
-  --enable-libx264 \
-  --enable-libx265"
+  --enable-libx264"
 
 # hw specific transcoding options
-if [ "${TARGET_ARCH}" = x86_64 ]; then
+if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" libva"
+  # specific transcoding options
   PKG_TVH_TRANSCODING="${PKG_TVH_TRANSCODING} \
-    --enable-vaapi"
-fi
-
-# specific transcoding options
-if [[ "${TARGET_ARCH}" != "x86_64" ]]; then
+    --enable-vaapi \
+    --enable-libvpx \
+    --enable-libx265"
+else
+  # for != "x86_64" targets
+  # specific transcoding options
   PKG_TVH_TRANSCODING="${PKG_TVH_TRANSCODING} \
     --disable-libvpx \
     --disable-libx265"
@@ -111,7 +111,7 @@ post_makeinstall_target() {
 }
 
 addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib}
 
   cp ${PKG_DIR}/addon.xml ${ADDON_BUILD}/${PKG_ADDON_ID}
 
@@ -123,6 +123,10 @@ addon() {
   cp -P ${PKG_INSTALL}/usr/lib/capmt_ca.so ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
   cp -P $(get_install_dir comskip)/usr/bin/comskip ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
+  if [ "${TARGET_ARCH}" = "x86_64" ]; then
+    cp -P $(get_install_dir x265)/usr/lib/libx265.so.199 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  fi
+
   # dvb-scan files
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
   cp -r $(get_install_dir tvh-dtv-scan-tables)/usr/share/dvbv5/* \

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

@@ -1,3 +1,6 @@
+111
+- rsync: add lchmod workaround patches
+
 110
 - libpcap: update to 1.10.1
 - tcpdump: update to 4.99.1

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="110"
+PKG_REV="111"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"

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

@@ -1,3 +1,9 @@
+125
+- Update mc to 4.8.27
+
+124
+- Include bottom (btm) in Generic
+
 123
 - Update stress-ng to 0.12.11
 - Update unrar to 6.0.7

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="system-tools"
 PKG_VERSION="1.0"
-PKG_REV="123"
+PKG_REV="125"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -19,6 +19,7 @@ PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_DEPENDS_TARGET="toolchain \
                     autossh \
+                    bottom \
                     diffutils \
                     dstat \
                     dtach \
@@ -51,8 +52,6 @@ PKG_DEPENDS_TARGET="toolchain \
 
 if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" efibootmgr st"
-else
-  PKG_DEPENDS_TARGET+=" bottom"
 fi
 
 addon() {

packages/audio/fluidsynth/package.mk

@@ -3,17 +3,18 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="fluidsynth"
-PKG_VERSION="1.1.6"
-PKG_SHA256="d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601"
+PKG_VERSION="2.2.3"
+PKG_SHA256="b31807cb0f88e97f3096e2b378c9815a6acfdc20b0b14f97936d905b536965c4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://fluidsynth.org/"
-PKG_URL="${SOURCEFORGE_SRC}/project/fluidsynth/fluidsynth-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain glib"
+PKG_URL="https://github.com/FluidSynth/fluidsynth/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain glib libsndfile"
 PKG_LONGDESC="FluidSynth renders midi music files as raw audio data, for playing or conversion."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 \
                        -DLIB_SUFFIX= \
-                       -Denable-readline=0 \
+                       -Denable-libsndfile=1 \
+                       -Denable-pkgconfig=1 \
                        -Denable-pulseaudio=0 \
-                       -Denable-libsndfile=0"
+                       -Denable-readline=0"

packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch

@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2021-09-12 13:53:14.192948082 +1000
++++ b/CMakeLists.txt	2021-09-12 13:54:27.389413149 +1000
+@@ -535,6 +535,7 @@
+              LIBSNDFILE_STATIC_LDFLAGS MATCHES "vorbis" OR
+              LIBSNDFILE_STATIC_LDFLAGS_OTHER MATCHES "vorbis" )
+           set ( LIBSNDFILE_HASVORBIS 1 )
++          set ( LIBSNDFILE_LIBRARIES ${LIBSNDFILE_STATIC_LIBRARIES} )
+         else ()
+           message ( NOTICE "Seems like libsndfile was compiled without OGG/Vorbis support." )
+         endif ()

packages/audio/libsndfile/package.mk

@@ -1,28 +1,27 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libsndfile"
-PKG_VERSION="1.0.28"
-PKG_SHA256="1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.mega-nerd.com/libsndfile/"
-PKG_URL="http://www.mega-nerd.com/${PKG_NAME}/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib"
-PKG_LONGDESC="A library for accessing various audio file formats."
-PKG_TOOLCHAIN="configure"
+PKG_VERSION="1.0.31"
+PKG_SHA256="8cdee0acb06bb0a3c1a6ca524575643df8b1f3a55a0893b4dd9f829d08263785"
+PKG_LICENSE="LGPL-2.1-or-later"
+PKG_SITE="https://libsndfile.github.io/libsndfile/"
+PKG_URL="https://github.com/libsndfile/libsndfile/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain alsa-lib flac libogg libvorbis opus"
+PKG_LONGDESC="A C library for reading and writing sound files containing sampled audio data."
+PKG_BUILD_FLAGS="+pic"
 
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
-                           --disable-silent-rules \
-                           --disable-sqlite \
-                           --enable-alsa \
-                           --disable-external-libs \
-                           --disable-experimental \
-                           --disable-test-coverage \
-                           --enable-largefile \
-                           --with-gnu-ld \
-                           --with-pic"
+# As per notes in configure.ac:
+#  One or more of the external libraries (ie libflac, libogg, libvorbis and libopus)
+#  is either missing ... Unfortunately, for ease of maintenance, the external libs
+#  are an all or nothing affair.
+# So all of flac, libogg, libvorbis, opus are required.
 
-post_makeinstall_target() {
-  rm -rf ${INSTALL}/usr/bin
-}
+PKG_CMAKE_OPTS_TARGET="-DBUILD_PROGRAMS=OFF \
+                       -DBUILD_EXAMPLES=OFF \
+                       -DBUILD_REGTEST=OFF \
+                       -DBUILD_TESTING=OFF \
+                       -DENABLE_EXTERNAL_LIBS=ON \
+                       -DINSTALL_MANPAGES=OFF \
+                       -DINSTALL_PKGCONFIG_MODULE=ON"

packages/audio/libsndfile/patches/libsndfile-add-required-static-libaries-to-pkg-config.patch

@@ -0,0 +1,9 @@
+--- a/sndfile.pc	2021-01-24 23:22:23.000000000 +1100
++++ b/sndfile.pc.in	2021-09-12 14:30:47.763655089 +1000
+@@ -8,5 +8,5 @@
+ Requires:
+ Requires.private: @EXTERNAL_XIPH_REQUIRE@
+ Version: @VERSION@
+-Libs: -L${libdir} -lsndfile
++Libs: -L${libdir} -lsndfile -lFLAC -lvorbis -logg -lvorbisenc -lopus
+ Cflags: -I${includedir}

packages/audio/soxr/package.mk

@@ -13,6 +13,7 @@ PKG_LONGDESC="The SoX Resampler library performs one-dimensional sample-rate con
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLES=OFF \
+                       -DWITH_OPENMP=OFF \
                        -DBUILD_SHARED_LIBS=OFF \
                        -DBUILD_TESTS=OFF \
                        -DWITH_AVFFT=OFF"

packages/databases/mariadb-connector-c/package.mk

@@ -19,6 +19,15 @@ PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON
                       "
 
 post_makeinstall_target() {
+  # keep modern authentication plugins
+  PLUGINP=${INSTALL}/usr/lib/mariadb/plugin
+  mkdir -p ${INSTALL}/.tmp
+  mv ${PLUGINP}/{caching_sha2_password,client_ed25519,sha256_password}.so ${INSTALL}/.tmp
+
   # drop all unneeded
   rm -rf ${INSTALL}/usr
+
+  mkdir -p ${PLUGINP}
+  mv ${INSTALL}/.tmp/* ${PLUGINP}/
+  rmdir ${INSTALL}/.tmp
 }

packages/emulation/libretro-2048/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-2048"
-PKG_VERSION="57f401f40dc34def95027e3727dcb4c274bcabb3"
-PKG_SHA256="21df9fb853f5f8f1f6ca8d2170fb0f78137989e9ae29212ff4a3ea5453bd15e4"
+PKG_VERSION="1ff7d5c3835ad89e5ce5eaa409b91c9a17cc1aa0"
+PKG_SHA256="02cc3b93c321be06f6b695ea21380871057d5a3a45b9b4ba4ec3e292ac213de4"
 PKG_LICENSE="Public domain"
 PKG_SITE="https://github.com/libretro/libretro-2048"
 PKG_URL="https://github.com/libretro/libretro-2048/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-atari800/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-atari800"
-PKG_VERSION="373bf577033e8ae98aed33c7bed7fad3f3353eab"
-PKG_SHA256="5a44c281d07e52ac6ea92c5b8dd2c654342068d629519720d7035916e45e52b5"
+PKG_VERSION="478a8ec99a7f8436a39d5ac193c5fe313233ee7b"
+PKG_SHA256="10a13295036cdc27d28852e348227c874f5c0f14bc41b9c4f2fc3e4473a66c6c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-atari800"
 PKG_URL="https://github.com/libretro/libretro-atari800/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-bsnes/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-bsnes"
-PKG_VERSION="b65ded5bde278c18af538c687db9b72c995b220a"
-PKG_SHA256="d595ced2999dc6d1de0976b658f66c19b551633da991256a20bc76e5266fd221"
+PKG_VERSION="bc867656d7438aaffc6818b3b92350587bc78a47"
+PKG_SHA256="6416c51b349b46abb550f9f0abe74900bfce0bc7825a13fffd52327af2265cc3"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-bsnes-libretro"
 PKG_URL="https://github.com/libretro/beetle-bsnes-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-gba/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-gba"
-PKG_VERSION="4a59b260f90d2c9cf5a3e333338320b217ae8ea0"
-PKG_SHA256="14d6a2791c66cbbcf4b5e54766109a53fffcfc4112f85f5e729258bdb30e4ec5"
+PKG_VERSION="38182572571a48cb58057cde64b915237c4e2d58"
+PKG_SHA256="e4eaf64e9160b501cadf983a46b8a2a98c8b590a13ca9082793d9a11e17fdcaf"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-gba-libretro"
 PKG_URL="https://github.com/libretro/beetle-gba-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-lynx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-lynx"
-PKG_VERSION="c27322ec7f47fd8899fbbdb24827b0c1824cac8f"
-PKG_SHA256="9ca3b46a7a888df3ad383ffe337b67036755738b9438e67d08b23bf986983b8d"
+PKG_VERSION="b84c79b2f185482f9cec2b10f33cbe1bc5732dd9"
+PKG_SHA256="391c3a7858c11fea745e825993a80504783479f5e96523eb57c62437581c2849"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-lynx-libretro"
 PKG_URL="https://github.com/libretro/beetle-lynx-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-ngp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-ngp"
-PKG_VERSION="4556f7f14c011059f7b44f43cdd9f9bd5cbce9e3"
-PKG_SHA256="99fc9ec2fbd757cbd12701b555fa67640cbe72fc13aaab2991478977ca4b3d1d"
+PKG_VERSION="2c54de7bf4b250e43d707d407e108955be92b5c2"
+PKG_SHA256="c68213336f6b327238f60e38c0548a8ecc882787e1dd2712dfa828fe9de911f1"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-ngp-libretro"
 PKG_URL="https://github.com/libretro/beetle-ngp-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-pce-fast/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-pce-fast"
-PKG_VERSION="ccb886310e816ad3cf71d5addacff9018ee3b24a"
-PKG_SHA256="bab56accba65678fa1a3b0381b37354704e62874f4fb41e4b14731c5f5966565"
+PKG_VERSION="c97a258a2151039874029b9da2241a9730b892df"
+PKG_SHA256="8f964886d147dc72ad487989e82c9dc5b67215b3f736f0ad69efd953384bc912"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-pce-fast-libretro"
 PKG_URL="https://github.com/libretro/beetle-pce-fast-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-pcfx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-pcfx"
-PKG_VERSION="b5648f60681e481b5729ebc76608a41c6c709f8f"
-PKG_SHA256="02a7b7a125ee464cedc0e63ceead17d2e40925c0378787fef2039a0c287b2b43"
+PKG_VERSION="a1f1734509dd6acb11269f118d61f480ae8dbacf"
+PKG_SHA256="76f22fc238748fb7c63d260f725cae6fa3bd7797ad595ab8116a5c15b7c05e04"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-pcfx-libretro"
 PKG_URL="https://github.com/libretro/beetle-pcfx-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-makefile.patch

@@ -1,11 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2017-08-18 14:58:12.000000000 -0700
-+++ b/Makefile	2017-09-05 12:41:51.209673108 -0700
-@@ -198,7 +198,6 @@
-    TARGET := $(TARGET_NAME)_libretro.so
-    fpic := -fPIC
-    SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
--   CC = gcc
-    LDFLAGS += $(PTHREAD_FLAGS)
-    FLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR
-    IS_X86 = 0

packages/emulation/libretro-beetle-psx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-psx"
-PKG_VERSION="e1836bde1b250d41c6f91c2b6f06444d989f1138"
-PKG_SHA256="1495fc8f7fcaeb2b1f1ae9d8b5a0ffaad0fc0cd72634746964b42b67bc3a9732"
+PKG_VERSION="8b91df4d9937aa877d3b197f41fc2bad193dfd6f"
+PKG_SHA256="e0b023c4d8d30f437acd021a6717a0a7764069763ffc63d51caaf965a24f269f"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-psx-libretro"
 PKG_URL="https://github.com/libretro/beetle-psx-libretro/archive/${PKG_VERSION}.tar.gz"
@@ -14,6 +14,8 @@ PKG_LIBNAME="mednafen_psx_libretro.so"
 PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-PSX_LIB"
 
+PKG_MAKE_OPTS_TARGET="GIT_VERSION=${PKG_VERSION:0:7} LINK_STATIC_LIBCPLUSPLUS=0"
+
 makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
   cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}

packages/emulation/libretro-beetle-supergrafx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-supergrafx"
-PKG_VERSION="a0a943013d77a2114f2c33b9e9821bf57614d493"
-PKG_SHA256="f8cfa8f08774fa5c73a6a4d7301df707cea48cc991ac6f0bb1dfa24b84840bf4"
+PKG_VERSION="59062662d6e925ad512fcbb9c1a0db97d1592bc1"
+PKG_SHA256="bcde5480323c6aaf0764998517c73f9e66e891de13f450eaefb33304716be547"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-supergrafx-libretro"
 PKG_URL="https://github.com/libretro/beetle-supergrafx-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-vb/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-vb"
-PKG_VERSION="0b1bb419d35e90f7b63323e8e8ee217c2e8e3e3f"
-PKG_SHA256="af3846f574050838fc6a120015e937fc4c068c13b3a5a0ea1136f7422bd547d9"
+PKG_VERSION="aeb8e0793b2b05c112b9e73ca8f7f26fd762f8f6"
+PKG_SHA256="8e92f72edd172d7ceb7725f1be7aa2681a2a80f8b0df17dcfcc7eee34b17a1b5"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-vb-libretro"
 PKG_URL="https://github.com/libretro/beetle-vb-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-beetle-wswan/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-beetle-wswan"
-PKG_VERSION="362b5c05ca4e063b1a53f2eb132dc126bfe1ea82"
-PKG_SHA256="ed5fdfe8e85260a47e0cf026a1675701805ed3546afe876395067953a47ff86c"
+PKG_VERSION="22d007d9edee90c21cb38726604280c0c2ba72fb"
+PKG_SHA256="2bb45e24c1bd4191f2739ac94e0f3381bc4bd68b8ba27453ec1b1913073d029b"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-wswan-libretro"
 PKG_URL="https://github.com/libretro/beetle-wswan-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-bluemsx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-bluemsx"
-PKG_VERSION="5b8718c8bba44ff4adda1bcc575895d342c1ba6a"
-PKG_SHA256="6304ea92a694af3cf86afc082a7f1ad99f380b4f2a637f5410837874a45f8c44"
+PKG_VERSION="cfc1df4d026387883f21994bcce603c4a6be8730"
+PKG_SHA256="fe5dee98a5732009fb7ce48f7111af3f212594f0876a14fe9dfa96fbfc6f6111"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/blueMSX-libretro"
 PKG_URL="https://github.com/libretro/blueMSX-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-bsnes-mercury-accuracy/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-bsnes-mercury-accuracy"
-PKG_VERSION="dd320a3c98ba39fdd9d2536835cdf1264ca7cafb"
-PKG_SHA256="8494b45233194958608507f16e84de1018eb3560759791b94737d0d4a6d28e58"
+PKG_VERSION="d232c6ea90552f5921fec33a06626f08d3e18b24"
+PKG_SHA256="8211bc03a722486c9d62453d6f69ec050210687c8a4e5fa6f7a13b0ba114c573"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
 PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-bsnes-mercury-balanced/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-bsnes-mercury-balanced"
-PKG_VERSION="dd320a3c98ba39fdd9d2536835cdf1264ca7cafb"
-PKG_SHA256="8494b45233194958608507f16e84de1018eb3560759791b94737d0d4a6d28e58"
+PKG_VERSION="d232c6ea90552f5921fec33a06626f08d3e18b24"
+PKG_SHA256="8211bc03a722486c9d62453d6f69ec050210687c8a4e5fa6f7a13b0ba114c573"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
 PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-bsnes-mercury-performance/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-bsnes-mercury-performance"
-PKG_VERSION="dd320a3c98ba39fdd9d2536835cdf1264ca7cafb"
-PKG_SHA256="8494b45233194958608507f16e84de1018eb3560759791b94737d0d4a6d28e58"
+PKG_VERSION="d232c6ea90552f5921fec33a06626f08d3e18b24"
+PKG_SHA256="8211bc03a722486c9d62453d6f69ec050210687c8a4e5fa6f7a13b0ba114c573"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
 PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-cap32/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-cap32"
-PKG_VERSION="ad7397f1de6896193458e575f559cc51e34f3a6b"
-PKG_SHA256="08739968f5ccbf42db9405a66f0d6b33533b9520814d46a857bd50d606d6c932"
+PKG_VERSION="0fd5f1f35f28484425a1707358e58de746e756f7"
+PKG_SHA256="ce2e4ccd3bf8167d32e09a3c0807b9e86d16fe07a31d5f384166dc6db27317dd"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-cap32"
 PKG_URL="https://github.com/libretro/libretro-cap32/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-dinothawr/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-dinothawr"
-PKG_VERSION="ab930efa7e0f02c3fc8153397fd64daee8f02cfd"
-PKG_SHA256="2564ffc65e4d34fc3d9bc31b1b847fe5cf36fc327d309b94a4ba317c7ab96995"
+PKG_VERSION="f4badb6143f660ff654e6c1d0d48e0b40610e188"
+PKG_SHA256="38fbd01f7db31b4e7d19c1c0427de181facd397a1ffc35c42d76066b5bf9e1f2"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/Dinothawr"
 PKG_URL="https://github.com/libretro/Dinothawr/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-dosbox-pure/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-dosbox-pure"
-PKG_VERSION="0.10"
-PKG_SHA256="1bcc9cfb02afd1ceaf85e2030c696a3a641d3a2ef0f6988604f4a4959e38df20"
+PKG_VERSION="4d70760d65140c97634d2d6e8a9876e571790670"
+PKG_SHA256="4f9a260dc097eb357e68b81d87c72a38a3ca2bef16898f4d0385e8b73fad50b7"
 PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/schellingb/dosbox-pure"
-PKG_URL="https://github.com/schellingb/dosbox-pure/archive/${PKG_VERSION}.tar.gz"
+PKG_SITE="https://github.com/libretro/dosbox-pure"
+PKG_URL="https://github.com/libretro/dosbox-pure/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.dosbox-pure: DOSBox-Pure for Kodi"
 PKG_BUILD_FLAGS="+pic"

packages/emulation/libretro-dosbox-pure/patches/libretro-dosbox-pure-001-cross-compile-fix.patch

@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index fed5ce1..6f1b23c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -150,6 +150,9 @@ else
+   CXX     ?= g++
+   LDFLAGS := -Wl,--gc-sections -fno-ident
+   COMMONFLAGS += -pthread
++ifeq (1,1) # always
++  CPUFLAGS :=
++else
+   # ARM optimizations
+   PROCCPU := $(shell cat /proc/cpuinfo))
+   ifneq ($(and $(filter ARMv7,$(PROCCPU)),$(filter neon,$(PROCCPU))),)
+@@ -174,6 +177,7 @@ else
+     CXX := g++-9
+   endif
+ endif
++endif
+ 
+ ifeq ($(BUILD),DEBUG)
+   BUILDDIR := debug

packages/emulation/libretro-fbneo/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-fbneo"
-PKG_VERSION="67f87d5e58ac4bbc88c61d263ecb2af7faea49f3"
-PKG_SHA256="cc3b588d18dcf207e0e6bba258e9dfc602a3e1c7602f7db752ec34d5d36414ed"
+PKG_VERSION="2927f22537ce4b15cbdf2d2a3ed0c34f9e9a94ec"
+PKG_SHA256="5d0d2673df9a75199de4400bbffe741eb6ed4618f526946c7cf9a4e72093d424"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/libretro/FBNeo"
 PKG_URL="https://github.com/libretro/FBNeo/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-fceumm/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-fceumm"
-PKG_VERSION="7649a24ca28bb22e732594402680877657c09246"
-PKG_SHA256="2b05e676e0161d651d54ab6c0b830ccf1634d603abda1910099a6bebed823d7d"
+PKG_VERSION="db2f0f7f9de0714e0d33c2320869bdfe372b326a"
+PKG_SHA256="f530d0c0abba089ea32967860cb3f462348ec8c7620389b0c439077f78afc366"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-fceumm"
 PKG_URL="https://github.com/libretro/libretro-fceumm/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-fmsx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-fmsx"
-PKG_VERSION="5f9df675521f103a4b1c1eeb3f6abe1688bdf3b2"
-PKG_SHA256="007b81b0a2efdf74150cd847896e0229db7bc464e0d937e733a5bce9046e88e8"
+PKG_VERSION="9c0f61dbe320a4e551784a74264b037208c36dba"
+PKG_SHA256="48a42792e3ba04f2728a04613f3af9c5b1e859d6c3e9fa45748cdaed4a04f5ea"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/fmsx-libretro"
 PKG_URL="https://github.com/libretro/fmsx-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-fuse/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-fuse"
-PKG_VERSION="8da83b597724763728ef3d9c2c877317bd7342df"
-PKG_SHA256="28b141f8d3b08e74a08d134e2cd7cdc700f833eb7c57a3478ce78b89c62f901b"
+PKG_VERSION="5f331e9772d305ba5209db0910b1963b9d0974c0"
+PKG_SHA256="cb45e77fa13f32ce50a9b9104d9636ccb93b63b7b107c1d4123ebcbcaedffe50"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/fuse-libretro"
 PKG_URL="https://github.com/libretro/fuse-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-gambatte/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-gambatte"
-PKG_VERSION="2d0f75162384867fccff9236db5725c1987300a2"
-PKG_SHA256="8b97677862216bf0809f42ccca031432f4c598bb2be7a0f95f5e7feefffd6f6e"
+PKG_VERSION="9ae0cdfb368d02665a6d9d478a9418b2e199b218"
+PKG_SHA256="620b8e34a76a7f5f595b0671c63d65cea98a4ddad0c250017907dde89a8e6831"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/gambatte-libretro"
 PKG_URL="https://github.com/libretro/gambatte-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-genplus/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-genplus"
-PKG_VERSION="0164eb9730c0803674a54a3694633a56f4801661"
-PKG_SHA256="549961291e5615caa156186d5975353db84488ef7395a9d095b37ae30cf22891"
+PKG_VERSION="ad3b754d01428ad18d47c10724c61c6b4dacd382"
+PKG_SHA256="329a98ce05f82d68cbf4c53bf3be1aedecdca9cc16b608e4576486d4a253f695"
 PKG_LICENSE="Modified BSD / LGPLv2.1"
 PKG_SITE="https://github.com/libretro/Genesis-Plus-GX"
 PKG_URL="https://github.com/libretro/Genesis-Plus-GX/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-gw/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-gw"
-PKG_VERSION="42dc7c0a5a0dc5f35ec61af0a2b08f6e3894589e"
-PKG_SHA256="1c1a6d553fc32bfd237c2c4b847151929004d236475386ca0b99b3c70a2e7871"
+PKG_VERSION="7b3e374a1067a80324f1e4905136bae357ec18da"
+PKG_SHA256="719a8c98a7257462d697e714d94533fa715efe776209d37cabc1146e0d04faa1"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/gw-libretro"
 PKG_URL="https://github.com/libretro/gw-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-handy/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-handy"
-PKG_VERSION="1662ce61937988312347378103961b6aecc7e9f4"
-PKG_SHA256="09a8c527a45d287563d903bd90e94e32b4b8a94d728d5e211ddc761a475968df"
+PKG_VERSION="7eccd7da7f3bead8810389c7c98e5287e72dbdc3"
+PKG_SHA256="2c6a0da5855438b56874c45d70371b998cf4a95224fcf26c80096063a46d3a9d"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-handy"
 PKG_URL="https://github.com/libretro/libretro-handy/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-hatari/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-hatari"
-PKG_VERSION="4398f99dcfc940636db629faadd92f50df569705"
-PKG_SHA256="a1c5933e052acb9486d6c1b9073ec63eecd519300a2cdc051185ae83b1980ed9"
+PKG_VERSION="cea06eebf695b078fadc0e78bb0f2b2baaca799f"
+PKG_SHA256="41a044a0a5625052a4a477dca47897aafccd23d835dc20b43e41b37a38e64628"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/hatari"
 PKG_URL="https://github.com/libretro/hatari/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-mame2000/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2000"
-PKG_VERSION="2ebd95dab0ded3e7e57bde4ae070ed2360390e82"
-PKG_SHA256="b6480438a371593cfb33f626a896869ddb765745084ee6446000222f8608a6c4"
+PKG_VERSION="75c85fa07c1d4edc4fedfd3c4a6a10b39ffc2117"
+PKG_SHA256="73d47ad466697179459f0289ca428cff2cd59ebebb8e69cb4c5887a8d9b3becb"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2000-libretro"
 PKG_URL="https://github.com/libretro/mame2000-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-mame2003/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2003"
-PKG_VERSION="96e6a96c521423ccc371afadd234710d5d9f1eaa"
-PKG_SHA256="fc2c480939dd142d10354ffa9550b8bd1d0a26a501cd0bb36cb40a451c07e108"
+PKG_VERSION="68f19663029b1529f70207d8acdd5c50e4c62854"
+PKG_SHA256="160a8a8dbb46eae1577635fac2e315b0f7fb914fea02a68cb6142dc862ec31a3"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2003-libretro"
 PKG_URL="https://github.com/libretro/mame2003-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-mame2003_plus/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2003_plus"
-PKG_VERSION="5fcdd8ffbb6c6d04b1e5525e19c217867252c8bf"
-PKG_SHA256="ee40823418c001284f42a62d920a485d9d4b98b36209a059b5f2a43b15bfe053"
+PKG_VERSION="a69c1c6c354ff2a7a3b0b92d92f1ae3a51380a7b"
+PKG_SHA256="e72d2fa9521d43756b3d8dcf65de53ad3e530fe687c79775aee6fc391cbfeab9"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2003-plus-libretro"
 PKG_URL="https://github.com/libretro/mame2003-plus-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-mame2010/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2010"
-PKG_VERSION="1549da1c32a8aa3c88832db3f91ff9b8b100471c"
-PKG_SHA256="17a1f2fa88c0aff88e119930d3284dfe53df5be31cde003aab675f6737d50cee"
+PKG_VERSION="932e6f2c4f13b67b29ab33428a4037dee9a236a8"
+PKG_SHA256="af60ec225fc4470e7bbc4a2e35cc7d4e1498aed4fe35b8f238fd5ba0dd9ead26"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2010-libretro"
 PKG_URL="https://github.com/libretro/mame2010-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-mame2010/patches/libretro-mame2010-0001_fix-cross-build.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index e55363d..2ce19e0 100644
+index 65ece36..bd7d670 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -61,7 +61,7 @@ COBJFLAGS =
@@ -11,7 +11,7 @@ index e55363d..2ce19e0 100644
  LDFLAGSEMULATOR =
  
  GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
-@@ -104,24 +104,22 @@ ifeq ($(VRENDER),opengl)
+@@ -104,27 +104,25 @@ ifeq ($(VRENDER),opengl)
  	CCOMFLAGS  += -DHAVE_OPENGL
  endif
  
@@ -32,6 +32,10 @@ index e55363d..2ce19e0 100644
  ifneq (,$(findstring mingw64-w64,$(PATH)))
  PTR64 ?= 1
  endif
+-ifeq ($(firstword $(filter arm64,$(UNAME))),arm64)
++ifeq ($(firstword $(filter arm64,$(ARCH))),arm64)
+ PTR64 ?= 1
+ endif
 -ifneq (,$(findstring Power,$(UNAME)))
 +ifneq (,$(findstring Power,$(ARCH)))
  BIGENDIAN=1
@@ -41,7 +45,7 @@ index e55363d..2ce19e0 100644
  BIGENDIAN=1
  endif
  
-@@ -143,14 +141,10 @@ ifeq ($(VRENDER),opengl)
+@@ -146,14 +144,10 @@ ifeq ($(VRENDER),opengl)
     LIBS += -lGL
  endif
  LDFLAGS += $(SHARED)
@@ -60,7 +64,7 @@ index e55363d..2ce19e0 100644
     CCOMFLAGS += $(PLATCFLAGS) -ffast-math  
     LIBS += -lstdc++ -lpthread 
  
-@@ -433,10 +427,13 @@ else ifneq (,$(findstring rpi,$(platform)))
+@@ -462,10 +456,13 @@ else ifneq (,$(findstring rpi,$(platform)))
  
  # ARM
  else ifneq (,$(findstring armv,$(platform)))
@@ -76,7 +80,7 @@ index e55363d..2ce19e0 100644
     LDFLAGS +=  $(SHARED)
     ARM_ENABLED = 1
     X86_SH2DRC = 0
-@@ -655,7 +652,7 @@ DEFS += -DFLAC__NO_DLL
+@@ -683,7 +680,7 @@ DEFS += -DFLAC__NO_DLL
  
  # CFLAGS is defined based on C or C++ targets
  # (remember, expansion only happens when used, so doing it here is ok)

packages/emulation/libretro-mesen/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mesen"
-PKG_VERSION="86326e832974d984846ae078e568c023a5f76f1f"
-PKG_SHA256="50687bfd9fb242c878a420cb44a74e9bc9503bfd43f2e47f6d345cf5d8fca249"
+PKG_VERSION="0739c9d0fbc550c1c8ebae976a2b95bb801ebbdc"
+PKG_SHA256="5ab0fbc17571fbd69e62b2c65a75e1968f4ed1964765302d924e055272275ea4"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/SourMesen/Mesen/"
 PKG_URL="https://github.com/SourMesen/Mesen/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-mgba/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mgba"
-PKG_VERSION="0d826c9307bef16ff54468986173162acaafdf70"
-PKG_SHA256="f3bdf33b0864b989aba247d8b19476cf3e7291464d8bdfcc0027e974c5675945"
+PKG_VERSION="70ed83cf849ddd620d9ad66e0fc46980184dda89"
+PKG_SHA256="5737a0803ffe3254043e764a7ac6ffb7dd20386d8421c33598d6223ac1214b9b"
 PKG_LICENSE="MPL 2.0"
 PKG_SITE="https://github.com/libretro/mgba"
 PKG_URL="https://github.com/libretro/mgba/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-nestopia/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-nestopia"
-PKG_VERSION="f0e1e701c125847e61008af84ac05f040a85eeb8"
-PKG_SHA256="b9eee745c918b9192861cb6af2ceffbb02a81af06900f2ec93a35d9327eb545c"
+PKG_VERSION="ea6f1c0631bb62bf15ab96493127dd9cfaf74d1c"
+PKG_SHA256="d8c84a8fdf24cf80875b67b47d844690ea78c6b7c25e9b3cf2394c0dae20289b"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/nestopia"
 PKG_URL="https://github.com/libretro/nestopia/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-nx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-nx"
-PKG_VERSION="5831e4876ab92b1771e34b66589c33895d3d3cb8"
-PKG_SHA256="f896b6f5167c864f81604b42fae69c3d8234778f6552205c7c84d1d6a990a1fe"
+PKG_VERSION="505c74421898b93640b313cde48e47ffdd439fe3"
+PKG_SHA256="3a8b96cf46d4411bff34a75782aa2162610d2731adb546d3ed7838b61700f469"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/nxengine-libretro"
 PKG_URL="https://github.com/libretro/nxengine-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-o2em/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-o2em"
-PKG_VERSION="0405ea0b1674b9bb2ae4282beae918108b88d92e"
-PKG_SHA256="43fc66243e21d98f1c51832a806e255b28cf265906ae8b0d34fe10679c2aebf8"
+PKG_VERSION="086035c852c2780d55e5e72a9ebde976bbd8dc5e"
+PKG_SHA256="5a7f4c41bb65e2255c3d88fd98e4c133e402c8ef7cc6ee7b0aa7cbe84365dd25"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-o2em"
 PKG_URL="https://github.com/libretro/libretro-o2em/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-opera/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-opera"
-PKG_VERSION="539dc447b536ba52eb3485f11d9bf1c06e30cf75"
-PKG_SHA256="5552025528d8e9100b2f6729ab511f7708f36a687d2d07c379a0087ae7b81021"
+PKG_VERSION="7369aa80f2e965036f705a311e5d5f30ab98cc14"
+PKG_SHA256="8b4d50ace3afc277ea727ad81bd689797bbe76ee6eea8bf86063fb94b4c56619"
 PKG_LICENSE="GPL-2.0-or-later"
 PKG_SITE="https://github.com/libretro/opera-libretro"
 PKG_URL="https://github.com/libretro/opera-libretro/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-opera/patches/libretro-opera-995.01-crosscompile.patch

@@ -1,14 +1,5 @@
-From a845c2c44e2bed070b1f6db5b0fda5a7a84485e6 Mon Sep 17 00:00:00 2001
-From: SupervisedThinking <supervisedthinking@gmail.com>
-Date: Thu, 18 Feb 2021 13:21:30 +0100
-Subject: [PATCH] Makefile: only define cc, cxx, ar, ld if not predefined
-
----
- Makefile | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
 diff --git a/Makefile b/Makefile
-index f588a3c..27c5461 100644
+index c62fee2..49b0e98 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -49,8 +49,8 @@ unixpath = $(subst \,/,$1)
@@ -33,19 +24,19 @@ index f588a3c..27c5461 100644
  
      TARGET := $(TARGET_NAME)_libretro.so
      fpic := -fPIC
-@@ -180,9 +180,9 @@ ifeq ($(IOSSDK),)
+@@ -181,9 +181,9 @@ ifeq ($(IOSSDK),)
     IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
  endif
  ifeq ($(platform),ios-arm64)
--   CC = cc -arch arm64 -isysroot $(IOSSDK)
-+   CC ?= cc -arch arm64 -isysroot $(IOSSDK)
+-   CC = cc -arch arm64 -isysroot $(IOSSDK) -stdlib=libc++
++   CC ?= cc -arch arm64 -isysroot $(IOSSDK) -stdlib=libc++
  else
 -   CC = cc -arch armv7 -isysroot $(IOSSDK)
 +   CC ?= cc -arch armv7 -isysroot $(IOSSDK)
  endif
  ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
-    SHARED += -miphoneos-version-min=8.0
-@@ -213,18 +213,18 @@ else ifeq ($(platform), qnx)
+    MINVERSION = -miphoneos-version-min=8.0
+@@ -216,18 +216,18 @@ else ifeq ($(platform), qnx)
     TARGET := $(TARGET_NAME)_libretro_$(platform).so
     fpic := -fPIC
     SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
@@ -69,7 +60,7 @@ index f588a3c..27c5461 100644
     STATIC_LINKING = 1
     FLAGS += -DMSB_FIRST
     NO_GCC = 1
-@@ -232,25 +232,25 @@ else ifeq ($(platform), sncps3)
+@@ -235,25 +235,25 @@ else ifeq ($(platform), sncps3)
  # PSP1
  else ifeq ($(platform), psp1)
     TARGET := $(TARGET_NAME)_libretro_$(platform).a
@@ -102,7 +93,7 @@ index f588a3c..27c5461 100644
     FLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard
     FLAGS += -Wall -mword-relocations
     FLAGS += -fomit-frame-pointer -ffast-math
-@@ -308,8 +308,8 @@ else ifeq ($(platform), emscripten)
+@@ -311,8 +311,8 @@ else ifeq ($(platform), emscripten)
  # Windows MSVC 2003 Xbox 1
  else ifeq ($(platform), xbox1_msvc2003)
  TARGET := $(TARGET_NAME)_libretro_xdk1.lib
@@ -113,7 +104,7 @@ index f588a3c..27c5461 100644
  
  export INCLUDE := $(XDK)/xbox/include
  export LIB := $(XDK)/xbox/lib
-@@ -322,8 +322,8 @@ HAS_GCC := 0
+@@ -325,8 +325,8 @@ HAS_GCC := 0
  else ifeq ($(platform), xbox360_msvc2010)
  TARGET := $(TARGET_NAME)_libretro_xdk360.lib
  MSVCBINDIRPREFIX = $(XEDK)/bin/win32
@@ -124,7 +115,7 @@ index f588a3c..27c5461 100644
  
  export INCLUDE := $(XEDK)/include/xbox
  export LIB := $(XEDK)/lib/xbox
-@@ -456,9 +456,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
+@@ -461,9 +461,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
  
  	TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
  
@@ -137,7 +128,7 @@ index f588a3c..27c5461 100644
  
  	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
  	fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
-@@ -612,7 +612,7 @@ ifeq ($(STATIC_LINKING),1)
+@@ -617,7 +617,7 @@ ifeq ($(STATIC_LINKING),1)
  	LD ?= lib.exe
  	STATIC_LINKING=0
  else

packages/emulation/libretro-pcsx-rearmed/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-pcsx-rearmed"
-PKG_VERSION="976907a40062e6e9bb6a05530259132fe1c2a90e"
-PKG_SHA256="ab77c325831b4f275a8e94366f583267405b916769f7636096d1a1a68c3ec315"
+PKG_VERSION="776d27285f394abc21aa3ecb31cbec24584ab112"
+PKG_SHA256="0107eba87b40f726221088383ad8e0399a7bdd7fd3e77ce91c323410d587228c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"
 PKG_URL="https://github.com/libretro/pcsx_rearmed/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-picodrive/package.mk

@@ -0,0 +1,72 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libretro-picodrive"
+PKG_VERSION="c567d74ce42078f58168debe7e5e414bda441b6c"
+PKG_SHA256="a4a737c6a550454969ae81f3c525c66eaf9253500430e9e1184fc620b0d5e2db"
+PKG_LICENSE="MAME"
+PKG_SITE="https://github.com/kodi-game/picodrive"
+PKG_URL="https://github.com/kodi-game/picodrive/releases/download/picodrive-${PKG_VERSION}/picodrive-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_TARGET="toolchain kodi-platform ${PKG_NAME}:host"
+PKG_DEPENDS_UNPACK="cyclone68000"
+PKG_LONGDESC="Fast MegaDrive/MegaCD/32X emulator"
+PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-gold"
+
+PKG_LIBNAME="picodrive_libretro.so"
+PKG_LIBPATH="${PKG_LIBNAME}"
+PKG_LIBVAR="PICODRIVE_LIB"
+
+pre_build_host() {
+  cp -a $(get_build_dir cyclone68000)/* ${PKG_BUILD}/cpu/cyclone/
+}
+
+pre_configure_host() {
+  # fails to build in subdirs
+  cd ${PKG_BUILD}
+  rm -rf .${HOST_NAME}
+}
+
+make_host() {
+  if [ "${ARCH}" = "arm" ]; then
+    make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h
+  fi
+}
+
+pre_configure_target() {
+  # fails to build in subdirs
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
+}
+
+post_configure_target() {
+  sed -e "s|^GIT_VERSION :=.*$|GIT_VERSION := \" ${PKG_VERSION:0:7}\"|" -i Makefile.libretro
+}
+
+make_target() {
+  if target_has_feature neon; then
+    export HAVE_NEON=1
+    export BUILTIN_GPU=neon
+   else
+    export HAVE_NEON=0
+  fi
+
+  case ${TARGET_ARCH} in
+    aarch64)
+      R= make -f Makefile.libretro platform=aarch64
+      ;;
+    arm)
+      R= make -f Makefile.libretro platform=armv
+      ;;
+    x86_64)
+      R= make -f Makefile.libretro
+      ;;
+  esac
+}
+
+makeinstall_target() {
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
+}

packages/emulation/libretro-pokemini/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-pokemini"
-PKG_VERSION="7a2016e09fe979ff60c9f2e19a4bda57c4ea4de4"
-PKG_SHA256="db380ee85102fccafcada82a7c69c570d7b61eb9cec73363036939c4636bdeca"
+PKG_VERSION="bbe9a72b925ab61ec1250bac1a7b9f80badd5964"
+PKG_SHA256="8609fae5849119eafb6a03627cc874b29a372e5e0430b679252aa6c745f47c5d"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/pokemini"
 PKG_URL="https://github.com/libretro/pokemini/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-prboom/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-prboom"
-PKG_VERSION="45b1af3264ec51f15a5f7736da817b41e25f7751"
-PKG_SHA256="f88f4f5d6a4d205acaf8e048fba3ff984dc570823cdc2fa3c44e9ff1ab1308fc"
+PKG_VERSION="1e4e73e8589aae7e28ef0aa9eb91d91c1d3308b3"
+PKG_SHA256="0f92abd9a90a346d89513b9d1ec5a92aeec5146004f8d3646bdbed2d2e3d362e"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-prboom"
 PKG_URL="https://github.com/libretro/libretro-prboom/archive/${PKG_VERSION}.tar.gz"

packages/emulation/libretro-prosystem/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-prosystem"
-PKG_VERSION="c0f59a19a163cc5f18121ce48c25f2f58de223df"
-PKG_SHA256="37c62e867c4267412a9adfb8d72309acb969bdecb32f69e7fb77359610b79857"
+PKG_VERSION="c95bbb5ce1a7afe0c0dcc0460de312e045a229aa"
+PKG_SHA256="a91a2f680981ab8cd31a5102e2fdc52ef155dfe30fc98215b442ac2f27c12bec"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/prosystem-libretro"
 PKG_URL="https://github.com/libretro/prosystem-libretro/archive/${PKG_VERSION}.tar.gz"