mpd: update to v0.23.15

cross/libmpdclient/Makefile

@@ -1,13 +1,11 @@
 PKG_NAME = libmpdclient
-PKG_VERS = 2.20
+PKG_VERS = 2.22
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/MusicPlayerDaemon/libmpdclient/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-# https://github.com/MusicPlayerDaemon/libmpdclient/archive/refs/tags/v2.20.tar.gz
-
 DEPENDS =
 
 HOMEPAGE = https://www.musicpd.org/libs/libmpdclient/

cross/libmpdclient/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libmpdclient.so
 lnk:lib/libmpdclient.so.2
-lib:lib/libmpdclient.so.2.20
+lib:lib/libmpdclient.so.2.22

cross/libmpdclient/digests

@@ -1,3 +1,3 @@
-libmpdclient-2.20.tar.gz SHA1 57b7df289cacffb81eb301bd820aa71e8591aa0e
-libmpdclient-2.20.tar.gz SHA256 3c5a671e7bc5736c677ef75017eaf008e8838ac03605953410e8d4de6b363b73
-libmpdclient-2.20.tar.gz MD5 335ee0871901e740c0c51a96c2e7603b
+libmpdclient-2.22.tar.gz SHA1 a740d23847db25afdf7529560c4447afa2262da3
+libmpdclient-2.22.tar.gz SHA256 56bbae543a8a70db83b68c679b91990838f0db31a358c1a139774cd8ba7e3c59
+libmpdclient-2.22.tar.gz MD5 c9f9133cc1e5997fa44d2aa192050a60

cross/mpd/Makefile

@@ -1,25 +1,22 @@
 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
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = MPD-$(PKG_VERS)
 
-# A compiler with support for C++14 language features is required.
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)
-
-OPTIONAL_DEPENDS = cross/libmad
+# with mpd ver 0.22 (2020/09/23)
+# - switch to C++17 (GCC 8 or clang 5)
+# GCC version is too old. You need at least version 8.
+REQUIRED_MIN_DSM = 7.0
+UNSUPPORTED_ARCHS = comcerto2k
 
 include ../../mk/spksrc.archs.mk
 
 DEPENDS  = cross/glib
 DEPENDS += cross/alsa-lib
-ifneq ($(findstring $(ARCH),comcerto2k),$(ARCH))
-# comcerto2k fails with
-# Error: selected processor does not support Thumb mode `rsc r3,r3,#0'
 DEPENDS += cross/libmad
-endif
 DEPENDS += cross/libogg 
 DEPENDS += cross/flac
 DEPENDS += cross/audiofile
@@ -31,20 +28,34 @@ DEPENDS += cross/libshout
 DEPENDS += cross/soxr
 DEPENDS += cross/curl
 DEPENDS += cross/boost
+DEPENDS += cross/sqlite
+DEPENDS += cross/libexpat
+DEPENDS += cross/opus
+DEPENDS += cross/pcre
+DEPENDS += cross/libmpdclient
 
 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_LIBRARIES += system
 ENV += BOOST_LIBRARIES="$(BOOST_LIBRARIES)"
 
-include ../../mk/spksrc.cross-cc.mk
+include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))  
+# define value missing in socket.h in evansport toolchain
+ADDITIONAL_CXXFLAGS = -DSO_REUSEPORT=15
+endif
+
+# If your boost headers or libraries are in non-standard locations you can set the BOOST_ROOT, 
+# or the BOOST_INCLUDEDIR and BOOST_LIBRARYDIR environment variables. (added in 0.56.0) 
+# You can also set these parameters as boost_root, boost_include, and boost_librarydir in your native 
+# or cross machine file. 
+# Note that machine file variables are preferred to environment variables, and that specifying 
+# any of these disables system-wide search for boost.
+ENV += BOOST_INCLUDEDIR=$(STAGING_INSTALL_PREFIX)/include/boost
+ENV += BOOST_LIBRARYDIR=$(STAGING_INSTALL_PREFIX)/lib
 
-.PHONY: mpd_pre_configure
-mpd_pre_configure:
-	$(RUN) ./autogen.sh
+include ../../mk/spksrc.cross-meson.mk

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

cross/mympd/Makefile

@@ -0,0 +1,33 @@
+PKG_NAME = mympd
+PKG_VERS = 14.1.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/jcorporation/myMPD/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = myMPD-$(PKG_VERS)
+
+DEPENDS = cross/libmpdclient cross/openssl3 cross/pcre2 cross/libid3tag
+
+REQUIRED_MIN_DSM = 7.0
+UNSUPPORTED_ARCHS = comcerto2k
+
+HOMEPAGE = https://jcorporation.github.io/
+COMMENT  = myMPD is a standalone and mobile friendly web mpd client with a tiny footprint and advanced features.
+LICENSE  = GPLv3
+# myMPD was originally a fork of ympd, but it has evolved into a much more comprehensive MPD client.
+
+CMAKE_USE_TOOLCHAIN_FILE = NO
+
+POST_INSTALL_TARGET = mympd_post_install
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: mympd_post_install
+mympd_post_install:
+	@$(MSG) Install additional libraries...
+	@install $(WORK_DIR)/$(PKG_DIR)/build/dist/libmympdclient/liblibmympdclient.so   $(STAGING_INSTALL_PREFIX)/lib/
+	@install $(WORK_DIR)/$(PKG_DIR)/build/dist/mjson/libmjson.so                     $(STAGING_INSTALL_PREFIX)/lib/
+	@install $(WORK_DIR)/$(PKG_DIR)/build/dist/mongoose/libmongoose.so               $(STAGING_INSTALL_PREFIX)/lib/
+	@install $(WORK_DIR)/$(PKG_DIR)/build/dist/mpack/libmpack.so                     $(STAGING_INSTALL_PREFIX)/lib/
+	@install $(WORK_DIR)/$(PKG_DIR)/build/dist/rax/librax.so                         $(STAGING_INSTALL_PREFIX)/lib/
+	@install $(WORK_DIR)/$(PKG_DIR)/build/dist/sds/libsds.so                         $(STAGING_INSTALL_PREFIX)/lib/

cross/mympd/PLIST

@@ -0,0 +1,7 @@
+bin:bin/mympd
+lib:lib/liblibmympdclient.so
+lib:lib/libmjson.so
+lib:lib/libmongoose.so
+lib:lib/libmpack.so
+lib:lib/librax.so
+lib:lib/libsds.so

cross/mympd/digests

@@ -0,0 +1,3 @@
+mympd-14.1.0.tar.gz SHA1 5e62088a3b043cf0101a2460e4d0451867796b24
+mympd-14.1.0.tar.gz SHA256 f4bdb265915384d9271426a7e53977e71094ab03c0b2be5df185a2976ce4c6e2
+mympd-14.1.0.tar.gz MD5 252aac27edc7d6da8ff8cf7343ecf44d

cross/ympd/Makefile

@@ -12,6 +12,6 @@ HOMEPAGE = https://ympd.org/
 COMMENT  = Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS.
 LICENSE  = GPLv2
 
-GNU_CONFIGURE = 1
+CMAKE_USE_TOOLCHAIN_FILE = NO
 
 include ../../mk/spksrc.cross-cmake.mk

spk/mpd/Makefile

@@ -1,22 +1,22 @@
 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
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/mpd
 
-# A compiler with support for C++14 language features is required.
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)
+REQUIRED_MIN_DSM = 7.0
+UNSUPPORTED_ARCHS = comcerto2k
 
-MAINTAINER = DigitalBox98
+MAINTAINER = hgy59
 DESCRIPTION = Music Player Daemon \(MPD\) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol.
-CHANGELOG = "Initial package release."
+CHANGELOG = "Update mpd to v0.23.15, available for DSM 7 only."
 
 DISPLAY_NAME = Music Player Daemon
 
-HOMEPAGE   = https://www.musicpd.org/
-LICENSE    = GPLv2
+HOMEPAGE = https://www.musicpd.org/
+LICENSE = GPLv2
 
 WIZARDS_DIR = src/wizards
 
@@ -26,8 +26,7 @@ SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
 NO_SERVICE_SHORTCUT = yes
 
-SERVICE_WIZARD_SHARE = wizard_music_folder
-USE_DATA_SHARE_WORKER = yes
+SERVICE_WIZARD_SHARENAME = wizard_music_folder
 FWPORTS = src/mpd.sc
 
 POST_STRIP_TARGET = mpd_extra_install