From d719d0db1a4133625a1c5546db331e880caae03b Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 28 Mar 2025 09:43:00 +0000
Subject: [PATCH 1/5] yajl: allow build with cmake-4.0.0

---
 .../yajl-256-build-with-cmake-4.0.0.patch     | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch

diff --git a/packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch b/packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch
new file mode 100644
index 0000000000..bd8b6cbe06
--- /dev/null
+++ b/packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch
@@ -0,0 +1,66 @@
+From 6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 28 Mar 2025 09:31:40 +0000
+Subject: [PATCH] Allow build with CMake 4.0.0
+
+fixes deprecated cmake option and uses cmake 2.8.0 TARGET_FILE
+update cmake supported minimum versions to 2.8.0...3.10
+
+ref:
+- https://cmake.org/cmake/help/latest/policy/CMP0026.html
+
+CMake Error at .../CMakeLists.txt: (GET_TARGET_PROPERTY):
+  The LOCATION property may not be read from target "json_...".  Use the
+  target name directly with add_custom_command, or use the generator
+  expression $<TARGET_FILE>, as appropriate.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ CMakeLists.txt             | 2 +-
+ reformatter/CMakeLists.txt | 4 +---
+ verify/CMakeLists.txt      | 4 +---
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 471eee13..deba3a40 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10)
+ 
+ PROJECT(YetAnotherJSONParser C)
+ 
+diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt
+index 52a9bee8..267d02e2 100644
+--- a/reformatter/CMakeLists.txt
++++ b/reformatter/CMakeLists.txt
+@@ -35,9 +35,7 @@ IF (NOT WIN32)
+ ENDIF (NOT WIN32)
+ 
+ # copy the binary into the output directory
+-GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
+-
+ ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD
+-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
++    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_reformat> ${binDir})
+ 
+ INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
+diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt
+index 967fca16..2f390082 100644
+--- a/verify/CMakeLists.txt
++++ b/verify/CMakeLists.txt
+@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS})
+ TARGET_LINK_LIBRARIES(json_verify yajl_s)
+ 
+ # copy in the binary
+-GET_TARGET_PROPERTY(binPath json_verify LOCATION)
+-
+ ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD
+-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
++    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_verify> ${binDir})
+ 
+ INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)

From f6ea2b9f907c03c54088fbe225c383a268508ef8 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 9 Apr 2025 16:11:14 +0000
Subject: [PATCH 2/5] yajl: drop unused package

---
 packages/devel/yajl/package.mk                | 21 ------
 .../yajl-256-build-with-cmake-4.0.0.patch     | 66 -------------------
 2 files changed, 87 deletions(-)
 delete mode 100644 packages/devel/yajl/package.mk
 delete mode 100644 packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch

diff --git a/packages/devel/yajl/package.mk b/packages/devel/yajl/package.mk
deleted file mode 100644
index b296ee237f..0000000000
--- a/packages/devel/yajl/package.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-
-PKG_NAME="yajl"
-PKG_VERSION="2.1.0"
-PKG_SHA256="3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a"
-PKG_LICENSE="ISC"
-PKG_SITE="https://github.com/lloyd/yajl"
-PKG_URL="https://github.com/lloyd/yajl/archive/refs/tags/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="A small event-driven (SAX-style) JSON parser."
-
-PKG_CMAKE_OPTS_TARGET="-Wno-dev"
-
-post_makeinstall_target() {
-  mv ${SYSROOT_PREFIX}/usr/lib/libyajl_s.a ${SYSROOT_PREFIX}/usr/lib/libyajl.a
-  rm ${SYSROOT_PREFIX}/usr/lib/libyajl.so*
-
-  rm -rf ${INSTALL}/usr/bin
-  rm -rf ${INSTALL}/usr/lib
-}
diff --git a/packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch b/packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch
deleted file mode 100644
index bd8b6cbe06..0000000000
--- a/packages/devel/yajl/patches/yajl-256-build-with-cmake-4.0.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 6fe59ca50dfd65bdb3d1c87a27245b2dd1a072f9 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Fri, 28 Mar 2025 09:31:40 +0000
-Subject: [PATCH] Allow build with CMake 4.0.0
-
-fixes deprecated cmake option and uses cmake 2.8.0 TARGET_FILE
-update cmake supported minimum versions to 2.8.0...3.10
-
-ref:
-- https://cmake.org/cmake/help/latest/policy/CMP0026.html
-
-CMake Error at .../CMakeLists.txt: (GET_TARGET_PROPERTY):
-  The LOCATION property may not be read from target "json_...".  Use the
-  target name directly with add_custom_command, or use the generator
-  expression $<TARGET_FILE>, as appropriate.
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
----
- CMakeLists.txt             | 2 +-
- reformatter/CMakeLists.txt | 4 +---
- verify/CMakeLists.txt      | 4 +---
- 3 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 471eee13..deba3a40 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,7 +12,7 @@
- # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10)
- 
- PROJECT(YetAnotherJSONParser C)
- 
-diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt
-index 52a9bee8..267d02e2 100644
---- a/reformatter/CMakeLists.txt
-+++ b/reformatter/CMakeLists.txt
-@@ -35,9 +35,7 @@ IF (NOT WIN32)
- ENDIF (NOT WIN32)
- 
- # copy the binary into the output directory
--GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
--
- ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD
--    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
-+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_reformat> ${binDir})
- 
- INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
-diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt
-index 967fca16..2f390082 100644
---- a/verify/CMakeLists.txt
-+++ b/verify/CMakeLists.txt
-@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS})
- TARGET_LINK_LIBRARIES(json_verify yajl_s)
- 
- # copy in the binary
--GET_TARGET_PROPERTY(binPath json_verify LOCATION)
--
- ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD
--    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
-+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_verify> ${binDir})
- 
- INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)

From f07479b336a76ff1fbc93e7009d78d77c212a6cb Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 9 Apr 2025 15:25:17 +0000
Subject: [PATCH 3/5] mpd: update to 0.24.3 and addon (6)

---
 packages/addons/service/mpd/package.mk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk
index 0b7b05552f..439ac827d3 100644
--- a/packages/addons/service/mpd/package.mk
+++ b/packages/addons/service/mpd/package.mk
@@ -3,16 +3,16 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd"
-PKG_VERSION="0.24.2"
-PKG_SHA256="d69251fdd15bbd8fbcd1c486dd4dc6a4e008e045975b2408cb2f37461c10f1e4"
-PKG_REV="5"
+PKG_VERSION="0.24.3"
+PKG_SHA256="4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="http://www.musicpd.org/download/mpd/$(get_pkg_version_maj_min)/mpd-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libfmt \
                     libgcrypt libiconv libid3tag libmad libmpdclient libopenmpt libsamplerate \
-                    libvorbis libnfs libogg mpd-mpc opus pulseaudio samba wavpack yajl"
+                    libvorbis libnfs libogg mpd-mpc opus pulseaudio samba wavpack nlohmann-json"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server"
 PKG_LONGDESC="Music Player Daemon (${PKG_VERSION}) is a flexible and powerful server-side application for playing music"
@@ -77,7 +77,6 @@ PKG_MESON_OPTS_TARGET="-Dadplug=disabled \
                        -Dsndfile=enabled \
                        -Dsndio=disabled \
                        -Dsolaris_output=disabled \
-                       -Dsoundcloud=enabled \
                        -Dsoxr=enabled \
                        -Dsqlite=enabled \
                        -Dsyslog=disabled \
@@ -91,7 +90,7 @@ PKG_MESON_OPTS_TARGET="-Dadplug=disabled \
                        -Dwavpack=enabled \
                        -Dwebdav=enabled \
                        -Dwildmidi=disabled \
-                       -Dyajl=enabled \
+                       -Dnlohmann_json=enabled \
                        -Dzeroconf=avahi \
                        -Dzlib=enabled \
                        -Dzzip=disabled"

From 96d0795e15038dd1a3f06615866ad5cbe5f535b3 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 9 Apr 2025 15:29:03 +0000
Subject: [PATCH 4/5] aspnet8-runtime: update to 8.0.15

---
 .../aspnet8-runtime/package.mk                     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk
index f947d6e191..35a3e1ac88 100644
--- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk
+++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aspnet8-runtime"
-PKG_VERSION="8.0.14"
+PKG_VERSION="8.0.15"
 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="608721534ee7705bc269c43220d6521b1c147475ebc581a8de9411f84fd632d9"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c7cf0f96-e75f-4376-9f4b-fb10b2129d0b/a0eeda2100a9fd1858b95c8d9267fa51/aspnetcore-runtime-8.0.14-linux-arm64.tar.gz"
+    PKG_SHA256="2df1872a8df62009a0afbb15f785033fa050e898d812dff5310284cba414119a"
+    PKG_URL="https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-arm64.tar.gz"
     ;;
   "arm")
-    PKG_SHA256="135f9c49bfb7b0a6b7e95e420fdc8783743705904ccde62e7f4b153d597699c7"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/8e39953f-874d-4d34-a41d-2f0f761d9657/0ecb320781f83fb3a94620e1dae6fe27/aspnetcore-runtime-8.0.14-linux-arm.tar.gz"
+    PKG_SHA256="7e57f629cedfa787957e93546d8d82277d045447bd5c92929b4be00c15c3a239"
+    PKG_URL="https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-arm.tar.gz"
     ;;
   "x86_64")
-    PKG_SHA256="beb58baaf8aeab23a7a77caa25547f7d5adb9a1d397d5a84e81860a069966039"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/b901af61-a4e5-41db-9402-f6a035bf3ffc/af3e800d44ced22133fd88f8b7bc4ac0/aspnetcore-runtime-8.0.14-linux-x64.tar.gz"
+    PKG_SHA256="88bd3e4c7cc6d34bad9d5640d8eef4dd7c6d4293240d328751bdcf8b967b8f6b"
+    PKG_URL="https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-x64.tar.gz"
     ;;
 esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

From 51fb402a00fac9bc56649b3fccace899c55d2c6f Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 9 Apr 2025 15:29:03 +0000
Subject: [PATCH 5/5] dotnet-runtime: update to 8.0.15 and addon (6)

---
 packages/addons/tools/dotnet-runtime/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index a23a0090d8..00252ff9a0 100644
--- a/packages/addons/tools/dotnet-runtime/package.mk
+++ b/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="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"