Merge pull request #7966 from heitbaum/kernel61y

[le11] linux: update to 6.1.y

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ccid"
-PKG_VERSION="1.5.1"
-PKG_SHA256="e7a78c398ec0d617a4f98bac70d5b64f78689284dd0ae87d4692e2857f117377"
+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.bz2"

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="cli"
 PKG_VERSION="$(get_pkg_version moby)"
-PKG_SHA256="37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94"
+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"
@@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI"
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/docker/cli/releases
-export PKG_GIT_COMMIT="a5ee5b1dfc9b8f08ed9e020bb54fc18550173ef6"
+export PKG_GIT_COMMIT="ef23cbc4315ae76c744e02d687c09548ede461bd"
 
 configure_target() {
   go_configure

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.6.16"
-PKG_SHA256="e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a"
+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"
@@ -19,9 +19,9 @@ pre_make_target() {
 
   go_configure
 
-  export CONTAINERD_VERSION=${PKG_VERSION}
-  export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
-  export CONTAINERD_PKG=github.com/containerd/containerd
+  export CONTAINERD_VERSION="${PKG_VERSION}"
+  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
 

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

@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="ctop"
+PKG_VERSION="0.7.7"
+PKG_SHA256="0db439f2030af73ad5345884b08a33a762c3b41b30604223dd0ebddde72d2741"
+PKG_LICENSE="MIT"
+PKG_SITE="https://ctop.sh"
+PKG_URL="https://github.com/bcicen/ctop/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_LONGDESC="Top-like interface for container metrics"
+PKG_TOOLCHAIN="manual"
+
+# Git commit of the matching release https://github.com/bcicen/ctop/releases
+PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
+
+pre_make_target() {
+  go_configure
+
+  export CTOP_VERSION="${PKG_VERSION}"
+  export CTOP_REVISION="${PKG_GIT_COMMIT}"
+  export CTOP_PKG="github.com/bcicen/ctop"
+  export LDFLAGS="-w -extldflags -static -X main.version=${CTOP_VERSION} -X main.build=${CTOP_REVISION} -extld ${CC}"
+
+  mkdir -p ${GOPATH}/src/github.com/bcicen
+  ln -fs ${PKG_BUILD} ${GOPATH}/src/${CTOP_PKG}
+}
+
+make_target() {
+  mkdir -p bin
+  ${GOLANG} build -v -o bin/ctop -a -tags "static_build release" -ldflags "${LDFLAGS}"
+}

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="23.0.1"
-PKG_SHA256="c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56"
+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="bc3805a0a0d3b5bd3f0e6c69f46ac08dd53377c7"
+export PKG_GIT_COMMIT="9dbdbd4b6d7681bd18c897a6ba0376073c2a72ff"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \

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.14"
+PKG_VERSION="6.0.19"
 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="c25a09594965b241ee42ddb41d5fb68afab1b58e37a68317f2678a7cf7309a8b"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/10762208-8896-423a-b7f3-5084c7548ce7/620af5c42e5a4087478890294dbe39fb/aspnetcore-runtime-6.0.14-linux-arm64.tar.gz"
+    PKG_SHA256="fb4d55dd30f3956595c398477436322819fd1cf7d273a559db5e43a14435c9bb"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/86b5e7ea-d316-4b44-a543-95cbfeafadd9/7e7b8ed4c007d9290c2099b5bcd144af/aspnetcore-runtime-6.0.19-linux-arm64.tar.gz"
     ;;
   "arm")
-    PKG_SHA256="da7f9e231476cfb5f52f1f469a1ef22b5bb052a0ce53af97b21b70bca0abef0a"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4fac9144-1998-4d99-8000-6f8c8a19e9a3/3d722a6e310cf82c898f91138971be5b/aspnetcore-runtime-6.0.14-linux-arm.tar.gz"
+    PKG_SHA256="d9ac8112187666535e2940daa90c55606d2f62a3a267ae471c92859e25a87b60"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f33d9dc8-1f77-48dc-89f5-8f691038d629/90926d8575953228ee5271530e08b595/aspnetcore-runtime-6.0.19-linux-arm.tar.gz"
     ;;
   "x86_64")
-    PKG_SHA256="721dc8e29892dcaaaab4bc7d2e8630a98d349f2d832855156f7b7898d1a55b07"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/092f7e69-2e23-40b3-8f36-628d25ac7109/4995e4e141b26ea049163af84592222c/aspnetcore-runtime-6.0.14-linux-x64.tar.gz"
+    PKG_SHA256="217e4dfb3c9469580559f5714daa3c505f36156d2bd97a15238d240c6bcc54bf"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/fb0913f6-79a8-40b6-b604-bda42b60d0c2/eb98e78d3d75c16326a54cd0277b5406/aspnetcore-runtime-6.0.19-linux-x64.tar.gz"
     ;;
 esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

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.19.5"
-PKG_SHA256="1c24a6a2bf71d64d0ca8e228028d6108521f06b6edc7bf6b34ed6d767a795809"
+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"

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

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libseccomp"
+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"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="An easy to use, platform independent, interface to the Linux Kernel syscall filtering mechanism"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET+=" --enable-static --enable-shared"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpg123"
-PKG_VERSION="1.31.1"
-PKG_SHA256="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
+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"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpv-drmprime"
-PKG_VERSION="0.35.0"
-PKG_SHA256="dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00"
+PKG_VERSION="0.35.1"
+PKG_SHA256="41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mpv.io/"
 PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"

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.2"
-PKG_SHA256="db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560"
+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.12"
-PKG_SHA256="e38e0a97b30a97b4355da93467160a20dea10932f6c17473774802e03d61d4a7"
+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/rar2fs/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rar2fs"
-PKG_VERSION="1.29.5"
-PKG_SHA256="a56e9f2fd3d5037087b8405cff85ce7ffb74a904176f33f55b7bd15117cff2be"
+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/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"

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.2"
-PKG_SHA256="f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5"
+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/rsyslog-depends/librelp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="librelp"
-PKG_VERSION="1.10.0"
-PKG_SHA256="148db4e4d1a23e8136e9ec08810929a55faf5d45e24c2e3186d5ab34355dab31"
+PKG_VERSION="1.11.0"
+PKG_SHA256="7719b5f31e07cbb9872289ad32b787c613b5355d407982a0a2c4d69938457fd6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.rsyslog.com/category/librelp/"
 PKG_URL="https://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz"

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

@@ -3,12 +3,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="runc"
-PKG_VERSION="1.1.4"
-PKG_SHA256="4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34"
+PKG_VERSION="1.1.7"
+PKG_SHA256="f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/opencontainers/runc"
 PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_DEPENDS_TARGET="toolchain go:host libseccomp"
 PKG_LONGDESC="A CLI tool for spawning and running containers according to the OCI specification."
 PKG_TOOLCHAIN="manual"
 
@@ -19,6 +19,7 @@ pre_make_target() {
   go_configure
 
   export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld ${CC}"
+  export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
   mkdir -p ${GOPATH}
   if [ -d ${PKG_BUILD}/vendor ]; then
@@ -30,5 +31,5 @@ pre_make_target() {
 
 make_target() {
   mkdir -p bin
-  ${GOLANG} build -v -o bin/runc -a -tags "cgo static_build" -ldflags "${LDFLAGS}" ./
+  ${GOLANG} build -v -o bin/runc -a -tags "cgo seccomp static_build" -ldflags "${LDFLAGS}" ./
 }

packages/addons/addon-depends/snapcast-depends/asio/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="asio"
-PKG_VERSION="1.24.0"
-PKG_SHA256="6bb8139ebc1c97a4364f6e517b9258ecc96345a3bfc4d110f931ac123dbdc824"
+PKG_VERSION="1.28.0"
+PKG_SHA256="5c2af07ef73b42a2d48e34c0ecbf41cd40dc823bc681bf5833c129384999c963"
 PKG_LICENSE="BSL"
 PKG_SITE="http://think-async.com/Asio"
 PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip"

packages/addons/addon-depends/snapcast-depends/nqptp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nqptp"
-PKG_VERSION="c71b49a3556ba8547ee28482cb31a97fe99298aa"
-PKG_SHA256="02ed710ed37269adbede06fcd4e12892cc0f9d14d5c68b7f45d67b8694bff1e4"
+PKG_VERSION="1.2.1"
+PKG_SHA256="fab700572961ca81addb405e8bd4bd57c47259f91e7e8e0f5f82240c38c63ce5"
 PKG_LICENSE="GPL-2.0"
 PKG_SITE="https://github.com/mikebrady/nqptp"
 PKG_URL="https://github.com/mikebrady/nqptp/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="shairport-sync"
-PKG_VERSION="4.1.1"
-PKG_SHA256="e55caad73dcd36341baf8947cf5e0923997370366d6caf3dd917b345089c4a20"
+PKG_VERSION="4.2"
+PKG_SHA256="649d95eede8b9284b2e8b9c97d18c1c64cffae0a6c75bc4f03e3ae494a3e25b6"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/mikebrady/shairport-sync"
 PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapcast"
-PKG_VERSION="0.26.0"
-PKG_SHA256="166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683"
+PKG_VERSION="0.27.0"
+PKG_SHA256="c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/snapcast"
 PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-03_boost.patch

@@ -1,48 +0,0 @@
-commit 438b83b0b93f2914b1830347b4e24722618d9ba4
-Author: Rudi Heitbaum <rudi@heitbaum.com>
-Date:   Wed Dec 21 11:31:29 2022 +0000
-
-    server/control_session_http: update for boost 1.81.0
-
-diff --git a/server/control_session_http.cpp b/server/control_session_http.cpp
-index 385b3197..6522f5a9 100644
---- a/server/control_session_http.cpp
-+++ b/server/control_session_http.cpp
-@@ -127,8 +127,8 @@ boost::beast::string_view mime_type(boost::beast::string_view path)
- std::string path_cat(boost::beast::string_view base, boost::beast::string_view path)
- {
-     if (base.empty())
--        return path.to_string();
--    std::string result = base.to_string();
-+        return static_cast<std::string>(path);
-+    std::string result = static_cast<std::string>(base);
-     char constexpr path_separator = '/';
-     if (result.back() == path_separator)
-         result.resize(result.size() - 1);
-@@ -171,7 +171,7 @@ void ControlSessionHttp::handle_request(http::request<Body, http::basic_fields<A
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = why.to_string();
-+        res.body() = static_cast<std::string>(why);
-         res.prepare_payload();
-         return res;
-     };
-@@ -182,7 +182,7 @@ void ControlSessionHttp::handle_request(http::request<Body, http::basic_fields<A
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = "The resource '" + target.to_string() + "' was not found.";
-+        res.body() = "The resource '" + static_cast<std::string>(target) + "' was not found.";
-         res.prepare_payload();
-         return res;
-     };
-@@ -204,7 +204,7 @@ void ControlSessionHttp::handle_request(http::request<Body, http::basic_fields<A
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = "An error occurred: '" + what.to_string() + "'";
-+        res.body() = "An error occurred: '" + static_cast<std::string>(what) + "'";
-         res.prepare_payload();
-         return res;
-     };

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bottom"
-PKG_VERSION="0.6.8"
-PKG_SHA256="4e4eb251972a7af8c46dd36bcf1335fea334fb670569434fbfd594208905b2d9"
+PKG_VERSION="0.8.0"
+PKG_SHA256="0fe6a826d18570ab33b2af3b26ce28c61e3aa830abb2b622f2c3b81da802437a"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ClementTsang/bottom"
 PKG_URL="https://github.com/ClementTsang/bottom/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="diffutils"
-PKG_VERSION="3.8"
-PKG_SHA256="a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec"
+PKG_VERSION="3.9"
+PKG_SHA256="d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/diffutils/"
 PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="htop"
-PKG_VERSION="3.2.1"
-PKG_SHA256="b5ffac1949a8daaabcffa659c0964360b5008782aae4dfa7702d2323cfb4f438"
+PKG_VERSION="3.2.2"
+PKG_SHA256="3829c742a835a0426db41bb039d1b976420c21ec65e93b35cd9bfd2d57f44ac8"
 PKG_LICENSE="GPL"
 PKG_SITE="https://hisham.hm/htop"
 PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz"

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

@@ -12,5 +12,6 @@ PKG_LONGDESC="A small tool to provide detailed information on the hardware confi
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
+  export VERSION="B.${PKG_VERSION}"
   make CXX=${CXX} -C src/
 }

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.28"
-PKG_SHA256="e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803"
+PKG_VERSION="4.8.29"
+PKG_SHA256="01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
 PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="stress-ng"
-PKG_VERSION="0.15.01"
-PKG_SHA256="2168627350d8e3b7f4571732d6117ab054a9851600899c30ad82fd3c9649d644"
+PKG_VERSION="0.15.06"
+PKG_SHA256="c38cefcf0a83f6c65aed7c36e57a9a1ee8373418ef71cf089a75b0661dcd4623"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/ColinIanKing/stress-ng"
 PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="unrar"
-PKG_VERSION="6.2.3"
-PKG_SHA256="120936e41f826cd63d77a580aeea64c1b79fd3e2434f58ce8184e783b51e5b01"
+PKG_VERSION="6.2.6"
+PKG_SHA256="0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318"
 PKG_LICENSE="free"
 PKG_SITE="https://www.rarlab.com/rar_add.htm"
 PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vim"
-PKG_VERSION="9.0.1065"
-PKG_SHA256="f3db36c8ebe665ee750f6b729d6fe25de9dac202829f1f7390ceb62955750dc9"
+PKG_VERSION="9.0.1417"
+PKG_SHA256="02c67859046f7c0206afb909061763cf40747c6bf40c22bb6efaf9c06be41591"
 PKG_LICENSE="VIM"
 PKG_SITE="http://www.vim.org/"
 PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz"

packages/addons/service/docker/changelog.txt

@@ -1 +1,17 @@
-initial release
+1
+- not released for LE11
+
+2
+- not released for LE11
+
+3
+- fix ctop
+- update moby and cli to 23.0.4
+- containerd: update to 1.7.0
+- runc: build with seccomp
+- runc: update to 1.1.5
+
+4
+- update moby and cli to 23.0.6
+- containerd: update to 1.7.1
+- runc: update to 1.1.7

packages/addons/service/docker/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="docker"
-PKG_REV="0"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
-PKG_DEPENDS_TARGET="cli containerd moby runc tini"
+PKG_DEPENDS_TARGET="cli containerd ctop moby runc tini"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
 PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above."
@@ -32,6 +32,9 @@ addon() {
     cp -P $(get_build_dir containerd)/bin/containerd-shim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim
     cp -P $(get_build_dir containerd)/bin/containerd-shim-runc-v2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim-runc-v2
 
+    # ctop
+    cp -P $(get_build_dir ctop)/bin/ctop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ctop
+
     # runc
     cp -P $(get_build_dir runc)/bin/runc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/runc
 

packages/addons/service/jellyfin/changelog.txt

@@ -1 +1,2 @@
-initial release
+1
+- jellyfin: update to 10.8.10

packages/addons/service/jellyfin/package.mk

@@ -3,8 +3,8 @@
 
 PKG_NAME="jellyfin"
 PKG_VERSION="1.0"
-PKG_VERSION_NUMBER="10.8.9"
-PKG_REV="0"
+PKG_VERSION_NUMBER="10.8.10"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://jellyfin.org/"

packages/addons/service/librespot/changelog.txt

@@ -1 +1,4 @@
-initial release
+1
+- update librespot to githash 03b547d (2023-04-16)
+2
+- update librespot to githash c964102 (2023-05-14)

packages/addons/service/librespot/package.mk

@@ -3,13 +3,14 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="librespot"
-PKG_VERSION="0.3.1"
-PKG_SHA256="d360eaf61ad4216ee2c4a4d583d61c8ec7367b5efbe512011d049f73e4f24952"
-PKG_REV="0"
+PKG_VERSION="c964102a349589d644baef5f43a566d6d1e151f1"
+PKG_VERSION_DATE="2023-05-14"
+PKG_SHA256="3bc6782d8796253040d995043fba4e6f6c71ff902da110b50398071e082b1930"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/librespot-org/librespot/"
-PKG_URL="https://github.com/librespot-org/librespot/archive/v${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/librespot-org/librespot/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain alsa-lib avahi pulseaudio cargo:host"
 PKG_SECTION="service"
 PKG_SHORTDESC="Librespot: play Spotify through Kodi using a Spotify app as a remote"
@@ -19,10 +20,10 @@ PKG_TOOLCHAIN="manual"
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Librespot"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_REQUIRES="script.module.requests:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 make_target() {
+  export RUSTC_LINKER=${CC}
   cargo build \
     --target ${TARGET_NAME} \
     --release \

packages/addons/service/librespot/patches/librespot-01_notify_kodi.patch

@@ -1,108 +0,0 @@
-commit 10489ef0b9de4241eb8e007596f3d62616120545
-Author: awiouy <awiouy@gmail.com>
-Date:   Fri May 29 07:40:19 2020 +0200
-
-    Notify Kodi
-
-diff --git a/core/src/spotify_id.rs b/core/src/spotify_id.rs
-index 1a5fcd2..c670977 100644
---- a/core/src/spotify_id.rs
-+++ b/core/src/spotify_id.rs
-@@ -9,6 +9,12 @@
-     Podcast,
-     NonPlayable,
- }
-+ 
-+impl fmt::Display for SpotifyAudioType {
-+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-+        write!(f, "{:?}", self)
-+    }
-+}
- 
- impl From<&str> for SpotifyAudioType {
-     fn from(v: &str) -> Self {
-diff --git a/playback/src/config.rs b/playback/src/config.rs
-index 9d65042..6d098db 100644
---- a/playback/src/config.rs
-+++ b/playback/src/config.rs
-@@ -142,6 +142,7 @@
-     // pass function pointers so they can be lazily instantiated *after* spawning a thread
-     // (thereby circumventing Send bounds that they might not satisfy)
-     pub ditherer: Option<DithererBuilder>,
-+    pub notify_kodi: bool,
- }
- 
- impl Default for PlayerConfig {
-@@ -159,6 +160,7 @@
-             normalisation_knee: 1.0,
-             passthrough: false,
-             ditherer: Some(mk_ditherer::<TriangularDitherer>),
-+            notify_kodi: false,
-         }
-     }
- }
-diff --git a/playback/src/player.rs b/playback/src/player.rs
-index 2dd8f3b..67b3b28 100644
---- a/playback/src/player.rs
-+++ b/playback/src/player.rs
-@@ -1868,6 +1868,10 @@ impl PlayerInternal {
-         }
-     }
- 
-+    fn notify_kodi(&mut self, event: String) {
-+        eprintln!("@{}", event);
-+    }
-+
-     fn send_event(&mut self, event: PlayerEvent) {
-         let mut index = 0;
-         while index < self.event_senders.len() {
-@@ -1878,6 +1882,16 @@ impl PlayerInternal {
-                 }
-             }
-         }
-+        if self.config.notify_kodi {
-+            use PlayerEvent::*;
-+            match event {
-+                Playing {track_id, .. } => self.notify_kodi(["Playing",
-+                                               &track_id.audio_type.to_string(),
-+                                               &track_id.to_base62()].join(" ")),
-+                Stopped { .. } => self.notify_kodi("Stopped".to_string()),
-+                _ => ()
-+            }
-+        }
-     }
- 
-     fn load_track(
-diff --git a/src/main.rs b/src/main.rs
-index 2efd62b..ecee2ff 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -424,6 +424,11 @@
-         "",
-         PASSTHROUGH,
-         "Pass a raw stream to the output. Only works with the pipe and subprocess backends.",
-+    )
-+    .optflag(
-+        "",
-+        "notify-kodi",
-+        "Notify Kodi",
-     );
- 
-     let matches = match opts.parse(&args[1..]) {
-@@ -644,6 +649,8 @@ fn setup(args: &[String]) -> Setup {
-         )
-     };
- 
-+    let notify_kodi = matches.opt_present("notify-kodi");
-+
-     let session_config = {
-         let device_id = device_id(&name);
- 
-@@ -763,6 +763,7 @@
-             normalisation_release,
-             normalisation_knee,
-             ditherer,
-+            notify_kodi: notify_kodi,
-         }
-     };
- 

packages/addons/service/librespot/source/bin/onevent.py

@@ -0,0 +1,66 @@
+#!/usr/bin/python
+import json
+import os
+import socket
+
+ADDRESS = ('127.0.0.1', 36963)
+BUFFER_SIZE = 1024
+
+
+def send_event(event):
+    data = json.dumps(event).encode()
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:
+        sock.sendto(data, ADDRESS)
+
+
+def receive_event():
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:
+        sock.settimeout(None)
+        sock.bind(ADDRESS)
+        while True:
+            data, addr = sock.recvfrom(BUFFER_SIZE)
+            event = json.loads(data.decode())
+            if not event:
+                break
+            yield event
+
+
+ARG_ALBUM = 'album'
+ARG_ARTIST = 'artist'
+ARG_ART = 'art'
+ARG_TITLE = 'title'
+
+KEY_ALBUM = 'ALBUM'
+KEY_ARTISTS = 'ARTISTS'
+KEY_COVERS = 'COVERS'
+KEY_ITEM_TYPE = 'ITEM_TYPE'
+KEY_NAME = 'NAME'
+KEY_PLAYER_EVENT = 'PLAYER_EVENT'
+KEY_SHOW_NAME = 'SHOW_NAME'
+
+PLAYER_EVENT_STOPPED = 'stopped'
+PLAYER_EVENT_TRACK_CHANGED = 'track_changed'
+
+ITEM_TYPE_EPISODE = 'Episode'
+ITEM_TYPE_TRACK = 'Track'
+
+
+def get_env_value(key):
+    return os.environ.get(key, '').partition('\n')[0]
+
+
+if __name__ == '__main__':
+    player_event = get_env_value(KEY_PLAYER_EVENT)
+    event = {KEY_PLAYER_EVENT: player_event}
+    if player_event == PLAYER_EVENT_STOPPED:
+        send_event(event)
+    elif player_event == PLAYER_EVENT_TRACK_CHANGED:
+        event[ARG_ART] = get_env_value(KEY_COVERS)
+        event[ARG_TITLE] = get_env_value(KEY_NAME)
+        item_type = get_env_value(KEY_ITEM_TYPE)
+        if item_type == ITEM_TYPE_EPISODE:
+            event[ARG_ALBUM] = get_env_value(KEY_SHOW_NAME)
+        elif item_type == ITEM_TYPE_TRACK:
+            event[ARG_ALBUM] = get_env_value(KEY_ALBUM)
+            event[ARG_ARTIST] = get_env_value(KEY_ARTISTS)
+        send_event(event)

packages/addons/service/librespot/source/default.py

@@ -1,8 +1,25 @@
 import os
 import sys
+import xbmcaddon
+import xbmcvfs
 
-sys.path.append(os.path.join(os.path.dirname(__file__), 'resources', 'lib'))
 
-from ls_monitor import Monitor as Monitor
+def _set_home():
+    home = xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo('profile'))
+    os.makedirs(home, exist_ok=True)
+    os.chdir(home)
 
-Monitor().run()
+
+def _set_paths():
+    path = xbmcaddon.Addon().getAddonInfo('path')
+    os.environ['PATH'] += os.pathsep + os.path.join(path, 'bin')
+    os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.path.join(path, 'lib')
+    sys.path.append(os.path.join(path, 'bin'))
+    sys.path.append(os.path.join(path, 'resources', 'lib'))
+
+
+if __name__ == '__main__':
+    _set_home()
+    _set_paths()
+    import service
+    service.Monitor().run()

packages/addons/service/librespot/source/miscellaneous/service.librespot-alsa.service

@@ -1,30 +0,0 @@
-# Librespot for ALSA
-# Copy this file to '/storage/.config/system.d/service.librespot-alsa.service' and adapt it to your needs
-# Enable the service with 'systemctl enable /storage/.config/system.d/service.librespot-alsa.service'
-# Start the service with 'systemctl start service.librespot-alsa.service'
-# If you update the file, reload units with 'systemctl daemon-reload' and restart the service
-
-[Unit]
-Description=librespot alsa backend
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Environment=LD_LIBRARY_PATH=/storage/.kodi/addons/service.librespot/lib
-#Enable Raspberry Pi onboard audio
-#ExecStartPre=-dtparam audio=on
-#Set Raspberry Pi playback route
-#ExecStartPre=-amixer -c 0 cset name="PCM Playback Route" 1
-ExecStart=/storage/.kodi/addons/service.librespot/bin/librespot \
-            --backend alsa \
-            --bitrate 320 \
-            --cache "/storage/.config/lsa_cache" \
-#           Use 'aplay -L' to list available devices
-#           --device "default:CARD=ALSA" \
-            --device-type computer \
-            --disable-audio-cache \
-            --name "Librespot ALSA" \
-Restart=always
-
-[Install]
-WantedBy=network-online.target

packages/addons/service/librespot/source/resources/language/English/strings.po

@@ -8,29 +8,21 @@ msgid "Configuration"
 msgstr ""
 
 msgctxt "#30101"
-msgid "Autoplay"
-msgstr ""
-
-msgctxt "#30102"
-msgid "Discovery"
-msgstr ""
-
-msgctxt "#30103"
-msgid "Username"
-msgstr ""
-
-msgctxt "#30104"
-msgid "Password"
-msgstr ""
-
-msgctxt "#30105"
 msgid "Name"
 msgstr ""
 
-msgctxt "#30106"
-msgid "RTP Port"
+msgctxt "#30102"
+msgid "Do not disturb Kodi"
 msgstr ""
 
-msgctxt "#30107" 
-msgid "Connect Port"
+msgctxt "#30103"
+msgid "User options"
+msgstr ""
+
+msgctxt "#30104"
+msgid "Backend"
+msgstr ""
+
+msgctxt "#30105"
+msgid "ALSA device"
 msgstr ""

packages/addons/service/librespot/source/resources/lib/external_player.py

@@ -0,0 +1,8 @@
+import player
+import service
+
+
+class Player(player.Player):
+
+    def onLibrespotTrackChanged(self, art, artist, title, **kwargs):
+        service.notification(heading=title, message=artist, icon=art)

packages/addons/service/librespot/source/resources/lib/internal_player.py

@@ -0,0 +1,34 @@
+import xbmc
+import xbmcgui
+
+import player
+import service
+
+
+class Player(player.Player):
+
+    def __init__(self, codec='pcm_sb16be', max_fanarts='10', **kwargs):
+        super().__init__(**kwargs)
+        self._max_fanarts = int(max_fanarts)
+        self._list_item = xbmcgui.ListItem(path=self.librespot.file)
+        self._list_item.getVideoInfoTag().addAudioStream(xbmc.AudioStreamDetail(2, codec))
+        self._music_info_tag = self._list_item.getMusicInfoTag()
+
+    def onLibrespotTrackChanged(self, album='', art='', artist='', title=''):
+        fanart = service.get_fanart(art, self._max_fanarts) if art else art
+        self._list_item.setArt({'fanart': fanart, 'thumb': art})
+        self._music_info_tag.setAlbum(album)
+        self._music_info_tag.setArtist(artist)
+        self._music_info_tag.setTitle(title)
+        if self.isPlaying() and self.getPlayingFile() == self.librespot.file:
+            self.updateInfoTag(self._list_item)
+        else:
+            self.stop()  # fixes unepxected behaviour of Player.play()
+            self.librespot.start_sink()
+            self.play(self.librespot.file, listitem=self._list_item)
+
+    def onLibrespotStopped(self):
+        self.librespot.stop_sink()
+        if self.isPlaying() and self.getPlayingFile() == self.librespot.file:
+            self.last_file = None
+            self.stop()

packages/addons/service/librespot/source/resources/lib/librespot.py

@@ -0,0 +1,93 @@
+import shlex
+import socket
+import subprocess
+import threading
+
+import external_player
+import internal_player
+import service
+
+
+class Librespot:
+
+    def __init__(self,
+                 bitrate='320',
+                 device_type='tv',
+                 max_retries='5',
+                 name='Librespot@{}',
+                 options='',
+                 **kwargs):
+        name = name.format(socket.gethostname())
+        self.command = [
+            'librespot',
+            '--bitrate', f'{bitrate}',
+            '--device-type', f'{device_type}',
+            '--disable-audio-cache',
+            '--disable-credential-cache',
+            '--name', f'{name}',
+            '--onevent', 'onevent.py',
+            '--quiet',
+        ] + shlex.split(options)
+        service.log(self.command)
+        self.file = ''
+        self._is_started = threading.Event()
+        self._is_stopped = threading.Event()
+        self._librespot = None
+        self._max_retries = int(max_retries)
+        self._retries = 0
+        self._thread = threading.Thread()
+
+    def get_player(self, **kwargs):
+        return (internal_player if self.file else external_player).Player(**kwargs)
+
+    def restart(self):
+        if self._thread.is_alive():
+            self._librespot.terminate()
+        else:
+            self.start()
+
+    def start(self):
+        if not self._thread.is_alive() and self._retries < self._max_retries:
+            self._thread = threading.Thread(daemon=True, target=self._run)
+            self._thread.start()
+            self._is_started.wait(1)
+
+    def stop(self):
+        if self._thread.is_alive():
+            self._is_stopped.set()
+            self._librespot.terminate()
+            self._thread.join()
+
+    def start_sink(self):
+        pass
+
+    def stop_sink(self):
+        pass
+
+    def _run(self):
+        service.log('librespot thread started')
+        self._is_started.clear()
+        self._is_stopped.clear()
+        while not self._is_stopped.is_set():
+            with subprocess.Popen(self.command, stderr=subprocess.PIPE, text=True) as self._librespot:
+                self._is_started.set()
+                for line in self._librespot.stderr:
+                    service.log(line.rstrip())
+            self.stop_sink()
+            if self._librespot.returncode <= 0:
+                self._retries = 0
+            else:
+                self._retries += 1
+                if self._retries < self._max_retries:
+                    service.notification(
+                        f'librespot failed {self._retries}/{self._max_retries}')
+                else:
+                    service.notification('librespot failed too many times')
+                    break
+        service.log('librespot thread stopped')
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.stop()

packages/addons/service/librespot/source/resources/lib/librespot_alsa.py

@@ -0,0 +1,11 @@
+import librespot
+
+
+class Librespot(librespot.Librespot):
+
+    def __init__(self, alsa_device='hw:2,0', **kwargs):
+        super().__init__(**kwargs)
+        self.command += [
+            '--backend', 'alsa',
+            '--device', f'{alsa_device}',
+        ]

packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py

@@ -0,0 +1,73 @@
+import socket
+import subprocess
+
+import librespot
+import service
+
+
+class Librespot(librespot.Librespot):
+
+    def __init__(self,
+                 codec='pcm_sb16be',
+                 pa_rtp_address='127.0.0.1',
+                 pa_rtp_device='librespot',
+                 pa_rtp_port='24642',
+                 **kwargs):
+        service.log('pulseaudio backend started')
+        sap_cmd = f'nc -l -u -s {pa_rtp_address} -p 9875'.split()
+        self._sap_server = subprocess.Popen(sap_cmd,
+                                            stdout=subprocess.DEVNULL,
+                                            stderr=subprocess.STDOUT)
+        service.log(f'sap server started')
+        if not pa_rtp_port:
+            with socket.socket() as s:
+                s.bind((pa_rtp_address, 0))
+                pa_rtp_port = s.getsockname()[1]
+        modules = [
+            [
+                f'module-null-sink',
+                f'sink_name={pa_rtp_device}',
+            ],
+            [
+                f'module-rtp-send',
+                f'destination_ip={pa_rtp_address}',
+                f'inhibit_auto_suspend=always',
+                f'port={pa_rtp_port}',
+                f'source={pa_rtp_device}.monitor',
+            ],
+        ]
+        self._modules = [self._pactl('load-module', *m) for m in modules]
+        self._sink_name = f'{pa_rtp_device}'
+        self.stop_sink()
+        service.log(f'pulseaudio modules loaded: {self._modules}')
+        super().__init__(**kwargs)
+        self.command += [
+            '--backend', 'pulseaudio',
+            '--device', f'{pa_rtp_device}',
+        ]
+        self.file = f'rtp://{pa_rtp_address}:{pa_rtp_port}'
+
+    def start_sink(self):
+        self._pactl('suspend-sink', self._sink_name, '0')
+
+    def stop_sink(self):
+        self._pactl('suspend-sink', self._sink_name, '1')
+
+    def _pactl(self, command, *args):
+        out = subprocess.run(['pactl', command, *args],
+                             stdout=subprocess.PIPE,
+                             text=True
+                             ).stdout.rstrip()
+        service.log(f'pactl {command} {args}: {out}')
+        return out
+
+    def __exit__(self, *args):
+        super().__exit__(*args)
+        for module in reversed(self._modules):
+            if module:
+                self._pactl('unload-module', module)
+        service.log('pulseaudio backend stopped')
+        if self._sap_server.poll() is None:
+            self._sap_server.terminate()
+            self._sap_server.wait()
+        service.log('sap server stopped')

packages/addons/service/librespot/source/resources/lib/ls_addon.py

@@ -1,49 +0,0 @@
-import os
-import socket
-import xbmc
-import xbmcvfs
-import xbmcaddon
-import xbmcgui
-
-
-DEFAULTS = dict(
-    autoplay='true',
-    bitrate='320',
-    device='librespot',
-    discovery='true',
-    name='Librespot@{}',
-    password='',
-    rtp_dest='127.0.0.1',
-    rtp_port='24642',
-    connect_port='0',
-    username='',
-)
-
-ADDON = xbmcaddon.Addon()
-ADDON_HOME = xbmcvfs.translatePath(ADDON.getAddonInfo('profile'))
-ADDON_ICON = ADDON.getAddonInfo('icon')
-ADDON_NAME = ADDON.getAddonInfo('name')
-ADDON_PATH = ADDON.getAddonInfo('path')
-ADDON_ENVT = dict(
-    LD_LIBRARY_PATH=os.path.join(ADDON_PATH, 'lib'),
-    PATH=os.path.join(ADDON_PATH, 'bin'))
-DIALOG = xbmcgui.Dialog()
-
-
-def get_settings():
-    if not os.path.exists(ADDON_HOME):
-        os.makedirs(ADDON_HOME)
-    settings = dict()
-    for id in DEFAULTS.keys():
-        value = ADDON.getSetting(id)
-        settings[id] = DEFAULTS[id] if value == '' else value
-    settings['name'] = settings['name'].format(socket.gethostname())
-    return settings
-
-
-def log(message):
-    xbmc.log('{}: {}'.format(ADDON_NAME, message), xbmc.LOGINFO)
-
-
-def notification(message):
-    DIALOG.notification(ADDON_NAME, message, ADDON_ICON)

packages/addons/service/librespot/source/resources/lib/ls_librespot.py

@@ -1,164 +0,0 @@
-import shlex
-import subprocess
-import threading
-import xbmc
-import xbmcgui
-
-from ls_addon import ADDON_ENVT as ADDON_ENVT
-from ls_addon import ADDON_HOME as ADDON_HOME
-from ls_addon import get_settings as get_settings
-from ls_addon import log as log
-from ls_pulseaudio import Pulseaudio as Pulseaudio
-from ls_spotify import SPOTIFY as SPOTIFY
-
-
-LIBRESPOT = 'librespot' \
-            ' --backend pulseaudio' \
-            ' --bitrate {bitrate}' \
-            ' --cache cache' \
-            ' --device {device}' \
-            ' --device-type TV' \
-            ' --disable-audio-cache' \
-            ' --name {name}' \
-            ' --notify-kodi'
-LIBRESPOT_AUTOPLAY = ' --autoplay'
-LIBRESPOT_AUTHENTICATE = ' --disable-discovery' \
-                         ' --password {password}' \
-                         ' --username {username}'
-
-CODEC = 'pcm_s16be'
-MAX_PANICS = 3
-
-
-class Librespot(xbmc.Player):
-
-    def __init__(self):
-        super().__init__()
-        settings = get_settings()
-        quoted = {k: shlex.quote(v) for (k, v) in settings.items()}
-        command = LIBRESPOT
-        if settings['connect_port'] != "0":
-            command += ' --zeroconf-port %s ' % settings['connect_port']
-        if settings['autoplay'] == 'true':
-            command += LIBRESPOT_AUTOPLAY
-        if (settings['discovery'] == 'false' and
-                settings['password'] != '' and
-                settings['username'] != ''):
-            command += LIBRESPOT_AUTHENTICATE
-        self.command = shlex.split(command.format(**quoted))
-        log(shlex.split(command.format(**dict(quoted, password='*obfuscated*'))))
-        self.is_aborted = False
-        self.is_dead = False
-        self.pulseaudio = Pulseaudio(settings)
-        self.listitem = xbmcgui.ListItem()
-        self.listitem.addStreamInfo('audio', {'codec': CODEC})
-        self.listitem.setPath(path=self.pulseaudio.url)
-
-    def __enter__(self):
-        self.pulseaudio.load_modules()
-        self.panics = 0
-        self.librespot = None
-        self.is_playing_librespot = False
-        if not self.isPlaying():
-            self.start_librespot()
-
-    def __exit__(self, *args):
-        self.stop_librespot()
-        self.pulseaudio.unload_modules()
-
-    def on_event_panic(self):
-        self.pulseaudio.suspend_sink(1)
-        self.panics += 1
-        log('event panic {}/{}'.format(self.panics, MAX_PANICS))
-        self.is_dead = self.panics >= MAX_PANICS
-        self.stop_librespot(True)
-
-    def on_event_playing(self, type, id):
-        log('event playing')
-        SPOTIFY.update_listitem(self.listitem, type, id, self.country)
-        if not self.isPlaying():
-            log('starting librespot playback')
-            self.pulseaudio.suspend_sink(0)
-            self.play(self.pulseaudio.url, self.listitem)
-        elif self.is_playing_librespot:
-            log('updating librespot playback')
-            self.updateInfoTag(self.listitem)
-
-    def on_event_stopped(self):
-        self.pulseaudio.suspend_sink(1)
-        log('event stopped')
-        self.panics = 0
-        self.stop()
-
-    def onPlayBackEnded(self):
-        self.onPlayBackStopped()
-
-    def onPlayBackError(self):
-        self.onPlayBackStopped()
-
-    def onPlayBackStarted(self):
-        log('Kodi playback started')
-        self.is_playing_librespot = self.getPlayingFile() == self.pulseaudio.url
-        if not self.is_playing_librespot:
-            self.stop_librespot()
-
-    def onPlayBackStopped(self):
-        if self.is_playing_librespot:
-            log('librespot playback stopped')
-            self.is_playing_librespot = False
-            self.stop_librespot(True)
-        else:
-            log('Kodi playback stopped')
-            self.start_librespot()
-
-    def run_librespot(self):
-        log('librespot thread started')
-        self.restart = True
-        while self.restart and not self.is_dead:
-            self.librespot = subprocess.Popen(
-                self.command,
-                cwd=ADDON_HOME,
-                env=ADDON_ENVT,
-                stderr=subprocess.STDOUT,
-                stdout=subprocess.PIPE,
-                text=True,
-                encoding='utf-8')
-            log('librespot started')
-            with self.librespot.stdout:
-                for line in self.librespot.stdout:
-                    words = line.split()
-                    if words[0] == '@Playing':
-                        self.on_event_playing(words[1], words[2])
-                    elif words[0] == '@Stopped':
-                        self.on_event_stopped()
-                    elif words[0] == 'stack':
-                        self.on_event_panic()
-                    else:
-                        log(line.rstrip())
-                        if 'Country:' in line:
-                            self.country = words[-1].strip('"')
-                            log('country={}'.format(self.country))
-            self.pulseaudio.suspend_sink(1)
-            self.stop()
-            self.librespot.wait()
-            log('librespot stopped')
-        self.librespot = None
-        log('librespot thread stopped')
-
-    def start_librespot(self):
-        if self.librespot is None:
-            self.thread = threading.Thread(target=self.run_librespot)
-            self.thread.start()
-
-    def stop(self):
-        if self.is_playing_librespot and not self.is_aborted:
-            log('stopping librespot playback')
-            self.is_playing_librespot = False
-            super().stop()
-
-    def stop_librespot(self, restart=False):
-        self.restart = restart
-        if self.librespot is not None:
-            self.librespot.terminate()
-            if not restart:
-                self.thread.join()

packages/addons/service/librespot/source/resources/lib/ls_monitor.py

@@ -1,35 +0,0 @@
-import xbmc
-
-from ls_addon import log as log
-from ls_addon import notification as notification
-from ls_librespot import Librespot as Librespot
-
-
-class Monitor(xbmc.Monitor):
-
-    def onSettingsChanged(self):
-        self.is_changed = True
-
-    def run(self):
-        log('monitor started')
-        is_aborted = False
-        is_dead = False
-        while not (is_aborted or is_dead):
-            self.is_changed = False
-            librespot = Librespot()
-            with librespot:
-                while True:
-                    is_aborted = self.waitForAbort(1)
-                    if is_aborted:
-                        log('monitor aborted')
-                        librespot.is_aborted = True
-                        break
-                    is_dead = librespot.is_dead
-                    if is_dead:
-                        log('librespot died')
-                        notification('Too many errors')
-                        break
-                    if self.is_changed:
-                        log('settings changed')
-                        break
-        log('monitor stopped')

packages/addons/service/librespot/source/resources/lib/ls_pulseaudio.py

@@ -1,46 +0,0 @@
-import subprocess
-
-from ls_addon import log as log
-
-
-def run(command):
-    return subprocess.check_output(command.split(), text=True)
-
-
-class Pulseaudio:
-
-    def __init__(self, settings):
-        self.null_sink = dict(
-            module='module-null-sink',
-            args='sink_name={device}'.format(**settings)
-        )
-        self.rtp_send = dict(
-            module='module-rtp-send',
-            args='destination_ip={rtp_dest} port={rtp_port}'
-                 ' source={device}.monitor'.format(**settings)
-        )
-        self.suspend = 'pactl suspend-sink {device} {{}}'.format(**settings)
-        self.url = 'rtp://{rtp_dest}:{rtp_port}'.format(**settings)
-
-    def list_modules(self):
-        return [module.split('\t')
-                for module in run('pactl list modules short').splitlines()[::-1]]
-
-    def load_modules(self):
-        args = [module[2] for module in self.list_modules()]
-        for module in [self.null_sink, self.rtp_send]:
-            if module['args'] not in args:
-                run('pactl load-module {} {}'.format(
-                    module['module'], module['args']))
-                log('loaded {} {}'.format(module['module'], module['args']))
-        self.suspend_sink(1)
-
-    def suspend_sink(self, bit):
-        run(self.suspend.format(bit))
-        log('suspended sink {}'.format(bit))
-
-    def unload_modules(self):
-        for module in self.list_modules():
-            if module[2] in [self.null_sink['args'], self.rtp_send['args']]:
-                run('pactl unload-module {}'.format(module[0]))
-                log('unloaded {} {}'.format(module[1], module[2]))

packages/addons/service/librespot/source/resources/lib/ls_spotify.py

@@ -1,80 +0,0 @@
-import requests
-import time
-
-
-from ls_addon import ADDON_ICON as ADDON_ICON
-from ls_addon import log as log
-
-
-SPOTIFY_ENDPOINT_EPISODES = 'https://api.spotify.com/v1/episodes/'
-SPOTIFY_ENDPOINT_TRACKS = 'https://api.spotify.com/v1/tracks/'
-SPOTIFY_HEADERS = {
-    'Accept': 'application/json',
-    'Content-Type': 'application/json',
-}
-SPOTIFY_REQUEST_TOKEN = {
-    'url': 'https://accounts.spotify.com/api/token',
-    'data': {'grant_type': 'client_credentials'},
-    'headers': {'Authorization': 'Basic MTY5ZGY1NTMyZGVlNDdhNTk5MTNmODUyOGU4M2FlNzE6MWYzZDhiNTA3YmJlNGY2OGJlYjNhNDQ3MmU4YWQ0MTE='}
-}
-
-
-def get(info, indices, default):
-    try:
-        for index in indices:
-            info = info[index]
-        return info.encode('utf-8')
-    except LookupError:
-        return default
-
-
-class Spotify:
-
-    def __init__(self):
-        self.headers = SPOTIFY_HEADERS
-        self.expiration = time.time()
-
-    def get_headers(self):
-        if time.time() > self.expiration:
-            log('token expired')
-            token = requests.post(**SPOTIFY_REQUEST_TOKEN).json()
-            log(token)
-            self.expiration = time.time() + float(token['expires_in']) - 5
-            self.headers['Authorization'] = 'Bearer {}'.format(
-                token['access_token'])
-
-    def get_endpoint(self, endpoint, id, market):
-        try:
-            self.get_headers()
-            return requests.get(url=endpoint + id,
-                                headers=self.headers,
-                                params=dict(market=market)).json()
-        except Exception as e:
-            log('failed to get {} from Spotify {}'.format(endpoint, e))
-            return {}
-
-    def update_listitem(self, listitem, type, id, market='SE'):
-        if type == 'Podcast':
-            info = self.get_endpoint(SPOTIFY_ENDPOINT_EPISODES, id, market)
-            album = get(info, ['show', 'name'], 'unknown show',)
-            artist = get(info, ['show', 'publisher'], 'unknown publisher')
-            thumb = get(info, ['images', 0, 'url'], ADDON_ICON)
-            title = get(info, ['name'], 'unknown episode')
-        elif type == 'Track':
-            info = self.get_endpoint(SPOTIFY_ENDPOINT_TRACKS, id, market)
-            album = get(info, ['album', 'name'], 'unknown album')
-            artist = get(info, ['artists', 0, 'name'], 'unknown artist')
-            thumb = get(info, ['album', 'images', 0, 'url'], ADDON_ICON)
-            title = get(info, ['name'], 'unknown title')
-        else:
-            album = ''
-            artist = 'Unknown Media Type'
-            thumb = ADDON_ICON
-            title = ''
-        listitem.setArt(dict(fanart=thumb, thumb=thumb))
-        listitem.setInfo('music', dict(
-            album=album, artist=artist, title=title))
-        log('{}#{}#{}#{}'.format(title, artist, album, thumb))
-
-
-SPOTIFY = Spotify()

packages/addons/service/librespot/source/resources/lib/player.py

@@ -0,0 +1,71 @@
+import threading
+import xbmc
+
+import onevent
+import service
+
+
+class Player(xbmc.Player):
+
+    def __init__(self, dnd_kodi='false', librespot=None, **kwargs):
+        super().__init__()
+        self._dnd_kodi = (dnd_kodi == 'true')
+        self._thread = threading.Thread(daemon=True, target=self._run)
+        self._thread.start()
+        self.last_file = None
+        self.librespot = librespot
+        if not (self._dnd_kodi and self.isPlaying()):
+            self.librespot.start()
+
+    def onAVStarted(self):
+        file = self.getPlayingFile()
+        if file != self.librespot.file:
+            if self._dnd_kodi:
+                self.librespot.stop()
+            elif self.last_file == self.librespot.file:
+                self.librespot.restart()
+        self.last_file = file
+
+    def onLibrespotStopped(self):
+        pass
+
+    def onLibrespotTrackChanged(self, album='', art='', artist='', title=''):
+        pass
+
+    def onPlayBackEnded(self):
+        if self.last_file == self.librespot.file:
+            self.librespot.restart()
+        else:
+            self.librespot.start()
+        self.last_file = None
+
+    def onPlayBackError(self):
+        self.onPlayBackEnded()
+
+    def onPlayBackStopped(self):
+        self.onPlayBackEnded()
+
+    # fixes unexpected behaviour of Player.stop()
+    def stop(self):
+        xbmc.executebuiltin('PlayerControl(Stop)')
+
+    def _run(self):
+        service.log('onevent dispatcher started')
+        for event in onevent.receive_event():
+            try:
+                player_event = event.pop(onevent.KEY_PLAYER_EVENT)
+                if player_event == onevent.PLAYER_EVENT_STOPPED:
+                    self.onLibrespotStopped()
+                elif player_event == onevent.PLAYER_EVENT_TRACK_CHANGED:
+                    self.onLibrespotTrackChanged(**event)
+            except Exception as e:
+                service.log(e, True)
+        service.log('onevent dispatcher stopped')
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        onevent.send_event({})
+        self._thread.join()
+        self.onLibrespotStopped()

packages/addons/service/librespot/source/resources/lib/service.py

@@ -0,0 +1,88 @@
+import PIL.Image
+import urllib.request
+import tempfile
+import os
+import xbmc
+import xbmcaddon
+import xbmcgui
+
+_ADDON = xbmcaddon.Addon()
+_ICON = _ADDON.getAddonInfo('icon')
+_NAME = _ADDON.getAddonInfo('name')
+_DIALOG = xbmcgui.Dialog()
+
+
+def log(message, show=False):
+    xbmc.log(f'{_NAME}: {message}', xbmc.LOGINFO if show else xbmc.LOGDEBUG)
+
+
+def notification(message='', sound=False, heading=_NAME, icon=_ICON, time=5000):
+    _DIALOG.notification(heading, message, icon, time, sound)
+
+
+_FANART_DIR = os.path.join(tempfile.gettempdir(), 'librespot.fanart')
+
+
+def get_fanart(url, max_fanarts):
+    name = os.path.basename(url)
+    target = os.path.join(_FANART_DIR, f'{name}_16x9')
+    if not os.path.exists(target):
+        if not os.path.exists(_FANART_DIR):
+            os.makedirs(_FANART_DIR)
+        files = os.listdir(_FANART_DIR)
+        files = [os.path.join(_FANART_DIR, file) for file in files if os.path.isfile(
+            os.path.join(_FANART_DIR, file))]
+        files.sort(key=os.path.getmtime)
+        for file in files[:-max_fanarts]:
+            os.remove(file)
+        source = os.path.join(_FANART_DIR, f'{name}_9x9')
+        urllib.request.urlretrieve(url, source)
+        image = PIL.Image.open(source)
+        width, height = image.size
+        new_width = int(height * 16 / 9)
+        delta_w = new_width - width
+        new_image = PIL.Image.new('RGB', (new_width, height), (0, 0, 0))
+        new_image.paste(image, (delta_w // 2, 0))
+        new_image.save(target, 'JPEG', optimize=True)
+        os.remove(source)
+    return target
+
+
+_SETTINGS = {
+    'alsa_device': 'hw:2,0',
+    'backend': 'pulseaudio_rtp',
+    'dnd_kodi': 'false',
+    'name': f'{_NAME}@{{}}',
+    'options': '',
+}
+
+
+def _get_setting(setting, default):
+    value = _ADDON.getSetting(setting)
+    return value if value else default
+
+
+def _get_librespot():
+    while True:
+        settings = {k: _get_setting(k, v) for k, v in _SETTINGS.items()}
+        backend = settings.pop('backend')
+        librespot_class = __import__(f'librespot_{backend}').Librespot
+        with librespot_class(**settings) as librespot:
+            with librespot.get_player(librespot=librespot, **settings) as player:
+                yield
+
+
+class Monitor(xbmc.Monitor):
+
+    def __init__(self):
+        self._get_librespot = _get_librespot()
+        self.onSettingsChanged()
+
+    def onSettingsChanged(self):
+        log('settings changed')
+        next(self._get_librespot)
+
+    def run(self):
+        self.waitForAbort()
+        log('abort requested')
+        self._get_librespot.close()

packages/addons/service/librespot/source/resources/settings.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
   <category  label="30100">
-    <setting label="30101" id="autoplay"     type="bool"   default="true"         />
-    <setting label="30102" id="discovery"    type="bool"   default="true"         />
-    <setting label="30103" id="username"     type="text"   default=""             subsetting="true" visible="eq(-1,false)" />
-    <setting label="30104" id="password"     type="text"   default=""             subsetting="true" visible="eq(-2,false)" option="hidden" />
-    <setting label="30105" id="name"         type="text"   default="Librespot@{}" />
-    <setting label="30106" id="rtp_port"     type="number" default="24642"        />
-    <setting label="30107" id="connect_port" type="number" default="0"        />
+    <setting label="30101" id="name"        type="text"   default="Librespot@{}"       />
+    <setting label="30102" id="dnd_kodi"    type="bool"   default="false"              />
+    <setting label="30103" id="options"     type="text"   default=""                   />
+    <setting label="30104" id="backend"     type="select" values="pulseaudio_rtp|alsa" />
+    <setting label="30105" id="alsa_device" type="text"   default="hw:2,0"             subsetting="true" visible="eq(-1,1)" />
   </category>
 </settings>

packages/addons/service/mariadb/changelog.txt

@@ -1 +1,3 @@
-initial release
+1
+- include mariadb-upgrade and mariadb-check
+  copy mariadb* binaries and make symbolic links to mysql*

packages/addons/service/mariadb/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="mariadb"
 PKG_VERSION="10.11.2"
-PKG_REV="0"
+PKG_REV="1"
 PKG_SHA256="1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
@@ -89,13 +89,15 @@ addon() {
   mkdir -p ${ADDON}/config
 
   cp ${MARIADB}/bin/mariadbd \
-     ${MARIADB}/bin/mysql \
-     ${MARIADB}/bin/mysqladmin \
-     ${MARIADB}/bin/mysqldump \
-     ${MARIADB}/bin/mysql_secure_installation \
+     ${MARIADB}/bin/mariadb \
+     ${MARIADB}/bin/mariadb-admin \
+     ${MARIADB}/bin/mariadb-check \
+     ${MARIADB}/bin/mariadb-dump \
+     ${MARIADB}/bin/mariadb-secure-installation \
+     ${MARIADB}/bin/mariadb-upgrade \
      ${MARIADB}/bin/my_print_defaults \
      ${MARIADB}/bin/resolveip \
-     ${MARIADB}/scripts/mysql_install_db \
+     ${MARIADB}/scripts/mariadb-install-db \
      ${ADDON}/bin
 
   cp -PR ${MARIADB}/share ${ADDON}

packages/addons/service/mariadb/source/bin/mariadb.start

@@ -3,6 +3,10 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
+_create_bin_link() {
+  [ ! -L ${ADDON_DIR}/bin/${2} ] && ln -sfn ${1} ${ADDON_DIR}/bin/${2}
+}
+
 . /etc/profile
 oe_setup_addon service.mariadb
 
@@ -11,49 +15,57 @@ mkdir -p /run/mysqld
 
 # exit if already running
 PID=$(ps aux | awk '/\/bin\/mariadbd/ {print $1; exit 0}')
-if [ -n "$PID" ]; then
+if [ -n "${PID}" ]; then
   echo "MariaDB server is already running"
   exit 0
 fi
 
+# create symbolic links
+_create_bin_link mariadb                     mysql
+_create_bin_link mariadb-admin               mysqladmin
+_create_bin_link mariadb-dump                mysqldump
+_create_bin_link mariadb-secure-installation mysql_secure_installation
+_create_bin_link mariadb-upgrade             mysql_upgrade
+_create_bin_link mariadb-install-db          mysql_install_db
+
 # copy config file
-if [ ! -f $ADDON_HOME/my.cnf ]; then
-  cp $ADDON_DIR/config/my.cnf $ADDON_HOME
+if [ ! -f ${ADDON_HOME}/my.cnf ]; then
+  cp ${ADDON_DIR}/config/my.cnf ${ADDON_HOME}
 fi
 
 # install database
-if [ ! -d "$ADDON_HOME/data/mysql" ]; then
-  mkdir -p $ADDON_HOME/data
+if [ ! -d "${ADDON_HOME}/data/mysql" ]; then
+  mkdir -p ${ADDON_HOME}/data
   echo "Installing database"
-  $ADDON_DIR/bin/mysql_install_db --basedir=$ADDON_DIR --datadir=$ADDON_HOME/data
+  ${ADDON_DIR}/bin/mariadb-install-db --basedir=${ADDON_DIR} --datadir=${ADDON_HOME}/data
 fi
 
 # check for first run and generate passwords
-if grep -q "@MYSQL_ROOT_PASS@" $ADDON_HOME/settings.xml; then
+if grep -q "@MYSQL_ROOT_PASS@" ${ADDON_HOME}/settings.xml; then
   MYSQL_ROOT_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
   MYSQL_KODI_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
 
-  sed -e "s|@MYSQL_ROOT_PASS@|$MYSQL_ROOT_PASS|g" \
-      -e "s|@MYSQL_KODI_PASS@|$MYSQL_KODI_PASS|g" \
-      -i $ADDON_HOME/settings.xml
+  sed -e "s|@MYSQL_ROOT_PASS@|${MYSQL_ROOT_PASS}|g" \
+      -e "s|@MYSQL_KODI_PASS@|${MYSQL_KODI_PASS}|g" \
+      -i ${ADDON_HOME}/settings.xml
 fi
 
 # init script to create user kodi and change passwords
 init_file=""
-if [[ ! -f $ADDON_HOME/set_mysql_passwords.sql ]] || [[ $ADDON_HOME/settings.xml -nt $ADDON_HOME/set_mysql_passwords.sql ]]; then
-  cat << SQL_DATA > $ADDON_HOME/set_mysql_passwords.sql
-SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$MYSQL_ROOT_PASS');
+if [[ ! -f ${ADDON_HOME}/set_mysql_passwords.sql ]] || [[ ${ADDON_HOME}/settings.xml -nt ${ADDON_HOME}/set_mysql_passwords.sql ]]; then
+  cat << SQL_DATA > ${ADDON_HOME}/set_mysql_passwords.sql
+SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASS}');
 CREATE USER IF NOT EXISTS 'kodi';
 CREATE USER IF NOT EXISTS 'kodi'@'localhost';
-SET PASSWORD FOR 'kodi'=PASSWORD('$MYSQL_KODI_PASS');
-SET PASSWORD FOR 'kodi'@'localhost'=PASSWORD('$MYSQL_KODI_PASS');
+SET PASSWORD FOR 'kodi'=PASSWORD('${MYSQL_KODI_PASS}');
+SET PASSWORD FOR 'kodi'@'localhost'=PASSWORD('${MYSQL_KODI_PASS}');
 GRANT ALL ON *.* TO 'kodi';
 GRANT ALL ON *.* TO 'kodi'@'localhost';
 flush privileges;
 SQL_DATA
 
-  init_file="--init-file=$ADDON_HOME/set_mysql_passwords.sql"
+  init_file="--init-file=${ADDON_HOME}/set_mysql_passwords.sql"
 fi
 
 echo "Starting mariadbd"
-MYSQL_HOME="$ADDON_HOME" exec $ADDON_DIR/bin/mariadbd $init_file &
+MYSQL_HOME="${ADDON_HOME}" exec ${ADDON_DIR}/bin/mariadbd ${init_file} &

packages/addons/service/minisatip/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="minisatip"
 PKG_VERSION="1.2.84"
-PKG_SHA256="b8e58eae2e0502d940b59cf60bf73ffb6af1a4c7d4cd23ddd939f29cd4004d8c"
+PKG_SHA256="d5a06b0c371e1f5ccba6fcb3d76abf348e93e14ab4d7317bb701ae023c085e4b"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/addons/service/mpd/changelog.txt

@@ -1 +1,2 @@
-initial release
+1
+- mpd: update to 0.23.12

packages/addons/service/mpd/package.mk

@@ -3,9 +3,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd"
-PKG_VERSION="0.23.11"
-PKG_SHA256="edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9"
-PKG_REV="0"
+PKG_VERSION="0.23.12"
+PKG_SHA256="b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"

packages/addons/service/mpd/patches/mpd-1682.patch

@@ -1,32 +0,0 @@
-From e4b055eb6d08c5c8f8d85828ce4005d410e462cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Dec 2022 08:29:23 +0700
-Subject: [PATCH] v0.23.x: RemoteTagCache: add missing include
-
-Fix build with Boost 1.81.0. `<array>` was included by one of those boost headers,
-however, it's no longer included as of Boost 1.81.0.
-
-`master` doesn't use `std::array` in this file.
-
-While we're at it, add all necessary inclusion files.
----
- src/RemoteTagCache.hxx | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/RemoteTagCache.hxx b/src/RemoteTagCache.hxx
-index ed87f9706f..e8b198a219 100644
---- a/src/RemoteTagCache.hxx
-+++ b/src/RemoteTagCache.hxx
-@@ -28,7 +28,11 @@
- #include <boost/intrusive/list.hpp>
- #include <boost/intrusive/unordered_set.hpp>
- 
-+#include <array>
-+#include <functional>
-+#include <memory>
- #include <string>
-+#include <utility>
- 
- class RemoteTagCacheHandler;
- 

packages/addons/service/nextpvr/changelog.txt

@@ -1,3 +1,9 @@
+4
+- download NextPVR 6.1.4
+
+3
+- download NextPVR 6.1.3
+
 2
 Fix nextpvr-downloader script
 

packages/addons/service/nextpvr/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nextpvr"
-PKG_VERSION="6.1.1~Nexus"
-PKG_ADDON_VERSION="6.1.1~2"
+PKG_VERSION="6.1.4~Nexus"
+PKG_ADDON_VERSION="6.1.4~4"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="NextPVR"

packages/addons/service/pcscd/changelog.txt

@@ -1 +1,2 @@
-initial release
+1
+- ccid: update to 1.5.2

packages/addons/service/pcscd/package.mk

@@ -5,7 +5,7 @@
 
 PKG_NAME="pcscd"
 PKG_VERSION="1.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"

packages/addons/service/rsyslog/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rsyslog"
-PKG_VERSION="8.2212.0"
-PKG_SHA256="53b59a872e3dc7384cdc149abe9744916776f7057d905f3df6722d2eb1b04f35"
+PKG_VERSION="8.2302.0"
+PKG_SHA256="25415f85b662615ce3c83077d53758029e8743cb5929044bfd3564e3d626a3b9"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/addons/service/snapclient/changelog.txt

@@ -1 +1,8 @@
-initial release
+2
+- asio: update to 1.28.0
+- nqptp: update to 1.2.1
+- shairport-sync: update to 4.2
+
+1
+- asio: update to 1.27.0
+- snapcast: update to 0.27.0

packages/addons/service/snapclient/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapclient"
-PKG_VERSION="0.26.0"
-PKG_REV="0"
+PKG_VERSION="0.27.0"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"

packages/addons/service/snapserver/changelog.txt

@@ -1 +1,8 @@
-initial release
+2
+- asio: update to 1.28.0
+- nqptp: update to 1.2.1
+- shairport-sync: update to 4.2
+
+1
+- asio: update to 1.27.0
+- snapcast: update to 0.27.0

packages/addons/service/snapserver/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapserver"
-PKG_VERSION="0.26.0"
-PKG_REV="0"
+PKG_VERSION="0.27.0"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain nqptp shairport-sync snapcast"

packages/addons/service/syncthing/changelog.txt

@@ -1 +1,5 @@
-initial release
+1
+- not released for LE11
+
+2
+- syncthing: update to 1.23.4

packages/addons/service/syncthing/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="syncthing"
-PKG_VERSION="1.22.2"
-PKG_SHA256="211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f"
-PKG_REV="0"
+PKG_VERSION="1.23.4"
+PKG_SHA256="06a2882f8ac49e15faf96025b01d0edcd4cc190a419d5de98fbe8271695329fa"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="MPLv2"
 PKG_SITE="https://syncthing.net/"

packages/addons/service/tigervnc/changelog.txt

@@ -1 +1,2 @@
-initial release
+1
+- fix not working TigerVNC

packages/addons/service/tigervnc/package.mk

@@ -4,7 +4,7 @@
 PKG_NAME="tigervnc"
 PKG_VERSION="1.10.1"
 PKG_SHA256="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://www.tigervnc.org"
@@ -24,10 +24,20 @@ makeinstall_target() {
   : # nothing to do
 }
 
+# find ${1}.so.[0-9]* in ${2} and copy it to dest
+_pkg_copy_lib() {
+  find "${2}/usr/lib" -regextype sed -regex ".*/${1}\.so\.[0-9]*" \
+    -exec cp {} "${ADDON_BUILD}/${PKG_ADDON_ID}/lib" \;
+}
+
 addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib}
+
   cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig     \
      ${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd     \
      ${PKG_BUILD}/.${TARGET_NAME}/unix/x0vncserver/x0vncserver \
      ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+
+  # copy required libraries for tigervnc
+  _pkg_copy_lib libXtst $(get_install_dir libXtst)
 }

packages/addons/service/ttyd/changelog.txt

@@ -1 +1,2 @@
-initial release
+1
+- ttyd: update to 1.7.3

packages/addons/service/ttyd/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ttyd"
-PKG_VERSION="1.7.2"
-PKG_SHA256="edc44cd5319c0c9d0858081496cae36fc5c54ee7722e0a547dde39537dfb63de"
-PKG_REV="0"
+PKG_VERSION="1.7.3"
+PKG_SHA256="c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/tsl0922/ttyd"

packages/addons/tools/btrfs-progs/changelog.txt

@@ -1 +1,2 @@
-initial release
+1
+- btrfs-progs: update to 6.2.2

packages/addons/tools/btrfs-progs/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="btrfs-progs"
-PKG_VERSION="6.1.3"
-PKG_SHA256="e6512ff305963bc68f11803fa759fecbead778a3a951aeb4f7f3f76dabb31db4"
-PKG_REV="0"
+PKG_VERSION="6.2.2"
+PKG_SHA256="140d3d98f2cba4c7f05c16aec3038f044e11555a40c27a5006185c99a10c7ca2"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page"

packages/addons/tools/dotnet-runtime/changelog.txt

@@ -1 +1,11 @@
-initial release
+4
+- aspnet6-runtime: update to 6.0.19
+
+3
+- aspnet6-runtime: update to 6.0.18
+
+2
+- aspnet6-runtime: update to 6.0.16
+
+1
+- aspnet6-runtime: update to 6.0.15

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dotnet-runtime"
-PKG_REV="0"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"

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

@@ -1 +1,3 @@
-initial release
+1
+- mpg123: update to 1.31.3
+- mpv-drmprime: update to 0.35.1

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

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

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

@@ -1 +1,5 @@
-initial release
+1
+- iperf: update to 3.13
+- libpcap: update to 1.10.3
+- rar2fs: update to 1.29.6
+- tcpdump: update to 4.99.3

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

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

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

@@ -1 +1,9 @@
-initial release
+1
+- bottom: update to 0.8.0
+- diffutils: update to 3.9
+- htop: update to 3.2.2
+- lshw: fix lshw -version display
+- mc: update to 4.8.29
+- stress-ng: update to 0.15.06
+- unrar: update to 6.2.6
+- vim: update to 9.0.1417

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

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

packages/graphics/bcm2835-driver/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf"
-PKG_SHA256="92d8e4b6afe864c82cb19db387ab3b089d9148a1eadbc467c441fda4450bc5c3"
+PKG_VERSION="543692d23dff7075915bc9c7e34abb3fe28e1c46"
+PKG_SHA256="838aa79b842fc10030c6a8b8d7f8dc6b6b08ed7ac762a5488d3d64f1bc51a4ec"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk

@@ -15,14 +15,3 @@ PKG_TOOLCHAIN="manual"
 makeinstall_target() {
   DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install
 }
-
-post_makeinstall_target() {
-  # Install rpi btuart script to bring up Bluetooth
-  mkdir -p ${INSTALL}/usr/bin
-    cp -P ${PKG_DIR}/scripts/rpi-btuart ${INSTALL}/usr/bin
-    cp -P ${PKG_DIR}/scripts/rpi-udev ${INSTALL}/usr/bin
-}
-
-post_install() {
-  enable_service brcmfmac_sdio-firmware.service
-}

packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-HCIATTACH=/usr/bin/hciattach
-if grep -q "Pi 4" /proc/device-tree/model; then
-  BDADDR=
-else
-  SERIAL=$(cat /proc/device-tree/serial-number | cut -c9-)
-  B1=${SERIAL:2:2}
-  B2=${SERIAL:4:2}
-  B3=${SERIAL:6:2}
-  BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
-fi
-
-uart0="$(cat /proc/device-tree/aliases/uart0)"
-serial1="$(cat /proc/device-tree/aliases/serial1)"
-
-if [ "$uart0" = "$serial1" ] ; then
-  uart0_pins="$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')"
-  if [ "$uart0_pins" = "16" ] ; then
-    $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
-  else
-    $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
-  fi
-else
-  $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
-fi

packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-ALIASES="/proc/device-tree/aliases"
-UARTX="uart${1}"
-
-if [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial0) ]; then
-  echo 0
-elif [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial1) ]; then
-  echo 1
-else
-  exit 1
-fi

packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcom sdio firmware update for BCM43430A1
-ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins
-Requires=dev-serial1.device
-After=dev-serial1.device network.target
-
-[Service]
-Type=simple
-RemainAfterExit=yes
-ExecStart=/usr/bin/rpi-btuart
-
-[Install]
-WantedBy=network.target

packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules

@@ -1,2 +0,0 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/usr/bin/rpi-udev 0", SYMLINK+="serial%c"
-KERNEL=="ttyS0", PROGRAM="/usr/bin/rpi-udev 1", SYMLINK+="serial%c"

packages/linux-firmware/intel-ucode/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="intel-ucode"
-PKG_VERSION="20230214"
-PKG_SHA256="3a3cfe2c7642339af9f4c2ad69f5f367dfa4cd1f7f9fd4124dedefb7803591d4"
+PKG_VERSION="20230613"
+PKG_SHA256="894d822d2347222a2595d4fc47d358e01d35a54780123100c317dfc31b1b0cc9"
 PKG_ARCH="x86_64"
 PKG_LICENSE="other"
 PKG_SITE="https://downloadcenter.intel.com/search?keyword=linux+microcode"

packages/linux/package.mk

@@ -16,21 +16,21 @@ PKG_PATCH_DIRS="${LINUX}"
 
 case "${LINUX}" in
   amlogic)
-    PKG_VERSION="6449a0ba6843fe70523eeb7855984054f36f6d24" # 6.1.19
-    PKG_SHA256="6a46c7b91028157d56437736cc8601fa46485e6f52bd6983e92ff80f17aa3065"
+    PKG_VERSION="16f603617dbbc30cafbacaf78ef6468a081fa482" # 6.1.38
+    PKG_SHA256="aab5563a0ff2f7581b8f40d28950d4e9a30e51ea72397e3bf26efd85719af28c"
     PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;
   raspberrypi)
-    PKG_VERSION="e3376fb94fda798d2a322e9c70789286132a1a9f" # 6.1.19
-    PKG_SHA256="f1b518ea84ad269ec0a926623aaba43ea0c176e8254438bb4e8c87f267e87e1e"
+    PKG_VERSION="31dbf25138831241f31f7eee835b83a607eaa179" # 6.1.38
+    PKG_SHA256="90b365734a1f2c50f4b60c3ec3042673b3c256abdd12584c4b1f0f8a82b56eee"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   *)
-    PKG_VERSION="6.1.19"
-    PKG_SHA256="9e991c6e5f6c1ca45eea98c55e82ef6ae3dccc73b3e8a655c8665e585f5a8647"
+    PKG_VERSION="6.1.38"
+    PKG_SHA256="f9a4f91b609f7d332a5f2be01ab86336fa00149fae6bdc19f16fa19f78802d43"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;

packages/linux/patches/default/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch

@@ -0,0 +1,138 @@
+From 94d0a9815c99385e57a17fb20448e47a1f229bcf Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sat, 3 Jun 2023 12:00:28 +0200
+Subject: [PATCH 1/2] ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and
+ MLP formats
+
+The SADs of compressed formats contain the channel and sample rate
+info of the audio data inside the compressed stream, but when
+building constraints we must use the rates and channels used to
+transport the compressed streams.
+
+eg 48kHz 6ch EAC3 needs to be transmitted as a 2ch 192kHz stream.
+
+This patch fixes the constraints for the common AC3 and DTS formats,
+the constraints for the less common MPEG, DSD etc formats are copied
+directly from the info in the SADs as before as I don't have the specs
+and equipment to test those.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ sound/core/pcm_drm_eld.c | 73 ++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 70 insertions(+), 3 deletions(-)
+
+diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c
+index 4b5faae5d16e5..07075071972dd 100644
+--- a/sound/core/pcm_drm_eld.c
++++ b/sound/core/pcm_drm_eld.c
+@@ -2,11 +2,25 @@
+ /*
+  *  PCM DRM helpers
+  */
++#include <linux/bitfield.h>
+ #include <linux/export.h>
++#include <linux/hdmi.h>
+ #include <drm/drm_edid.h>
+ #include <sound/pcm.h>
+ #include <sound/pcm_drm_eld.h>
+ 
++#define SAD0_CHANNELS_MASK	GENMASK(2, 0) /* max number of channels - 1 */
++#define SAD0_FORMAT_MASK	GENMASK(6, 3) /* audio format */
++
++#define SAD1_RATE_MASK		GENMASK(6, 0) /* bitfield of supported rates */
++#define SAD1_RATE_32000_MASK	BIT(0)
++#define SAD1_RATE_44100_MASK	BIT(1)
++#define SAD1_RATE_48000_MASK	BIT(2)
++#define SAD1_RATE_88200_MASK	BIT(3)
++#define SAD1_RATE_96000_MASK	BIT(4)
++#define SAD1_RATE_176400_MASK	BIT(5)
++#define SAD1_RATE_192000_MASK	BIT(6)
++
+ static const unsigned int eld_rates[] = {
+ 	32000,
+ 	44100,
+@@ -17,9 +31,62 @@ static const unsigned int eld_rates[] = {
+ 	192000,
+ };
+ 
++static unsigned int map_rate_families(const u8 *sad,
++				      unsigned int mask_32000,
++				      unsigned int mask_44100,
++				      unsigned int mask_48000)
++{
++	unsigned int rate_mask = 0;
++
++	if (sad[1] & SAD1_RATE_32000_MASK)
++		rate_mask |= mask_32000;
++	if (sad[1] & (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK))
++		rate_mask |= mask_44100;
++	if (sad[1] & (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK))
++		rate_mask |= mask_48000;
++	return rate_mask;
++}
++
++static unsigned int sad_rate_mask(const u8 *sad)
++{
++	switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {
++	case HDMI_AUDIO_CODING_TYPE_PCM:
++		return sad[1] & SAD1_RATE_MASK;
++	case HDMI_AUDIO_CODING_TYPE_AC3:
++	case HDMI_AUDIO_CODING_TYPE_DTS:
++		return map_rate_families(sad,
++					 SAD1_RATE_32000_MASK,
++					 SAD1_RATE_44100_MASK,
++					 SAD1_RATE_48000_MASK);
++	case HDMI_AUDIO_CODING_TYPE_EAC3:
++	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
++	case HDMI_AUDIO_CODING_TYPE_MLP:
++		return map_rate_families(sad,
++					 0,
++					 SAD1_RATE_176400_MASK,
++					 SAD1_RATE_192000_MASK);
++	default:
++		/* TODO adjust for other compressed formats as well */
++		return sad[1] & SAD1_RATE_MASK;
++	}
++}
++
+ static unsigned int sad_max_channels(const u8 *sad)
+ {
+-	return 1 + (sad[0] & 7);
++	switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {
++	case HDMI_AUDIO_CODING_TYPE_PCM:
++		return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);
++	case HDMI_AUDIO_CODING_TYPE_AC3:
++	case HDMI_AUDIO_CODING_TYPE_DTS:
++	case HDMI_AUDIO_CODING_TYPE_EAC3:
++		return 2;
++	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
++	case HDMI_AUDIO_CODING_TYPE_MLP:
++		return 8;
++	default:
++		/* TODO adjust for other compressed formats as well */
++		return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);
++	}
+ }
+ 
+ static int eld_limit_rates(struct snd_pcm_hw_params *params,
+@@ -42,7 +109,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params,
+ 			 * requested number of channels.
+ 			 */
+ 			if (c->min <= max_channels)
+-				rate_mask |= sad[1];
++				rate_mask |= sad_rate_mask(sad);
+ 		}
+ 	}
+ 
+@@ -70,7 +137,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params,
+ 				rate_mask |= BIT(i);
+ 
+ 		for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3)
+-			if (rate_mask & sad[1])
++			if (rate_mask & sad_rate_mask(sad))
+ 				t.max = max(t.max, sad_max_channels(sad));
+ 	}
+ 
+-- 
+2.39.2
+

packages/linux/patches/default/linux-020-eld-constraints-for-compressed-formats.patch

@@ -1,91 +0,0 @@
-From a2769637a9b98c6809d4d25a3a20447a3ff7b23a Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Fri, 19 Mar 2021 12:14:17 +0100
-Subject: [PATCH] ALSA: pcm: fix ELD constraints for some compressed audio
- formats
-
-The SADs of compressed formats like AC3 and DTS contain the channel
-and sample rate info of the audio data inside the compressed stream,
-but when building constraints we must use the rates and formats used
-to pass through the stream. eg 2ch 48kHz for AC3.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
----
- sound/core/pcm_drm_eld.c | 38 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 35 insertions(+), 3 deletions(-)
-
-diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c
-index 4b5faae5d16e5..e7ec7a8b9d420 100644
---- a/sound/core/pcm_drm_eld.c
-+++ b/sound/core/pcm_drm_eld.c
-@@ -6,6 +6,7 @@
- #include <drm/drm_edid.h>
- #include <sound/pcm.h>
- #include <sound/pcm_drm_eld.h>
-+#include <linux/hdmi.h>
- 
- static const unsigned int eld_rates[] = {
- 	32000,
-@@ -17,9 +18,40 @@ static const unsigned int eld_rates[] = {
- 	192000,
- };
- 
-+static unsigned int sad_format(const u8 *sad)
-+{
-+	return (sad[0] & 0x78) >> 3;
-+}
-+
- static unsigned int sad_max_channels(const u8 *sad)
- {
--	return 1 + (sad[0] & 7);
-+	switch (sad_format(sad)) {
-+	case HDMI_AUDIO_CODING_TYPE_AC3:
-+	case HDMI_AUDIO_CODING_TYPE_DTS:
-+	case HDMI_AUDIO_CODING_TYPE_EAC3:
-+		return 2;
-+	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
-+	case HDMI_AUDIO_CODING_TYPE_MLP:
-+		return 8;
-+	default:
-+		return 1 + (sad[0] & 7);
-+	}
-+}
-+
-+static unsigned int sad_rate_mask(const u8 *sad)
-+{
-+	switch (sad_format(sad)) {
-+	case HDMI_AUDIO_CODING_TYPE_AC3:
-+	case HDMI_AUDIO_CODING_TYPE_DTS:
-+		return 0x07; // 32-48kHz
-+	case HDMI_AUDIO_CODING_TYPE_EAC3:
-+		return 0x7f; // 32-192kHz
-+	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
-+	case HDMI_AUDIO_CODING_TYPE_MLP:
-+		return 0x60; // 176.4, 192kHz
-+	default:
-+		return sad[1] & 0x7f;
-+	}
- }
- 
- static int eld_limit_rates(struct snd_pcm_hw_params *params,
-@@ -42,7 +74,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params,
- 			 * requested number of channels.
- 			 */
- 			if (c->min <= max_channels)
--				rate_mask |= sad[1];
-+				rate_mask |= sad_rate_mask(sad);
- 		}
- 	}
- 
-@@ -70,7 +102,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params,
- 				rate_mask |= BIT(i);
- 
- 		for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3)
--			if (rate_mask & sad[1])
-+			if (rate_mask & sad_rate_mask(sad))
- 				t.max = max(t.max, sad_max_channels(sad));
- 	}
- 
--- 
-2.20.1
-

packages/linux/patches/default/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch

@@ -0,0 +1,89 @@
+From 99586e3f502fcc4fdd21b621f3c87ae7a8f7c170 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sat, 3 Jun 2023 12:12:28 +0200
+Subject: [PATCH 2/2] ASoC: hdmi-codec: don't set channel and speaker info for
+ compressed formats
+
+CTA 861 only mandates that the speaker allocation in the audio info frame
+is set for multichannel PCM formats. Likewise the number of channels in the
+audio infoframe is only relevant for PCM.
+
+Some TVs won't decode compressed formats if the number of channels isn't
+set to 0 (refer to stream header) and the speaker allocation is set to the
+default 0 (FL and FR).
+
+So fill in this info only for PCM audio and set it to 0 for compressed
+audio formats.
+
+This also prevents hdmi_codec_prepare failing with an error when trying to
+play back DTS-HD or MLP (which is passed through as 8ch) if the sink only
+supports 2ch PCM and announces only FL/FR speaker support in the EDID.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ sound/soc/codecs/hdmi-codec.c | 36 +++++++++++++++++++++++------------
+ 1 file changed, 24 insertions(+), 12 deletions(-)
+
+diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
+index 0b1cdb2d60498..a192d985c5f18 100644
+--- a/sound/soc/codecs/hdmi-codec.c
++++ b/sound/soc/codecs/hdmi-codec.c
+@@ -484,31 +484,43 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai,
+ 					struct hdmi_codec_params *hp)
+ {
+ 	struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai);
+-	int idx;
+-
+-	/* Select a channel allocation that matches with ELD and pcm channels */
+-	idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels);
+-	if (idx < 0) {
+-		dev_err(dai->dev, "Not able to map channels to speakers (%d)\n",
+-			idx);
+-		hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
+-		return idx;
++	int idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
++	u8 ca_id = 0;
++	bool pcm_audio = !(hcp->iec_status[0] & IEC958_AES0_NONAUDIO);
++
++	if (pcm_audio) {
++		/* Select a channel allocation that matches with ELD and pcm channels */
++		idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels);
++
++		if (idx < 0) {
++			dev_err(dai->dev, "Not able to map channels to speakers (%d)\n",
++				idx);
++			hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
++			return idx;
++		}
++
++		ca_id = hdmi_codec_channel_alloc[idx].ca_id;
+ 	}
+ 
+ 	memset(hp, 0, sizeof(*hp));
+ 
+ 	hdmi_audio_infoframe_init(&hp->cea);
+-	hp->cea.channels = channels;
++
++	if (pcm_audio)
++		hp->cea.channels = channels;
++	else
++		hp->cea.channels = 0;
++
+ 	hp->cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
+ 	hp->cea.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
+ 	hp->cea.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
+-	hp->cea.channel_allocation = hdmi_codec_channel_alloc[idx].ca_id;
++	hp->cea.channel_allocation = ca_id;
+ 
+ 	hp->sample_width = sample_width;
+ 	hp->sample_rate = sample_rate;
+ 	hp->channels = channels;
+ 
+-	hcp->chmap_idx = hdmi_codec_channel_alloc[idx].ca_id;
++	hcp->chmap_idx = idx;
+ 
+ 	return 0;
+ }
+-- 
+2.39.2
+

packages/linux/patches/default/linux-122-rtw88-USB-fixes2.patch

@@ -0,0 +1,206 @@
+From:   Sascha Hauer <s.hauer@pengutronix.de>
+To:     linux-wireless <linux-wireless@vger.kernel.org>
+Cc:     Hans Ulli Kroll <linux@ulli-kroll.de>,
+        Larry Finger <Larry.Finger@lwfinger.net>,
+        Pkshih <pkshih@realtek.com>, Tim K <tpkuester@gmail.com>,
+        "Alex G ." <mr.nuke.me@gmail.com>,
+        Nick Morrow <morrownr@gmail.com>,
+        Viktor Petrenko <g0000ga@gmail.com>,
+        Andreas Henriksson <andreas@fatal.se>,
+        ValdikSS <iam@valdikss.org.ru>, kernel@pengutronix.de,
+        stable@vger.kernel.org, Sascha Hauer <s.hauer@pengutronix.de>
+Subject: [PATCH 0/2] RTW88 USB bug fixes
+Date:   Fri, 31 Mar 2023 14:10:52 +0200
+Message-Id: <20230331121054.112758-1-s.hauer@pengutronix.de>
+X-Mailer: git-send-email 2.39.2
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2
+X-SA-Exim-Mail-From: sha@pengutronix.de
+X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false
+X-PTX-Original-Recipient: linux-wireless@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless@vger.kernel.org
+
+This series fixes two bugs in the RTW88 USB driver I was reported from
+several people and that I also encountered myself.
+
+The first one resulted in "timed out to flush queue 3" messages from the
+driver and sometimes a complete stall of the TX queues.
+
+The second one is specific to the RTW8821CU chipset. Here 2GHz networks
+were hardly seen and impossible to connect to. This goes down to
+misinterpreting the rfe_option field in the efuse.
+
+Sascha Hauer (2):
+  wifi: rtw88: usb: fix priority queue to endpoint mapping
+  wifi: rtw88: rtw8821c: Fix rfe_option field width
+
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c |  3 +-
+ drivers/net/wireless/realtek/rtw88/usb.c      | 70 +++++++++++++------
+ 2 files changed, 48 insertions(+), 25 deletions(-)
+
+-- 
+2.39.2
+
+
+From:   Sascha Hauer <s.hauer@pengutronix.de>
+To:     linux-wireless <linux-wireless@vger.kernel.org>
+Cc:     Hans Ulli Kroll <linux@ulli-kroll.de>,
+        Larry Finger <Larry.Finger@lwfinger.net>,
+        Pkshih <pkshih@realtek.com>, Tim K <tpkuester@gmail.com>,
+        "Alex G ." <mr.nuke.me@gmail.com>,
+        Nick Morrow <morrownr@gmail.com>,
+        Viktor Petrenko <g0000ga@gmail.com>,
+        Andreas Henriksson <andreas@fatal.se>,
+        ValdikSS <iam@valdikss.org.ru>, kernel@pengutronix.de,
+        stable@vger.kernel.org, Sascha Hauer <s.hauer@pengutronix.de>
+Subject: [PATCH 1/2] wifi: rtw88: usb: fix priority queue to endpoint mapping
+Date:   Fri, 31 Mar 2023 14:10:53 +0200
+Message-Id: <20230331121054.112758-2-s.hauer@pengutronix.de>
+X-Mailer: git-send-email 2.39.2
+In-Reply-To: <20230331121054.112758-1-s.hauer@pengutronix.de>
+References: <20230331121054.112758-1-s.hauer@pengutronix.de>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2
+X-SA-Exim-Mail-From: sha@pengutronix.de
+X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false
+X-PTX-Original-Recipient: linux-wireless@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless@vger.kernel.org
+
+The RTW88 chipsets have four different priority queues in hardware. For
+the USB type chipsets the packets destined for a specific priority queue
+must be sent through the endpoint corresponding to the queue. This was
+not fully understood when porting from the RTW88 USB out of tree driver
+and thus violated.
+
+This patch implements the qsel to endpoint mapping as in
+get_usb_bulkout_id_88xx() in the downstream driver.
+
+Without this the driver often issues "timed out to flush queue 3"
+warnings and often TX stalls completely.
+
+Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 70 ++++++++++++++++--------
+ 1 file changed, 47 insertions(+), 23 deletions(-)
+
+diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
+index 2a8336b1847a5..a10d6fef4ffaf 100644
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -118,6 +118,22 @@ static void rtw_usb_write32(struct rtw_dev *rtwdev, u32 addr, u32 val)
+ 	rtw_usb_write(rtwdev, addr, val, 4);
+ }
+ 
++static int dma_mapping_to_ep(enum rtw_dma_mapping dma_mapping)
++{
++	switch (dma_mapping) {
++	case RTW_DMA_MAPPING_HIGH:
++		return 0;
++	case RTW_DMA_MAPPING_NORMAL:
++		return 1;
++	case RTW_DMA_MAPPING_LOW:
++		return 2;
++	case RTW_DMA_MAPPING_EXTRA:
++		return 3;
++	default:
++		return -EINVAL;
++	}
++}
++
+ static int rtw_usb_parse(struct rtw_dev *rtwdev,
+ 			 struct usb_interface *interface)
+ {
+@@ -129,6 +145,8 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev,
+ 	int num_out_pipes = 0;
+ 	int i;
+ 	u8 num;
++	const struct rtw_chip_info *chip = rtwdev->chip;
++	const struct rtw_rqpn *rqpn;
+ 
+ 	for (i = 0; i < interface_desc->bNumEndpoints; i++) {
+ 		endpoint = &host_interface->endpoint[i].desc;
+@@ -183,31 +201,34 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev,
+ 
+ 	rtwdev->hci.bulkout_num = num_out_pipes;
+ 
+-	switch (num_out_pipes) {
+-	case 4:
+-	case 3:
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = 2;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = 2;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = 2;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = 2;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID4] = 1;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID5] = 1;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID6] = 0;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID7] = 0;
+-		break;
+-	case 2:
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = 1;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = 1;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = 1;
+-		rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = 1;
+-		break;
+-	case 1:
+-		break;
+-	default:
+-		rtw_err(rtwdev, "failed to get out_pipes(%d)\n", num_out_pipes);
++	if (num_out_pipes < 1 || num_out_pipes > 4) {
++		rtw_err(rtwdev, "invalid number of endpoints %d\n", num_out_pipes);
+ 		return -EINVAL;
+ 	}
+ 
++	rqpn = &chip->rqpn_table[num_out_pipes];
++
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = dma_mapping_to_ep(rqpn->dma_map_be);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = dma_mapping_to_ep(rqpn->dma_map_bk);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = dma_mapping_to_ep(rqpn->dma_map_bk);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = dma_mapping_to_ep(rqpn->dma_map_be);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID4] = dma_mapping_to_ep(rqpn->dma_map_vi);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID5] = dma_mapping_to_ep(rqpn->dma_map_vi);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID6] = dma_mapping_to_ep(rqpn->dma_map_vo);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID7] = dma_mapping_to_ep(rqpn->dma_map_vo);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID8] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID9] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID10] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID11] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID12] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID13] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID14] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_TID15] = -EINVAL;
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_BEACON] = dma_mapping_to_ep(rqpn->dma_map_hi);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_HIGH] = dma_mapping_to_ep(rqpn->dma_map_hi);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_MGMT] = dma_mapping_to_ep(rqpn->dma_map_mg);
++	rtwusb->qsel_to_ep[TX_DESC_QSEL_H2C] = dma_mapping_to_ep(rqpn->dma_map_hi);
++
+ 	return 0;
+ }
+ 
+@@ -250,7 +271,7 @@ static void rtw_usb_write_port_tx_complete(struct urb *urb)
+ static int qsel_to_ep(struct rtw_usb *rtwusb, unsigned int qsel)
+ {
+ 	if (qsel >= ARRAY_SIZE(rtwusb->qsel_to_ep))
+-		return 0;
++		return -EINVAL;
+ 
+ 	return rtwusb->qsel_to_ep[qsel];
+ }
+@@ -265,6 +286,9 @@ static int rtw_usb_write_port(struct rtw_dev *rtwdev, u8 qsel, struct sk_buff *s
+ 	int ret;
+ 	int ep = qsel_to_ep(rtwusb, qsel);
+ 
++	if (ep < 0)
++		return ep;
++
+ 	pipe = usb_sndbulkpipe(usbd, rtwusb->out_ep[ep]);
+ 	urb = usb_alloc_urb(0, GFP_ATOMIC);
+ 	if (!urb)
+-- 
+2.39.2
+

packages/linux/patches/default/linux-122-rtw88-rfc-v1.patch

@@ -657,7 +657,7 @@ diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
 index 74f9d9a6d330..bba39d4565da 100644
 --- a/include/linux/mmc/sdio_ids.h
 +++ b/include/linux/mmc/sdio_ids.h
-@@ -111,6 +111,15 @@
+@@ -115,6 +115,15 @@
  #define SDIO_VENDOR_ID_MICROCHIP_WILC		0x0296
  #define SDIO_DEVICE_ID_MICROCHIP_WILC1000	0x5347
  
@@ -1547,7 +1547,7 @@ diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/rea
 index 4e5c194aac29..bf1291902661 100644
 --- a/drivers/net/wireless/realtek/rtw88/mac.c
 +++ b/drivers/net/wireless/realtek/rtw88/mac.c
-@@ -269,15 +269,23 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
+@@ -273,16 +273,24 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
  	if (pwr_on == cur_pwr)
  		return -EALREADY;
  
@@ -1558,8 +1558,9 @@ index 4e5c194aac29..bf1291902661 100644
 +	rtw_hci_power_switch(rtwdev, false);
 +
  	pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq;
- 	if (rtw_pwr_seq_parser(rtwdev, pwr_seq))
- 		return -EINVAL;
+ 	ret = rtw_pwr_seq_parser(rtwdev, pwr_seq);
+ 	if (ret)
+ 		return ret;
 
  	if (pwr_on)
  		set_bit(RTW_FLAG_POWERON, rtwdev->flags);
@@ -1665,7 +1666,7 @@ diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/rea
 index c04938691add..8e1fa824b32b 100644
 --- a/drivers/net/wireless/realtek/rtw88/mac.c
 +++ b/drivers/net/wireless/realtek/rtw88/mac.c
-@@ -1041,6 +1041,9 @@ static int txdma_queue_mapping(struct rtw_dev *rtwdev)
+@@ -1053,6 +1053,9 @@ static int txdma_queue_mapping(struct rtw_dev *rtwdev)
  		else
  			return -EINVAL;
  		break;
@@ -1675,7 +1676,7 @@ index c04938691add..8e1fa824b32b 100644
  	default:
  		return -EINVAL;
  	}
-@@ -1203,6 +1206,9 @@ static int priority_queue_cfg(struct rtw_dev *rtwdev)
+@@ -1215,6 +1218,9 @@ static int priority_queue_cfg(struct rtw_dev *rtwdev)
  		else
  			return -EINVAL;
  		break;
@@ -1830,8 +1831,8 @@ index 8e1fa824b32b..ad71f9838d1d 100644
 +	u32 imr;
  	u8 rpwm;
  	bool cur_pwr;
- 
-@@ -278,17 +301,24 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
+ 	int ret;
+@@ -279,18 +302,25 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
  	 */
  	rtw_hci_power_switch(rtwdev, false);
  
@@ -1839,10 +1840,11 @@ index 8e1fa824b32b..ad71f9838d1d 100644
 +	rtw_write32(rtwdev, REG_SDIO_HIMR, 0);
 +
  	pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq;
--	if (rtw_pwr_seq_parser(rtwdev, pwr_seq))
-+	if (rtw_pwr_seq_parser(rtwdev, pwr_seq)) {
+ 	ret = rtw_pwr_seq_parser(rtwdev, pwr_seq);
+-	if (ret)
++	if (ret) {
 +		rtw_write32(rtwdev, REG_SDIO_HIMR, imr);
- 		return -EINVAL;
+ 		return ret;
 +	}
  
  	if (pwr_on)
@@ -1857,7 +1859,7 @@ index 8e1fa824b32b..ad71f9838d1d 100644
  	return 0;
  }
  
-@@ -450,6 +480,9 @@ static void download_firmware_reg_backup(struct rtw_dev *rtwdev,
+@@ -462,6 +492,9 @@ static void download_firmware_reg_backup(struct rtw_dev *rtwdev,
  	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_1, 0x200);
  	rtw_write32(rtwdev, REG_RQPN_CTRL_2, bckp[bckp_idx - 1].val);
  
@@ -1867,7 +1869,7 @@ index 8e1fa824b32b..ad71f9838d1d 100644
  	/* Disable beacon related functions */
  	tmp = rtw_read8(rtwdev, REG_BCN_CTRL);
  	bckp[bckp_idx].len = 1;
-@@ -1062,8 +1095,12 @@ static int txdma_queue_mapping(struct rtw_dev *rtwdev)
+@@ -1074,8 +1107,12 @@ static int txdma_queue_mapping(struct rtw_dev *rtwdev)
  	if (rtw_chip_wcpu_11ac(rtwdev))
  		rtw_write32(rtwdev, REG_H2CQ_CSR, BIT_H2CQ_FULL);
  
@@ -3611,7 +3613,7 @@ index 888427cf3bdf..9435cb43d1dc 100644
  
  bool rtw_disable_lps_deep_mode;
  EXPORT_SYMBOL(rtw_disable_lps_deep_mode);
-@@ -1783,6 +1784,10 @@ static int rtw_chip_parameter_setup(struct rtw_dev *rtwdev)
+@@ -1785,6 +1786,10 @@ static int rtw_chip_parameter_setup(struct rtw_dev *rtwdev)
  		rtwdev->hci.rpwm_addr = 0x03d9;
  		rtwdev->hci.cpwm_addr = 0x03da;
  		break;
@@ -3721,7 +3723,7 @@ diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/re
 index 9435cb43d1dc..bcdf1f8c8450 100644
 --- a/drivers/net/wireless/realtek/rtw88/main.c
 +++ b/drivers/net/wireless/realtek/rtw88/main.c
-@@ -2161,9 +2161,11 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)
+@@ -2163,9 +2163,11 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)
  	int max_tx_headroom = 0;
  	int ret;
  

packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch

@@ -1,41 +0,0 @@
-From affc6fdac5376701ea468270af1b6fd9ca7616be Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sat, 11 Mar 2023 22:41:17 +0100
-Subject: [PATCH] drm/vc4: drop unnecessary and harmful HDMI RGB format check
-
-RGB is a mandatory format for all DVI and HDMI monitors so there's
-no need to check for presence of the DRM_COLOR_FORMAT_RGB444 bit in
-color_formats.
-
-More importantly this checks breaks working around EDID issues with
-eg video=HDMI-A-1:1024x768D or drm.edid_firmware=edid/1024x768.bin
-as the RGB444 bit is only set when a valid EDID with digital bit set in
-the input byte is present - which isn't the case when no EDID can be
-read from the display device at all or with the in-built kernel EDIDs,
-which mimic analog (VGA) displays without the digital bit set.
-
-So drop the check, if we output video on the HDMI connector we can
-assume that the display can accept 8bit RGB.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index bd762b4e3e8f2..3c60c93c0f888 100644
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1962,9 +1962,6 @@ vc4_hdmi_sink_supports_format_bpc(const struct vc4_hdmi *vc4_hdmi,
- 	case VC4_HDMI_OUTPUT_RGB:
- 		drm_dbg(dev, "RGB Format, checking the constraints.\n");
- 
--		if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444))
--			return false;
--
- 		if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
- 			drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
- 			return false;
--- 
-2.39.2
-