From 124e58dfb34b0c3a3fddba9be2321eee120ca27d Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Thu, 21 Mar 2024 23:17:42 +0000
Subject: [PATCH] mpd: Update from version 0.20.23 to 0.23.15 and fix build
 issues

---
 cross/mpd/Makefile | 19 +++++++------------
 cross/mpd/digests  |  6 +++---
 spk/mpd/Makefile   |  4 ++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/cross/mpd/Makefile b/cross/mpd/Makefile
index 3c1424cca6c2..292ecf2b7800 100644
--- a/cross/mpd/Makefile
+++ b/cross/mpd/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mpd
-PKG_VERS = 0.20.23
+PKG_VERS = 0.23.15
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/MusicPlayerDaemon/MPD/archive
@@ -28,23 +28,18 @@ DEPENDS += cross/libvorbis
 DEPENDS += cross/libtheora
 DEPENDS += cross/lame
 DEPENDS += cross/libshout
+DEPENDS += cross/opus
 DEPENDS += cross/soxr
 DEPENDS += cross/curl
-DEPENDS += cross/boost
+DEPENDS += cross/boost_1.82
 
 HOMEPAGE = https://www.musicpd.org/
 COMMENT  = Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music.
 LICENSE  = GPLv2
 
-GNU_CONFIGURE = 1
-
-PRE_CONFIGURE_TARGET = mpd_pre_configure
-
+BOOST_BUILD_PATH=$(WORK_DIR)/boost_1_82_0
 BOOST_LIBRARIES += system
-ENV += BOOST_LIBRARIES="$(BOOST_LIBRARIES)"
-
-include ../../mk/spksrc.cross-cc.mk
+ENV += BOOST_INCLUDEDIR="$(BOOST_BUILD_PATH)/boost"
+ENV += BOOST_LIBRARYDIR="$(BOOST_BUILD_PATH)/libs"
 
-.PHONY: mpd_pre_configure
-mpd_pre_configure:
-	$(RUN) ./autogen.sh
+include ../../mk/spksrc.cross-meson.mk
diff --git a/cross/mpd/digests b/cross/mpd/digests
index e17bea046e66..96ea33246182 100644
--- a/cross/mpd/digests
+++ b/cross/mpd/digests
@@ -1,3 +1,3 @@
-mpd-0.20.23.tar.gz SHA1 ada2abe794aa72d03adfb696c2c10d2ef45ced7e
-mpd-0.20.23.tar.gz SHA256 93c4441719a8312f3d150de02b1db0c22fe3a1a99e4159c6056950846a109368
-mpd-0.20.23.tar.gz MD5 5ba6ca8579bf65f8f34b95ddfbff35a4
+mpd-0.23.15.tar.gz SHA1 cb254a6e17eb0e724ad04b73b44449df664132f8
+mpd-0.23.15.tar.gz SHA256 d2865d8f8ea79aa509b1465b99a2b8f3f449fe894521c97feadc2dca85a6ecd2
+mpd-0.23.15.tar.gz MD5 7d9caf50f35158b9058a82656aea6bd5
diff --git a/spk/mpd/Makefile b/spk/mpd/Makefile
index b8f239964eca..703e3cd62bca 100644
--- a/spk/mpd/Makefile
+++ b/spk/mpd/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = mpd
-SPK_VERS = 0.20.23
-SPK_REV = 1
+SPK_VERS = 0.23.15
+SPK_REV = 2
 SPK_ICON = src/mpd.png
 DSM_UI_DIR = app