[Buildroot] [PATCH v2 2/2] package/mpd: update to version 0.23.y
Andreas Ziegler
br015 at umbiko.net
Mon Nov 15 12:32:12 UTC 2021
Signed-off-by: Andreas Ziegler <br015 at umbiko.net>
---
Changes v1 -> v2 (after review by Thomas Petazzoni):
- Config.in.legacy: add entry for legacy MPD UPnP configuration
- Config.in: rewrite UPnP help messages
- mpd.mk: add fmt to MPD_DEPENDENCIES
- mpd.mk: disable openmpt, pipewire, snapcast
- mpd.mk: update to version 0.23.3
Config.in.legacy | 8 ++++
...build-add-atomic-dependency-for-spar.patch | 4 +-
package/mpd/Config.in | 41 +++++++++++++++++--
package/mpd/mpd.hash | 2 +-
package/mpd/mpd.mk | 23 +++++++----
5 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 5b48566f68..09b7e5983e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2021.11"
+config BR2_PACKAGE_MPD_UPNP
+ bool "MPD UPnP configuration changed"
+ select BR2_LEGACY
+ help
+ From version 0.23, MPD supports npupnp in addition to pupnp to
+ provide database access to a UPnP media server. To preserve the
+ existing functionality, select pupnp in the MPD UPnP configuration.
+
config BR2_OPENJDK_VERSION_LTS
bool "OpenJDK LTS version was renamed to OpenJDK 11"
select BR2_LEGACY
diff --git a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch
index 81bd981d65..390cf12583 100644
--- a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch
+++ b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch
@@ -20,7 +20,7 @@ diff --git a/src/event/meson.build b/src/event/meson.build
index bc13bbcd2..88370c03a 100644
--- a/src/event/meson.build
+++ b/src/event/meson.build
-@@ -21,9 +21,13 @@ event = static_library(
+@@ -47,9 +47,13 @@ event = declare_dependency(
],
)
@@ -32,8 +32,8 @@ index bc13bbcd2..88370c03a 100644
dependencies: [
+ atomic_dep,
thread_dep,
+ net_dep,
system_dep,
- boost_dep,
--
2.20.1
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index eb05f25a0b..be43049f7a 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -8,6 +8,7 @@ menuconfig BR2_PACKAGE_MPD
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17
depends on BR2_HOST_GCC_AT_LEAST_8 # C++17
select BR2_PACKAGE_BOOST
+ select BR2_PACKAGE_FMT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
MPD is a flexible, powerful, server-side application
@@ -354,7 +355,7 @@ config BR2_PACKAGE_MPD_LIBMPDCLIENT
config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT
bool "neighbor discovery support"
- depends on BR2_PACKAGE_MPD_LIBSMBCLIENT || BR2_PACKAGE_MPD_UPNP
+ depends on BR2_PACKAGE_MPD_LIBSMBCLIENT || !BR2_PACKAGE_MPD_UPNP_DISABLED
help
Enable support for neighbor discovery.
This option can be used in conjunction with the smbclient
@@ -373,13 +374,45 @@ config BR2_PACKAGE_MPD_TCP
You want this on if MPD and the client(s) work
on different machines (the usual scenario).
-config BR2_PACKAGE_MPD_UPNP
- bool "UPnP"
+choice
+ prompt "UPnP"
+ default BR2_PACKAGE_MPD_UPNP_DISABLED
+ help
+ Enable MPD to access a UPnP based media server.
+
+ For further information, see
+ https://www.lesbonscomptes.com/upmpdcli/pages/upmpdcli-or-mpdupnp.html
+
+
+config BR2_PACKAGE_MPD_UPNP_PUPNP
+ bool "pupnp"
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_LIBUPNP
select BR2_PACKAGE_MPD_CURL
help
- Enable MPD UPnP client support.
+ Provides UPnP database access through libupnp
+ (the legacy Portable SDK for UPnP devices).
+
+ Introduces least additional dependencies.
+
+config BR2_PACKAGE_MPD_UPNP_NPUPNP
+ bool "npupnp"
+ select BR2_PACKAGE_LIBNPUPNP
+ select BR2_PACKAGE_MPD_CURL
+ help
+ Provides UPnP database access through libnpupnp
+ (a C++ reimplementation of the Portable UPnP library).
+
+ This implementation is more modern, but also brings
+ additional features not needed in this context, thus
+ consuming more space.
+
+config BR2_PACKAGE_MPD_UPNP_DISABLED
+ bool "disabled"
+ help
+ No UPnP client functionality.
+
+endchoice
comment "Tag plugins"
diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash
index 2501be65de..cb9d05cd32 100644
--- a/package/mpd/mpd.hash
+++ b/package/mpd/mpd.hash
@@ -1,3 +1,3 @@
# Locally calculated after checking pgp signature
-sha256 143f7f34aaee6e87888f3dd35d49aade6656052651b960ca42b46cbb518ca0a0 mpd-0.22.11.tar.xz
+sha256 b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399 mpd-0.23.3.tar.xz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index e105352b80..382c003e28 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -4,17 +4,20 @@
#
################################################################################
-MPD_VERSION_MAJOR = 0.22
-MPD_VERSION = $(MPD_VERSION_MAJOR).11
+MPD_VERSION_MAJOR = 0.23
+MPD_VERSION = $(MPD_VERSION_MAJOR).3
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
-MPD_DEPENDENCIES = host-pkgconf boost
+MPD_DEPENDENCIES = host-pkgconf boost fmt
MPD_LICENSE = GPL-2.0+
MPD_LICENSE_FILES = COPYING
MPD_SELINUX_MODULES = mpd
MPD_CONF_OPTS = \
-Daudiofile=disabled \
- -Ddocumentation=disabled
+ -Ddocumentation=disabled \
+ -Dopenmpt=disabled \
+ -Dpipewire=disabled \
+ -Dsnapcast=disabled
# Zeroconf support depends on libdns_sd from avahi.
ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y)
@@ -291,12 +294,18 @@ else
MPD_CONF_OPTS += -Dtwolame=disabled
endif
-ifeq ($(BR2_PACKAGE_MPD_UPNP),y)
+ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y)
MPD_DEPENDENCIES += \
expat \
libupnp
-MPD_CONF_OPTS += -Dupnp=enabled
-else
+MPD_CONF_OPTS += -Dupnp=pupnp
+endif
+ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y)
+MPD_DEPENDENCIES += \
+ libnpupnp
+MPD_CONF_OPTS += -Dupnp=npupnp
+endif
+ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y)
MPD_CONF_OPTS += -Dupnp=disabled
endif
--
2.25.1
More information about the buildroot
mailing list